Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2017-12-14 19:54:31 +0300
committerDominik Schmidt <dev@dominik-schmidt.de>2018-01-13 15:58:17 +0300
commit3ae327ea8ea31da46995da01c6b623c14248dc65 (patch)
tree1d6ed12187c29bb42e794f1839c8dabcd263f240 /src/crashreporter
parent1c721e9422069744dcc3447219487bf2695a81b6 (diff)
Modernize out CMakeLists.txt
Mainly uses target_include_directories instead of include_directories so libraries public include directory get automatically added when adding the target in target_link_library
Diffstat (limited to 'src/crashreporter')
-rw-r--r--src/crashreporter/CMakeLists.txt9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt
index 0d7938a34..3354e9a5e 100644
--- a/src/crashreporter/CMakeLists.txt
+++ b/src/crashreporter/CMakeLists.txt
@@ -4,10 +4,6 @@ cmake_policy(SET CMP0017 NEW)
list(APPEND crashreporter_SOURCES main.cpp)
list(APPEND crashreporter_RC resources.qrc)
-qt_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} )
-qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} )
-
-
# TODO: differentiate release channel
# if(BUILD_RELEASE)
# set(CRASHREPORTER_RELEASE_CHANNEL "release")
@@ -19,10 +15,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CrashReporterConfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/CrashReporterConfig.h)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}
- "../3rdparty/libcrashreporter-qt/src/"
-)
-
if(NOT BUILD_LIBRARIES_ONLY)
add_executable( ${CRASHREPORTER_EXECUTABLE} WIN32
@@ -32,6 +24,7 @@ if(NOT BUILD_LIBRARIES_ONLY)
${crashreporter_RC_RCC}
)
+ target_include_directories(${CRASHREPORTER_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/libcrashreporter-qt/src/" )
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )