fly/flightgear
1
0
Fork 0
Code Activity

Look for MSVC 3rdparty deps differently.

Browse source 
Check for the 3rdparty dir in the parent of build dir, not the parent of the source dir. For the recommended build layout, this is the same location, but for super-builds using fgmeta it's not (and the source tree should not be touched).

If this causes anyone issues, please let me know, since it's possible more flexibility is needed to set the path explicitly.
This commit is contained in:
James Turner 2013-03-03 16:08:01 +00:00
parent 7236541833
commit 06ef376bd8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeModules/ConfigureMsvc3rdParty.cmake
View file

@ -1,7 +1,7 @@
# ConfigureMsvc3rdParty.cmake - Configure 3rd Party Library Paths on Windows
if (MSVC)
GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH)
if (CMAKE_CL_64)
SET(TEST_3RDPARTY_DIR "${PARENT_DIR}/3rdparty.x64")
else (CMAKE_CL_64)