From 06ef376bd8b35d6aa789abd5e9cc70c7fc883ce3 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 3 Mar 2013 16:08:01 +0000 Subject: [PATCH] Look for MSVC 3rdparty deps differently. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/ConfigureMsvc3rdParty.cmake b/CMakeModules/ConfigureMsvc3rdParty.cmake index 6475dd9c0..67c37dee3 100644 --- a/CMakeModules/ConfigureMsvc3rdParty.cmake +++ b/CMakeModules/ConfigureMsvc3rdParty.cmake @@ -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) -- 2.39.5