diff options
| author | Dominik Schmidt <dev@dominik-schmidt.de> | 2018-01-14 02:42:20 +0300 |
|---|---|---|
| committer | Dominik Schmidt <dev@dominik-schmidt.de> | 2018-01-14 02:42:20 +0300 |
| commit | 7df66f72aac595295dffcf4dc8a536822008c51d (patch) | |
| tree | a48ec471787b0161dcf46a2352448d331a58b226 | |
| parent | 576c3acaff607ebd96202cdc54a952819e19fbfb (diff) | |
Use target based include directories
| -rw-r--r-- | 3rdparty/drkonqi-parser/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/libcrashreporter-gui/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/libcrashreporter-handler/CMakeLists.txt | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/3rdparty/drkonqi-parser/CMakeLists.txt b/3rdparty/drkonqi-parser/CMakeLists.txt index 2cb91a0..c5efd24 100644 --- a/3rdparty/drkonqi-parser/CMakeLists.txt +++ b/3rdparty/drkonqi-parser/CMakeLists.txt @@ -18,4 +18,3 @@ target_link_libraries(drkonqi_backtrace_parser Qt5::Core ) set_target_properties(drkonqi_backtrace_parser PROPERTIES AUTOMOC ON) -qt5_use_modules(drkonqi_backtrace_parser Core) diff --git a/src/libcrashreporter-gui/CMakeLists.txt b/src/libcrashreporter-gui/CMakeLists.txt index 79a3bb0..2713686 100644 --- a/src/libcrashreporter-gui/CMakeLists.txt +++ b/src/libcrashreporter-gui/CMakeLists.txt @@ -1,7 +1,7 @@ set(crashreporter_SOURCES CrashReporter.cpp CrashReporterGzip.cpp) set(crashreporter_UI CrashReporter.ui) set(crashreporter_RC ../../resources.qrc) -set(crashreporter_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) +set(crashreporter_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) if(UNIX AND NOT APPLE) @@ -22,9 +22,7 @@ list(APPEND crashreporter_SOURCES ) endif() -qt_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} ) - -include_directories( ${crashreporter_INCLUDE_DIRECTORIES} ) +qt5_wrap_ui(crashreporter_UI_HEADERS ${crashreporter_UI}) add_library(crashreporter-gui STATIC ${crashreporter_SOURCES} @@ -33,6 +31,7 @@ add_library(crashreporter-gui STATIC ${crashreporter_RC_RCC} ) +target_include_directories(crashreporter-gui PUBLIC ${crashreporter_INCLUDE_DIRECTORIES}) target_link_libraries(crashreporter-gui ${QT_QTGUI_LIBRARY} diff --git a/src/libcrashreporter-handler/CMakeLists.txt b/src/libcrashreporter-handler/CMakeLists.txt index 36543d5..e9bd6a0 100644 --- a/src/libcrashreporter-handler/CMakeLists.txt +++ b/src/libcrashreporter-handler/CMakeLists.txt @@ -1,6 +1,7 @@ # message(FATAL_ERROR "${CMAKE_CURRENT_LIST_DIR}/../../3rdparty/breakpad") list(APPEND crashreporter-handler_INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_LIST_DIR}/.. ${CMAKE_CURRENT_LIST_DIR}/../../3rdparty/breakpad ${QT_QTCORE_INCLUDE_DIR} ) @@ -13,8 +14,8 @@ list(APPEND crashreporter-handler_LIBRARIES crashreporter-breakpad ) -include_directories(${crashreporter-handler_INCLUDE_DIRECTORIES}) add_library(crashreporter-handler STATIC ${crashreporter-handler_SOURCES}) +target_include_directories(crashreporter-handler PUBLIC ${crashreporter-handler_INCLUDE_DIRECTORIES}) target_link_libraries(crashreporter-handler ${crashreporter-handler_LIBRARIES}) qt5_use_modules(crashreporter-handler Core) |