diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/config/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/defscript/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/msgcolors/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/pics/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/pics/coresmall/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 5 |
7 files changed, 26 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a0affe837..ae463ea80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,6 @@ IF(UNIX) # MacOS X IF(NOT DEFINED INSTALL_PREFIX) SET(INSTALL_PREFIX ${CMAKE_BINARY_DIR}/KVirc.app) - SET(KVI_INSTALL_PREFIX ${INSTALL_PREFIX}/Contents/Resources) ENDIF() ELSE() # Linux diff --git a/data/config/CMakeLists.txt b/data/config/CMakeLists.txt index 08c70c4fc..2875c79a8 100644 --- a/data/config/CMakeLists.txt +++ b/data/config/CMakeLists.txt @@ -1,4 +1,8 @@ # CMakeLists for data/config FILE(GLOB files "*.kvc") -INSTALL(FILES ${files} DESTINATION ${KVI_INSTALL_PREFIX}/share/${KVI_PACKAGE}/${KVI_VERSION_BRANCH}/config/) +IF(APPLE) + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/config/) +ELSE() + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/) +ENDIF() diff --git a/data/defscript/CMakeLists.txt b/data/defscript/CMakeLists.txt index 30892e5a0..0aacde3db 100644 --- a/data/defscript/CMakeLists.txt +++ b/data/defscript/CMakeLists.txt @@ -1,4 +1,8 @@ # CMakeLists for data/defscript FILE(GLOB files "*.kvs") -INSTALL(FILES ${files} DESTINATION ${KVI_INSTALL_PREFIX}/share/${KVI_PACKAGE}/${KVI_VERSION_BRANCH}/defscript/)
\ No newline at end of file +IF(APPLE) + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/defscript/) +ELSE() + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/defscript/) +ENDIF() diff --git a/data/msgcolors/CMakeLists.txt b/data/msgcolors/CMakeLists.txt index 7148c5b19..133e66ba2 100644 --- a/data/msgcolors/CMakeLists.txt +++ b/data/msgcolors/CMakeLists.txt @@ -1,4 +1,8 @@ # CMakeLists for data/msgcolors FILE(GLOB files "*.msgclr") -INSTALL(FILES ${files} DESTINATION ${KVI_INSTALL_PREFIX}/share/${KVI_PACKAGE}/${KVI_VERSION_BRANCH}/msgcolors/)
\ No newline at end of file +IF(APPLE) + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/msgcolors/) +ELSE() + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/msgcolors/) +ENDIF() diff --git a/data/pics/CMakeLists.txt b/data/pics/CMakeLists.txt index df1bc58be..fd8bd1939 100644 --- a/data/pics/CMakeLists.txt +++ b/data/pics/CMakeLists.txt @@ -3,4 +3,8 @@ SUBDIRS(coresmall) FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -INSTALL(FILES ${files} DESTINATION ${KVI_INSTALL_PREFIX}/share/${KVI_PACKAGE}/${KVI_VERSION_BRANCH}/pics/)
\ No newline at end of file +IF(APPLE) + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/pics/) +ELSE() + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) +ENDIF() diff --git a/data/pics/coresmall/CMakeLists.txt b/data/pics/coresmall/CMakeLists.txt index 2a5f4154e..c123b5af6 100644 --- a/data/pics/coresmall/CMakeLists.txt +++ b/data/pics/coresmall/CMakeLists.txt @@ -1,4 +1,8 @@ # CMakeLists for data/pics/coresmall FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -INSTALL(FILES ${files} DESTINATION ${KVI_INSTALL_PREFIX}/share/${KVI_PACKAGE}/${KVI_VERSION_BRANCH}/pics/coresmall)
\ No newline at end of file +IF(APPLE) + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/pics/coresmall) +ELSE() + INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/coresmall) +ENDIF() diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index 5c331bd6d..7e55e31d0 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -570,10 +570,7 @@ void KviApp::findGlobalKvircDirectory() // Check for MacOS X Bundle compilation #ifdef Q_OS_MACX m_szGlobalKvircDir = applicationDirPath(); - m_szGlobalKvircDir+= "/../Resources/kvirc/"; - #warning you must change back hardcoded 4.0 to VERSION_BRANCH - //m_szGlobalKvircDir+= VERSION_BRANCH; - m_szGlobalKvircDir+= "4.0/"; + m_szGlobalKvircDir+= "/../Resources/"; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; #endif //Q_OS_MACX |