Merge commit '93a3d833ff57ef8304cb547dd1e3664b6b276ec4' into master-merge

[xonotic/netradiant.git] / bundle / CMakeLists.txt

diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt
index eb09c24daa56053b2f1713e0bab27b8b87a1e00b..790b91894689e9e7e6a85b861a9e0dc4df9c09a3 100644 (file)
--- a/bundle/CMakeLists.txt
+++ b/bundle/CMakeLists.txt
@@ -1,14 +1,22 @@
 if (WIN32)
     set(BUNDLE_OS_NAME "windows")
-       set(BUNDLE_SHARE ON)
+    set(BUNDLE_SHARE ON)
+elseif (APPLE)
+    set(BUNDLE_OS_NAME "macos")
+    set(BUNDLE_SHARE ON)
+    set(BUNDLE_ETC ON)
 elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(BUNDLE_OS_NAME "linux")
+elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
+    set(BUNDLE_OS_NAME "freebsd")
 else ()
     set(BUNDLE_OS_NAME "unsupported")
 endif ()
 
 add_custom_target(bundle ALL
-    COMMAND "${PROJECT_SOURCE_DIR}/library-bundler"
+    COMMAND
+    export LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} &&
+    "${PROJECT_SOURCE_DIR}/library-bundler"
     "${BUNDLE_OS_NAME}" "${PROJECT_BINARY_DIR}"
     VERBATIM
     COMMENT "Bundling libraries"
@@ -16,12 +24,19 @@ add_custom_target(bundle ALL
 
 install(DIRECTORY
     ${PROJECT_BINARY_DIR}/lib
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
+    DESTINATION ${FINAL_INSTALL_PREFIX}
 )
 
 if (BUNDLE_SHARE)
     install(DIRECTORY
         ${PROJECT_BINARY_DIR}/share
-        DESTINATION ${CMAKE_INSTALL_PREFIX}
+        DESTINATION ${FINAL_INSTALL_PREFIX}
+    )
+endif ()
+
+if (BUNDLE_ETC)
+    install(DIRECTORY
+        ${PROJECT_BINARY_DIR}/etc
+        DESTINATION ${FINAL_INSTALL_PREFIX}
     )
 endif ()