fly/fgmeta
1
0
Fork 0
Code Activity

Superbuild: Fix 3rdParty for FGRun x64

Browse source
This commit is contained in:
Clement de l'Hamaide 2013-11-20 18:33:50 +01:00
parent a2a2d6f354
commit 4a10d32c61
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -71,11 +71,9 @@ elseif(MSVC)
endif (${MSVC_VERSION} EQUAL 1700) endif (${MSVC_VERSION} EQUAL 1700)
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(RDPARTY_DIR 3rdParty.x64) set(RDPARTY_DIR 3rdParty.x64)
list(APPEND FG_CMAKE_ARGS -DWITH_FGPANEL=OFF) list(APPEND FG_CMAKE_ARGS -DWITH_FGPANEL=OFF)
else () else ()
set(WIN_TAG win32)
set(RDPARTY_DIR 3rdParty) set(RDPARTY_DIR 3rdParty)
endif (CMAKE_CL_64) endif (CMAKE_CL_64)
@ -100,9 +98,8 @@ endif()
if (MSVC) if (MSVC)
# download 3rdparty dependencies zip, including boost # download 3rdparty dependencies zip, including boost
string(TOLOWER ${RDPARTY_DIR} Rd_Party_Lower)
ExternalProject_Add(WinDeps ExternalProject_Add(WinDeps
SVN_REPOSITORY http://fgfs.goneabitbursar.com/fgwin3rdparty/trunk/msvc100/${Rd_Party_Lower} SVN_REPOSITORY http://fgfs.goneabitbursar.com/fgwin3rdparty/trunk/msvc100/3rdparty
# extract to current root # extract to current root
SOURCE_DIR ${CMAKE_BINARY_DIR}/winDeps/${RDPARTY_DIR} SOURCE_DIR ${CMAKE_BINARY_DIR}/winDeps/${RDPARTY_DIR}
BINARY_DIR ${CMAKE_BINARY_DIR} BINARY_DIR ${CMAKE_BINARY_DIR}