]> git.mxchange.org Git - flightgear.git/commitdiff
Look for MSVC 3rdparty deps differently.
authorJames Turner <zakalawe@mac.com>
Sun, 3 Mar 2013 16:08:01 +0000 (16:08 +0000)
committerJames Turner <zakalawe@mac.com>
Sun, 3 Mar 2013 16:08:01 +0000 (16:08 +0000)
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.

CMakeModules/ConfigureMsvc3rdParty.cmake

index 6475dd9c050f8f4de3b59717baf0e4d03b26ab89..67c37dee3ec7756df3cde2079c21b6694d44e425 100644 (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)