Use Boost from Jenkins, on Windows.
This commit is contained in:
parent
40b0daec9f
commit
5e82468203
4 changed files with 17 additions and 6 deletions
|
@ -78,7 +78,7 @@ elseif(MSVC)
|
|||
# for compatability with MSVC directory layout
|
||||
set(OSG_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install/${OSG_MSVC}/OpenSceneGraph)
|
||||
SET(OSG_SOURCE URL http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.1.4.zip)
|
||||
|
||||
|
||||
list(APPEND OSG_DEPS WinDeps)
|
||||
else()
|
||||
# normal OSG
|
||||
|
@ -97,7 +97,16 @@ if (MSVC)
|
|||
INSTALL_COMMAND ""
|
||||
)
|
||||
|
||||
|
||||
ExternalProject_Add(Boost
|
||||
DOWNLOAD_COMMAND URL http://flightgear.simpits.org:8080/job/Boost-Win/lastSuccessfulBuild/artifact/Boost/boost/*zip*/boost.zip
|
||||
SOURCE_DIR ${CMAKE_BINARY_DIR}/Boost/boost
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_COMMAND ""
|
||||
INSTALL_COMMAND ""
|
||||
)
|
||||
|
||||
list(APPEND SG_DEPS Boost)
|
||||
|
||||
list(APPEND SG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR})
|
||||
list(APPEND FG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR})
|
||||
endif(MSVC) # of Windows
|
||||
|
@ -160,4 +169,5 @@ ExternalProject_Add(FlightGear
|
|||
UPDATE_COMMAND "" # or update.
|
||||
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/flightgear
|
||||
BINARY_DIR fgbuild
|
||||
CMAKE_ARGS ${FG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} )
|
||||
CMAKE_ARGS ${FG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
|
||||
)
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 06ef376bd8b35d6aa789abd5e9cc70c7fc883ce3
|
||||
Subproject commit 8d56b4664ac77597571dbc0a40459fecf2b4c44e
|
|
@ -6,6 +6,7 @@ REM using this bat file.
|
|||
|
||||
echo %CD%
|
||||
|
||||
xcopy /Y /E winDeps .
|
||||
md 3rdParty
|
||||
xcopy /Y /E winDeps/3rdParty 3rdParty
|
||||
|
||||
echo "Done copying Windows deps"
|
||||
|
|
2
simgear
2
simgear
|
@ -1 +1 @@
|
|||
Subproject commit 67efc1f68f927613efa06c93fd87fb4158d51b05
|
||||
Subproject commit ff844f67604444763ec9b8d44401fa166f565097
|
Loading…
Reference in a new issue