diff options
| author | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2018-06-17 16:25:43 +0200 |
|---|---|---|
| committer | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2018-06-17 16:26:14 +0200 |
| commit | 39fe288bcbbe12ba3ec8d494def76cfddb65fc0d (patch) | |
| tree | b123efc5422e03f063c8a3bfed83647bfc15f8dd | |
| parent | da32612914d3892ef3cd2cd186174c80939a3d91 (diff) | |
| download | qxmpp-39fe288bcbbe12ba3ec8d494def76cfddb65fc0d.tar.gz | |
Fix paths in CMakeLists.txt
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 7 |
5 files changed, 13 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bbc43278..db0dbfe0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(SO_VERSION 0) set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_STRING) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/modules") find_package(Qt5 REQUIRED COMPONENTS Core Network Xml) set(CMAKE_AUTOMOC ON) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index fbffdcac..2fb54f3c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -4,7 +4,7 @@ set(DOXYGEN_INPUT ${CMAKE_CURRENT_SOURCE_DIR}/index.doc ${CMAKE_CURRENT_SOURCE_DIR}/using.doc ${CMAKE_CURRENT_SOURCE_DIR}/xep.doc - ${CMAKE_SOURCE_DIR}/src + ${PROJECT_SOURCE_DIR}/src ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 0d026cff..564745c6 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -3,9 +3,10 @@ macro(add_simple_example EXAMPLE_NAME) target_link_libraries(${EXAMPLE_NAME} qxmpp) endmacro() -include_directories(../src/base) -include_directories(../src/client) -include_directories(../src/server) +include_directories(${PROJECT_SOURCE_DIR}/src/base) +include_directories(${PROJECT_SOURCE_DIR}/src/client) +include_directories(${PROJECT_SOURCE_DIR}/src/server) +include_directories(${PROJECT_BINARY_DIR}/src/base) add_simple_example(0_connected) add_simple_example(1_echoClient) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 62b4693f..9acdfbaf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,8 @@ add_definitions(-DQXMPP_BUILD) -include_directories(base) -include_directories(client) -include_directories(server) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/base) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/client) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/server) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/base/QXmppGlobal.h.in ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppGlobal.h @ONLY) include_directories(${CMAKE_CURRENT_BINARY_DIR}/base) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index bd2fc16a..64bd58d7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,9 +8,10 @@ macro(add_simple_test TEST_NAME) target_link_libraries(tst_${TEST_NAME} Qt5::Test qxmpp) endmacro() -include_directories(../src/base) -include_directories(../src/client) -include_directories(../src/server) +include_directories(${PROJECT_SOURCE_DIR}/src/base) +include_directories(${PROJECT_SOURCE_DIR}/src/client) +include_directories(${PROJECT_SOURCE_DIR}/src/server) +include_directories(${PROJECT_BINARY_DIR}/src/base) add_simple_test(qxmpparchiveiq) add_simple_test(qxmppbindiq) |