Replace CMAKE_SOURCE_DIR with CMAKE_CURRENT_SOURCE_DIR
Fixes #612 when yaml-cpp is used as a git submodule.
This commit is contained in:
parent
7aa52c0989
commit
ba4b4a273a
@ -9,8 +9,8 @@ endif()
|
|||||||
|
|
||||||
ExternalProject_Add(
|
ExternalProject_Add(
|
||||||
googletest_project
|
googletest_project
|
||||||
SOURCE_DIR "${CMAKE_SOURCE_DIR}/test/gtest-1.8.0"
|
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0"
|
||||||
INSTALL_DIR "${CMAKE_BINARY_DIR}/prefix"
|
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/prefix"
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
|
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
|
||||||
-DBUILD_GMOCK=ON
|
-DBUILD_GMOCK=ON
|
||||||
@ -20,12 +20,12 @@ ExternalProject_Add(
|
|||||||
add_library(gmock UNKNOWN IMPORTED)
|
add_library(gmock UNKNOWN IMPORTED)
|
||||||
set_target_properties(gmock PROPERTIES
|
set_target_properties(gmock PROPERTIES
|
||||||
IMPORTED_LOCATION
|
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)
|
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
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR
|
||||||
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user