From 37f56e621b68afb09d920a9c78a24c6f35d25468 Mon Sep 17 00:00:00 2001 From: Sergey Naumov Date: Sun, 4 Sep 2016 18:12:55 +0300 Subject: [PATCH] Fixies in CMakeLists.txt --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2b6aca..c9dc3cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,11 +27,11 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2") file(GLOB_RECURSE SRC src/*.cpp) add_library(i3ipc++_static STATIC ${SRC}) -set(I3IPCpp_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR}) +set(I3IPCpp_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR} ${SIGCPP_LIBRARY_DIRS}) set(I3IPCpp_INCLUDE_DIRS ${SIGCPP_INCLUDE_DIRS} - 3rd/auss/include - ${CMAKE_CURRENT_SOURCE_DIR}/include/ + ${PROJECT_SOURCE_DIR}/3rd/auss/include + ${PROJECT_SOURCE_DIR}/include/ ) set(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} ${JSONCPP_LIBRARIES}) @@ -40,7 +40,7 @@ set(I3IPCpp_INCLUDE_DIRS ${I3IPCpp_INCLUDE_DIRS} PARENT_SCOPE) set(I3IPCpp_LIBRARIES ${I3IPCpp_LIBRARIES} PARENT_SCOPE) if(I3IPCpp_BUILD_EXAMPLES) - add_subdirectory(examples) + add_subdirectory(${PROJECT_SOURCE_DIR}/examples) endif() if(I3IPCpp_WITH_TESTS) @@ -49,7 +49,7 @@ if(I3IPCpp_WITH_TESTS) include_directories(${CXXTEST_INCLUDE_DIR}) include_directories(src/) add_definitions( - -DTEST_SRC_ROOT="${CMAKE_CURRENT_SOURCE_DIR}/test" + -DTEST_SRC_ROOT="${PROJECT_SOURCE_DIR}/test" ) enable_testing()