From 53ab2edc79d2e879df26ddc149bfb5a8ba877113 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Mon, 17 Nov 2014 18:08:23 +0100
Subject: [PATCH] CMake: bugfixes in linux installation
---
GUI/main/CMakeLists.txt | 4 ++--
cmake/CMakeLists.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/GUI/main/CMakeLists.txt b/GUI/main/CMakeLists.txt
index 49c24ea42f7..7ac77f91ab0 100644
--- a/GUI/main/CMakeLists.txt
+++ b/GUI/main/CMakeLists.txt
@@ -105,7 +105,7 @@ endif()
# --- system dependent installation options ---------
if(APPLE AND BORNAGAIN_APPLE_BUNDLE)
- set(executable_destination BUNDLE DESTINATION .)
+ set(executable_destination BUNDLE DESTINATION "." RUNTIME DESTINATION "./")
else()
set(executable_destination DESTINATION ${destination_gui})
endif()
@@ -114,7 +114,7 @@ endif()
# --- common installation section ---------
message("XXX ${executable_destination}")
install (TARGETS ${executable_name} ${executable_destination} COMPONENT Applications)
-#install (TARGETS ${executable_name} ${executable_destination} COMPONENT Applications)
+#install (TARGETS ${executable_name} BUNDLE DESTINATION "." COMPONENT Applications)
set(image_files ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.ico ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns ${CMAKE_SOURCE_DIR}/GUI/coregui/images/BornAgain_48x48.png ${CMAKE_SOURCE_DIR}/GUI/coregui/images/BornAgain_64x64.png)
install (FILES ${image_files} DESTINATION ${destination_images} COMPONENT Applications)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 40ece466988..10c7b979976 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -11,7 +11,7 @@ if(NOT WIN32 AND NOT BORNAGAIN_APPLE_BUNDLE)
set(after_install_text "
Installation done. Please read below.
-------------------------------------------------------------------------------
-To be able to use BornAgain you have to add BornAgain installation directory,
+To be able to use BornAgain you have to add BornAgain libraries installation directory,
namely ${CMAKE_INSTALL_PREFIX}/${destination_lib}
into your ${ld_library_variable} and PYTHONPATH.
You can do it by running the command 'source ${CMAKE_INSTALL_PREFIX}/${destination_bin}/thisbornagain.sh'
--
GitLab