fly/fgmeta
1
0
Fork 0
Code Activity

Superbuild: FGRun tweak

Browse source
This commit is contained in:
Clément de l'Hamaide 2013-11-14 21:15:31 +01:00
parent 9763440ef4
commit 9e8fc07ea1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -19,6 +19,7 @@ set(SG_DEPS OSG)
set(FG_DEPS SimGear) set(FG_DEPS SimGear)
set(SG_CMAKE_ARGS "") set(SG_CMAKE_ARGS "")
set(FG_CMAKE_ARGS "") set(FG_CMAKE_ARGS "")
set(FGRUN_CMAKE_ARGS "")
if(APPLE) if(APPLE)
set(BOOST_ARGS link=static stage --with-system) set(BOOST_ARGS link=static stage --with-system)
@ -129,6 +130,7 @@ if (MSVC)
list(APPEND SG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR}/src/Boost) list(APPEND SG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR}/src/Boost)
list(APPEND FG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR}/src/Boost) list(APPEND FG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR}/src/Boost)
list(APPEND FGRUN_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR}/src/Boost)
endif(MSVC) # of Windows endif(MSVC) # of Windows
message(STATUS "OSG install prefix is ${OSG_INSTALL_PREFIX}") message(STATUS "OSG install prefix is ${OSG_INSTALL_PREFIX}")
@ -185,6 +187,10 @@ endif()
# Only compile FGRun for Windows # Only compile FGRun for Windows
if (MSVC) if (MSVC)
list(APPPEND FGRUN_CMAKE_ARGS -DMSVC_3RDPARTY_ROOT:PATH=${CMAKE_BINARY_DIR})
list(APPPEND FGRUN_CMAKE_ARGS -DFLTK_FLUID_EXECUTABLE:FILEPATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}/bin/fluid.exe)
list(APPPEND FGRUN_CMAKE_ARGS -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH==${CMAKE_BINARY_DIR}/${RDPARTY_DIR}/bin/msgfmt.exe)
list(APPPEND FGRUN_CMAKE_ARGS -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}/bin/msgmerge.exe)
ExternalProject_Add(FGRun ExternalProject_Add(FGRun
PREFIX ${CMAKE_BINARY_DIR} PREFIX ${CMAKE_BINARY_DIR}
DEPENDS ${FG_DEPS} DEPENDS ${FG_DEPS}
@ -192,7 +198,7 @@ if (MSVC)
UPDATE_COMMAND "" # or update. UPDATE_COMMAND "" # or update.
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/fgrun SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/fgrun
BINARY_DIR fgrunbuild BINARY_DIR fgrunbuild
CMAKE_ARGS ${FG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${FGRUN_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${OSG_INSTALL_PREFIX} -DADDITIONAL_LIBRARY_PATHS=${SG_INSTALL_PREFIX} CMAKE_ARGS ${FGRUN_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${FGRUN_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${OSG_INSTALL_PREFIX} -DADDITIONAL_LIBRARY_PATHS=${SG_INSTALL_PREFIX}
) )
endif() endif()