Skip to content
Snippets Groups Projects
Commit 53ab2edc authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

CMake: bugfixes in linux installation

parent 60c69749
No related branches found
No related tags found
No related merge requests found
...@@ -105,7 +105,7 @@ endif() ...@@ -105,7 +105,7 @@ endif()
# --- system dependent installation options --------- # --- system dependent installation options ---------
if(APPLE AND BORNAGAIN_APPLE_BUNDLE) if(APPLE AND BORNAGAIN_APPLE_BUNDLE)
set(executable_destination BUNDLE DESTINATION .) set(executable_destination BUNDLE DESTINATION "." RUNTIME DESTINATION "./")
else() else()
set(executable_destination DESTINATION ${destination_gui}) set(executable_destination DESTINATION ${destination_gui})
endif() endif()
...@@ -114,7 +114,7 @@ endif() ...@@ -114,7 +114,7 @@ endif()
# --- common installation section --------- # --- common installation section ---------
message("XXX ${executable_destination}") message("XXX ${executable_destination}")
install (TARGETS ${executable_name} ${executable_destination} COMPONENT Applications) 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) 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) install (FILES ${image_files} DESTINATION ${destination_images} COMPONENT Applications)
......
...@@ -11,7 +11,7 @@ if(NOT WIN32 AND NOT BORNAGAIN_APPLE_BUNDLE) ...@@ -11,7 +11,7 @@ if(NOT WIN32 AND NOT BORNAGAIN_APPLE_BUNDLE)
set(after_install_text " set(after_install_text "
Installation done. Please read below. 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} namely ${CMAKE_INSTALL_PREFIX}/${destination_lib}
into your ${ld_library_variable} and PYTHONPATH. into your ${ld_library_variable} and PYTHONPATH.
You can do it by running the command 'source ${CMAKE_INSTALL_PREFIX}/${destination_bin}/thisbornagain.sh' You can do it by running the command 'source ${CMAKE_INSTALL_PREFIX}/${destination_bin}/thisbornagain.sh'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment