diff options
| author |  Fabio Bas | 2008-04-14 18:27:17 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-04-14 18:27:17 +0000 |
| commit | ceee2dacb8f6039602ef296f269d91e2138616ef (patch) | |
| tree | e83cfe8340f23de26638e616d0b88053591caec5 | |
| parent | updated rules (diff) | |
| download | KVIrc-ceee2dacb8f6039602ef296f269d91e2138616ef.tar.gz KVIrc-ceee2dacb8f6039602ef296f269d91e2138616ef.tar.bz2 KVIrc-ceee2dacb8f6039602ef296f269d91e2138616ef.zip | |
Fixed kvirc4-config creation and installation (out of source builds)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1484 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/kvi_sysconfig.h.cmake | 2 | ||||
| -rw-r--r-- | scripts/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | scripts/config/CMakeLists.txt | 9 |
4 files changed, 13 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d48ca7198..a3d42c67b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,7 +329,7 @@ ENDIF() INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) -CONFIGURE_FILE(${kvirc_SOURCE_DIR}/cmake/kvirc-config.cmake ${kvirc_BINARY_DIR}/kvirc-config @ONLY) +CONFIGURE_FILE(${kvirc_SOURCE_DIR}/cmake/kvirc-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/scripts/config/kvirc${VERSION_MAJOR}-config @ONLY) #CONFIGURE_FILE(${kvirc_SOURCE_DIR}/cmake/FindKVIrc.cmake.in ${kvirc_BINARY_DIR}/FindKVIrc.cmake @ONLY) #CONFIGURE_FILE(${kvirc_SOURCE_DIR}/cmake/Doxyfile.cmake ${kvirc_BINARY_DIR}/Doxyfile @ONLY) diff --git a/cmake/kvi_sysconfig.h.cmake b/cmake/kvi_sysconfig.h.cmake index 8269d623b..6ecca39ea 100644 --- a/cmake/kvi_sysconfig.h.cmake +++ b/cmake/kvi_sysconfig.h.cmake @@ -24,7 +24,7 @@ #define KVIRC_VERSION_RELEASE "${CMAKE_KVIRC_VERSION_RELEASE}" #define KVIRC_VERSION_BRANCH "${CMAKE_KVIRC_VERSION_BRANCH}" -#define KVIRC_BUILD_DATE "?.?.?" +#define KVIRC_BUILD_DATE __DATE__" "__TIME__ #define KVIRC_BUILD_COMMAND "${CMAKE_KVIRC_BUILD_COMMAND}" #define KVIRC_BUILD_FLAGS "${CMAKE_KVIRC_BUILD_FLAGS}" #define KVIRC_BUILD_SYSTEM "${CMAKE_KVIRC_BUILD_SYSTEM}" diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 6d2aefc65..709f33806 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -1,14 +1,4 @@ # CMakeLists for scripts/ -SET(kvishellscripts - config/kvirc4-config -) - -# Install target -IF(UNIX) - IF(NOT APPLE) - # This files are useless because apple bundles are movable - # Assume linux - INSTALL(FILES ${kvishellscripts} DESTINATION ${INSTALL_PREFIX}/bin) - ENDIF() -ENDIF() +# Find subdirs +SUBDIRS(config)
\ No newline at end of file diff --git a/scripts/config/CMakeLists.txt b/scripts/config/CMakeLists.txt new file mode 100644 index 000000000..4b738554e --- /dev/null +++ b/scripts/config/CMakeLists.txt @@ -0,0 +1,9 @@ +# CMakeLists for scripts/config +# Install target +IF(UNIX) + IF(NOT APPLE) + # This files are useless because apple bundles are movable + # Assume linux + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kvirc${VERSION_MAJOR}-config DESTINATION ${INSTALL_PREFIX}/bin PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) + ENDIF() +ENDIF() |