From ba4b4a273a55d7587adbdba26436c9da97acfdae Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" Date: Sun, 12 Aug 2018 14:21:11 +0300 Subject: [PATCH] Replace CMAKE_SOURCE_DIR with CMAKE_CURRENT_SOURCE_DIR Fixes #612 when yaml-cpp is used as a git submodule. --- test/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a83d9dd..8bdf303 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,8 +9,8 @@ endif() ExternalProject_Add( googletest_project - SOURCE_DIR "${CMAKE_SOURCE_DIR}/test/gtest-1.8.0" - INSTALL_DIR "${CMAKE_BINARY_DIR}/prefix" + SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0" + INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/prefix" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= -DBUILD_GMOCK=ON @@ -20,12 +20,12 @@ ExternalProject_Add( add_library(gmock UNKNOWN IMPORTED) set_target_properties(gmock PROPERTIES IMPORTED_LOCATION - ${PROJECT_BINARY_DIR}/prefix/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX} + ${PROJECT_BINARY_DIR}/test/prefix/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX} ) find_package(Threads) -include_directories(SYSTEM "${PROJECT_BINARY_DIR}/prefix/include") +include_directories(SYSTEM "${PROJECT_BINARY_DIR}/test/prefix/include") if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")