fly/fgmeta
1
0
Fork 0
Code Activity

Superbuild: use SVN for 3rdParty and Boost + add exit code in installWinDeps.bat if xcopy fails

Browse source
This commit is contained in:
Clement de l'Hamaide 2013-11-16 00:07:57 +01:00
parent e5531723b8
commit ba53b4ce5f
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
CMakeLists.txt
View file

@ -102,33 +102,30 @@ 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
DOWNLOAD_COMMAND URL http://files.goneabitbursar.com/fg/fgfs-${WIN_TAG}-VS100-3rdParty+OSG-20120411.zip SVN_REPOSITORY http://fgfs.goneabitbursar.com/fgwin3rdparty/trunk/msvc100/${Rd_Party_Lower}
# extract to current root # extract to current root
SOURCE_DIR ${CMAKE_BINARY_DIR}/winDeps SOURCE_DIR ${CMAKE_BINARY_DIR}/winDeps/${RDPARTY_DIR}
BINARY_DIR ${CMAKE_BINARY_DIR} BINARY_DIR ${CMAKE_BINARY_DIR}
UPDATE_COMMAND ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND ${CMAKE_SOURCE_DIR}/installWinDeps.bat BUILD_COMMAND ${CMAKE_SOURCE_DIR}/installWinDeps.bat
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
set(BOOST_ARGS link=static stage --with-system)
set( Boost_Version 1.54.0 )
string( REPLACE "." "_" Boost_Version_Underscore ${Boost_Version} )
set(BOOST_ARGS link=static stage --with-system)
ExternalProject_Add(Boost ExternalProject_Add(Boost
PREFIX ${CMAKE_BINARY_DIR} PREFIX ${CMAKE_BINARY_DIR}
URL http://downloads.sourceforge.net/project/boost/boost/${Boost_Version}/boost_${Boost_Version_Underscore}.zip SVN_REPOSITORY http://svn.boost.org/svn/boost/tags/release/Boost_1_54_0
URL_MD5 78a35834c45220a6164310e280abe675 UPDATE_COMMAND ${BOOST_BOOTSTRAP}
UPDATE_COMMAND "bootstrap.bat"
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND bjam --with-program_options ${BOOST_ARGS} BUILD_COMMAND bjam --with-program_options ${BOOST_ARGS}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
list(APPEND SG_DEPS Boost) list(APPEND SG_DEPS Boost)
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) list(APPEND FGRUN_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR}/src/Boost)

17
installWinDeps.bat
View file

@ -1,5 +1,3 @@
REM ExternalProject can't cleanly extract a zip into an existing directory REM ExternalProject can't cleanly extract a zip into an existing directory
REM Instead we extract to a subdir, and then move the directories we want REM Instead we extract to a subdir, and then move the directories we want
REM using this bat file. REM using this bat file.
@ -8,9 +6,14 @@ echo %CD%
IF EXIST winDeps/3rdParty ( IF EXIST winDeps/3rdParty (
md 3rdParty md 3rdParty
xcopy /Y /E winDeps/3rdParty 3rdParty xcopy /Y /E winDeps/3rdParty 3rdParty
echo "Done copying Windows deps"
) ELSE (
IF EXIST winDeps/3rdParty.x64 (
md 3rdParty.x64
xcopy /Y /E winDeps/3rdParty.x64 3rdParty.x64
echo "Done copying Windows deps"
) ELSE (
echo "Error: Windows deps not found"
exit -1
)
) )
IF EXIST winDeps/3rdParty.x64 (
md 3rdParty.x64
xcopy /Y /E winDeps/3rdParty.x64 3rdParty.x64
)
echo "Done copying Windows deps"