diff options
| author | Sven Brauch <mail@svenbrauch.de> | 2017-01-03 15:38:17 +0100 |
|---|---|---|
| committer | Sven Brauch <mail@svenbrauch.de> | 2017-01-03 15:39:11 +0100 |
| commit | 72cc5afbdf8acc6505d7ee382cd3a00aca63df9b (patch) | |
| tree | 2de385f7a150ea361dd88fa5e0710e7f38a5bddc | |
| parent | efa351af560110e7f59b6bf8ba2ea019a1e95102 (diff) | |
| download | kconfig-72cc5afbdf8acc6505d7ee382cd3a00aca63df9b.tar.gz kconfig-72cc5afbdf8acc6505d7ee382cd3a00aca63df9b.tar.bz2 | |
Fix build with CMP 0026 set to NEW
| -rw-r--r-- | src/kconf_update/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/kconf_update/config-kconf.h.cmake | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/kconf_update/CMakeLists.txt b/src/kconf_update/CMakeLists.txt index 379a9243..b1342a8d 100644 --- a/src/kconf_update/CMakeLists.txt +++ b/src/kconf_update/CMakeLists.txt @@ -15,7 +15,10 @@ target_link_libraries(kconf_update Qt5::Core KF5::ConfigCore) include(ECMMarkNonGuiExecutable) ecm_mark_nongui_executable(kconf_update) -get_target_property(KCONF_UPDATE_EXECUTABLE kconf_update LOCATION) +file( + GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kconf-exec.h + CONTENT "#define KCONF_UPDATE_EXECUTABLE \"$<TARGET_FILE:kconf_update>\"" +) configure_file(config-kconf.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kconf.h ) # Although this is mostly an internal binary (hence installing it in diff --git a/src/kconf_update/config-kconf.h.cmake b/src/kconf_update/config-kconf.h.cmake index a71608d2..e8516f6e 100644 --- a/src/kconf_update/config-kconf.h.cmake +++ b/src/kconf_update/config-kconf.h.cmake @@ -1,4 +1,5 @@ #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" #define LIB_INSTALL_DIR "${LIB_INSTALL_DIR}" -#define KCONF_UPDATE_EXECUTABLE "${KCONF_UPDATE_EXECUTABLE}" +#include "kconf-exec.h" + |