Permalink
Browse files

Fix paths in CMakeLists.txt

  • Loading branch information...
olesalscheider committed Jun 17, 2018
1 parent da32612 commit 39fe288bcbbe12ba3ec8d494def76cfddb65fc0d
Showing with 13 additions and 11 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 doc/CMakeLists.txt
  3. +4 −3 examples/CMakeLists.txt
  4. +3 −3 src/CMakeLists.txt
  5. +4 −3 tests/CMakeLists.txt
View
@@ -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)
View
@@ -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)
View
@@ -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)
View
@@ -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)
View
@@ -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)

0 comments on commit 39fe288

Please sign in to comment.