diff options
| author |  Elvio Basello | 2008-05-16 01:40:05 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-05-16 01:40:05 +0000 |
| commit | a2245606b394a3c2df059e1529eac44976a38dce (patch) | |
| tree | 00409e09d98b879004d46c9c344f2c85026e9cb3 | |
| parent | more work on addon manager (wip); added a test addon; bumped sources date (diff) | |
| download | KVIrc-a2245606b394a3c2df059e1529eac44976a38dce.tar.gz KVIrc-a2245606b394a3c2df059e1529eac44976a38dce.tar.bz2 KVIrc-a2245606b394a3c2df059e1529eac44976a38dce.zip | |
fixed coexistence rules
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1790 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | scripts/config/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/kvilib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/kvirc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/modules/addon/addonfunctions.cpp | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/scripts/config/CMakeLists.txt b/scripts/config/CMakeLists.txt index 304781999..64d9405be 100644 --- a/scripts/config/CMakeLists.txt +++ b/scripts/config/CMakeLists.txt @@ -1,9 +1,16 @@ # CMakeLists for scripts/config +# Create bin +IF(WANT_COEXISTENCE) + SET(KVIRC_CONFIG ${PACKAGE}${VERSION_MAJOR}-config) +ELSE() + SET(KVIRC_CONFIG ${PACKAGE}-config) +ENDIF() + # 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 ${CMAKE_INSTALL_PREFIX}/bin PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${KVIRC_CONFIG} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) ENDIF() ENDIF() diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 41c01574b..451a6566e 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -204,7 +204,7 @@ SET(kvilib_SRCS QT4_WRAP_CPP(kvilib_MOC_SRCS ${kvilib_MOC_HDRS}) # Create library -IF(APPEND_VER_TO_BINARIES) +IF(WANT_COEXISTENCE) SET(KVILIB_BINARYNAME kvilib${VERSION_MAJOR}) ELSE() SET(KVILIB_BINARYNAME kvilib) diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index 3c44ec5af..a49dd9ca0 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -431,7 +431,7 @@ SET(kvirc_SRCS QT4_WRAP_CPP(kvirc_MOC_SRCS ${kvirc_MOC_HDRS}) # Create bin -IF(APPEND_VER_TO_BINARIES) +IF(WANT_COEXISTENCE) SET(KVIRC_BINARYNAME ${PACKAGE}${VERSION_MAJOR}) SET(KVILIB_BINARYNAME kvilib${VERSION_MAJOR}) ELSE() diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/addonfunctions.cpp index fa566cfa7..1f8379333 100644 --- a/src/modules/addon/addonfunctions.cpp +++ b/src/modules/addon/addonfunctions.cpp @@ -246,7 +246,7 @@ namespace KviAddonFunctions const QString &szAddonAddonEngineVersion ) { - QString szAuthor = __tr2qs_ctx("Author","Addon"); + QString szAuthor = __tr2qs_ctx("Author","addon"); QString szCreatedAt = __tr2qs_ctx("Created at","addon"); QString szCreatedOn = __tr2qs_ctx("Created with","addon"); QString szAddonEngineVersion = __tr2qs_ctx("Addon Engine Version","addon"); |