FGFS-4.1/fgmeta
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Superbuild: fix 3rdParty 32/64 compatibility

Browse Source
This commit is contained in:
Clément de l'Hamaide
2013-11-14 02:35:33 +01:00
parent d627ec7360
commit 0b5855fdee
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+6 -6
View File
@@ -68,10 +68,10 @@ elseif(MSVC)
if (CMAKE_CL_64) if (CMAKE_CL_64)
set(OSG_MSVC ${OSG_MSVC}-64) set(OSG_MSVC ${OSG_MSVC}-64)
set(WIN_TAG x64) set(WIN_TAG x64)
set(RDPARTY_DIR 3rdParty) set(RDPARTY_DIR 3rdParty.x64)
else () else ()
set(WIN_TAG win32) set(WIN_TAG win32)
set(RDPARTY_DIR 3rdParty.x64) set(RDPARTY_DIR 3rdParty)
endif (CMAKE_CL_64) endif (CMAKE_CL_64)
SET(OSG_CMAKE_ARGS SET(OSG_CMAKE_ARGS
@@ -91,12 +91,12 @@ elseif(MSVC)
list(APPEND OSG_DEPS WinDeps) list(APPEND OSG_DEPS WinDeps)
else() else()
# normal OSG # normal OSG
set(OSG_INSTALL_PREFIX ${OSG_INSTALL_PREFIX}/OpenSceneGraph)
set(FG_INSTALL_PREFIX ${FG_INSTALL_PREFIX}/FlightGear)
set(SG_INSTALL_PREFIX ${SG_INSTALL_PREFIX}/SimGear)
endif() endif()
if (MSVC) if (MSVC)
# download 3rdparty dependencies zip, including boost # download 3rdparty dependencies zip, including boost
ExternalProject_Add(WinDeps ExternalProject_Add(WinDeps
DOWNLOAD_COMMAND URL http://files.goneabitbursar.com/fg/fgfs-${WIN_TAG}-VS100-3rdParty+OSG-20120411.zip DOWNLOAD_COMMAND URL http://files.goneabitbursar.com/fg/fgfs-${WIN_TAG}-VS100-3rdParty+OSG-20120411.zip
@@ -188,5 +188,5 @@ ExternalProject_Add(FlightGear
UPDATE_COMMAND "" # or update. UPDATE_COMMAND "" # or update.
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/flightgear SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/flightgear
BINARY_DIR fgbuild BINARY_DIR fgbuild
CMAKE_ARGS ${FG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${FG_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${OSG_INSTALL_PREFIX};${SG_INSTALL_PREFIX} CMAKE_ARGS ${FG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${FG_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH="${OSG_INSTALL_PREFIX};${SG_INSTALL_PREFIX}"
) )
installWinDeps.bat
+8 -4
View File
@@ -5,8 +5,12 @@ REM Instead we extract to a subdir, and then move the directories we want
REM using this bat file. REM using this bat file.
echo %CD% echo %CD%
IF EXIST winDeps/3rdParty (
md 3rdParty md 3rdParty
xcopy /Y /E winDeps/3rdParty 3rdParty xcopy /Y /E winDeps/3rdParty 3rdParty
)
IF EXIST winDeps/3rdParty.x64 (
md 3rdParty.x64
xcopy /Y /E winDeps/3rdParty.x64 3rdParty.x64
)
echo "Done copying Windows deps" echo "Done copying Windows deps"