From ac96a4c9b90164f435f483167627d816315aa8aa Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 4 Apr 2017 14:54:05 +0200 Subject: [PATCH] Simplify this, GAMMARAY_PROBE_ONLY_BUILD is always FALSE at this point --- launcher/core/CMakeLists.txt | 39 +++++++++++++++++------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt index 0de4159038..fd63245d29 100644 --- a/launcher/core/CMakeLists.txt +++ b/launcher/core/CMakeLists.txt @@ -62,30 +62,27 @@ if(UNIX AND NOT APPLE AND NOT QNXNTO) target_link_libraries(gammaray_launcher LINK_PRIVATE dl) # for preload check endif() -if(NOT GAMMARAY_PROBE_ONLY_BUILD) - install(TARGETS gammaray_launcher EXPORT GammaRayTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS gammaray_launcher EXPORT GammaRayTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) - gammaray_install_headers(DESTINATION launcher - ${CMAKE_CURRENT_BINARY_DIR}/gammaray_launcher_export.h - launcher.h - launchoptions.h - probeabi.h - probeabidetector.h - probefinder.h - networkdiscoverymodel.h - ) +gammaray_install_headers(DESTINATION launcher + ${CMAKE_CURRENT_BINARY_DIR}/gammaray_launcher_export.h + launcher.h + launchoptions.h + probeabi.h + probeabidetector.h + probefinder.h + networkdiscoverymodel.h +) - ecm_generate_pri_file(BASE_NAME GammaRayLauncher - LIB_NAME gammaray_launcher - DEPS "core gui GammaRayCommon" - FILENAME_VAR PRI_FILENAME - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR} - ) +ecm_generate_pri_file(BASE_NAME GammaRayLauncher + LIB_NAME gammaray_launcher + DEPS "core gui GammaRayCommon" + FILENAME_VAR PRI_FILENAME + INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR} +) + +install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) - install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) -else() - install(TARGETS gammaray_launcher ${INSTALL_TARGETS_DEFAULT_ARGS}) -endif() if(MSVC) install(FILES "$/$" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug RelWithDebInfo) endif()