summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <[email protected]>2015-06-09 19:55:07 +0200
committerDennis Nienhüser <[email protected]>2015-06-09 19:55:07 +0200
commit4330a45d8b08872671c1b41e41ae9dffa3534715 (patch)
tree2546ee50e1fb638e5aec38a0de6fc0a0bf619c9b
parentf22cc3286a60a044ae72ca3f4715449217784c8b (diff)
Blindly trying to fix the OSX build.
Could need some help here, I lack the hardware to test things. We have a couple of cmake changes after moving to KDE Frameworks 5. See https://build.kde.org/job/marble%20master%20stable-kf5-qt5/PLATFORM=OSX,compiler=clang/22/console Mohammed, are you around? :-) CCMAIL: [email protected]
-rw-r--r--CMakeLists.txt14
1 files changed, 8 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86aa8ab..de4a9dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,14 +188,16 @@ else() # Linux / bsd etc...
set(data_dir ${CMAKE_INSTALL_PREFIX}/share/marble/data)
set(plugin_dir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/marble/plugins)
set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/marble/cmake)
- if(NOT ICON_INSTALL_DIR)
- set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
- endif(NOT ICON_INSTALL_DIR)
- if(NOT APPS_INSTALL_DIR)
- set(APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
- endif(NOT APPS_INSTALL_DIR)
endif()
+if(NOT ICON_INSTALL_DIR)
+ set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
+endif(NOT ICON_INSTALL_DIR)
+
+if(NOT APPS_INSTALL_DIR)
+ set(APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
+endif(NOT APPS_INSTALL_DIR)
+
if (NOT MARBLE_DATA_PATH)
set (MARBLE_DATA_PATH ${data_dir})
endif (NOT MARBLE_DATA_PATH)