Cleanup of MacOS cmake installation related files

GUI/main/CMakeLists.txt

@@ -45,9 +45,9 @@ endif()
 
 if(APPLE AND CREATE_BUNDLE)
   add_executable(${executable_name} MACOSX_BUNDLE ${source_files} ${include_files})
-  get_filename_component(PYTHON_REAL_LIBRARY "${PYTHON_LIBRARY}" REALPATH)
-  add_library(Python SHARED IMPORTED)
-  set_property(TARGET Python PROPERTY IMPORTED_LOCATION ${PYTHON_REAL_LIBRARY})
+#  get_filename_component(PYTHON_REAL_LIBRARY "${PYTHON_LIBRARY}" REALPATH)
+#  add_library(Python SHARED IMPORTED)
+#  set_property(TARGET Python PROPERTY IMPORTED_LOCATION ${PYTHON_REAL_LIBRARY})
 
   target_link_libraries(${executable_name}
     ${ManhattanStyle_LIBRARY}
@@ -58,7 +58,7 @@ if(APPLE AND CREATE_BUNDLE)
     ${BornAgainCore_LIBRARY}
     ${BornAgainFit_LIBRARY}
     ${BornAgainGUI_LIBRARY}
-    Python
+#    Python
   )
 else()
   add_executable(${executable_name} ${WIN_CONSOLE} ${source_files} ${include_files} ${RC_FILE})
@@ -107,7 +107,7 @@ IF(APPLE AND CREATE_BUNDLE)
   get_filename_component(qcustomplot_LIBRARY_DIR "${qcustomplot_LIBRARY}" REALPATH)
   get_filename_component(qtpropertybrowser_LIBRARY_DIR "${qtpropertybrowser_LIBRARY}" REALPATH)
   get_filename_component(Boost_Real_LIBRARY_DIR "${Boost_LIBRARY_DIR}" REALPATH)
-  get_filename_component(PYTHON_LIBRARY_DIR "${PYTHON_REAL_LIBRARY}" PATH)
+#  get_filename_component(PYTHON_LIBRARY_DIR "${PYTHON_REAL_LIBRARY}" PATH)
 
 #  message("PYTHON_LIBRARY_DIR: ${PYTHON_LIBRARY_DIR}")
 
@@ -115,7 +115,7 @@ IF(APPLE AND CREATE_BUNDLE)
     ${ManhattanStyle_LIBRARY_DIR}
     ${qcustomplot_LIBRARY_DIR}
     ${qtpropertybrowser_LIBRARY_DIR}
-    ${PYTHON_LIBRARY_DIR}
+#    ${PYTHON_LIBRARY_DIR}
     ${Boost_Real_LIBRARY_DIR}
     "${CMAKE_BINARY_DIR}/lib"
     "$ENV{QTDIR}"

cmake/modules/BABundleUtilities.cmake

@@ -727,7 +727,7 @@ function(fixup_bundle app libs dirs)
         message(STATUS "${i}/${n}: *NOT* copying '${${key}_RESOLVED_ITEM}'")
       endif()
 
-      set(show_status 0)
+      set(show_status 1)
       if(show_status)
         message(STATUS "key='${key}'")
         message(STATUS "item='${${key}_ITEM}'")
@@ -765,7 +765,13 @@ function(fixup_bundle app libs dirs)
     message(STATUS "fixup_bundle: cleaning up...")
     clear_bundle_keys(keys)
 
-    fixup_python_framework("${exepath}" "${dirs}")
+    message(STATUS "XXX ${exepath} ${dirs}")
+#    fixup_python_framework("${exepath}" "${dirs}")
+
+    set(install_name_tool_cmd "install_name_tool -change @executable_path/../Frameworks/Python.framework/Versions/2.7/Python @rpath/Python ${exepath}/libBornAgainCore.so")
+    message(STATUS "XXX ${install_name_tool_cmd}")
+    execute_process(COMMAND chmod u+w "${exepath}/libBornAgainCore.so")
+    execute_process(COMMAND ${install_name_tool_cmd})
 
     message(STATUS "fixup_bundle: verifying...")
     verify_app("${app}")
@@ -886,6 +892,7 @@ function(verify_app app)
   endif()
 
   if(NOT verified)
-    message(FATAL_ERROR "error: verify_app failed")
+#    message(FATAL_ERROR "error: verify_app failed")
+    message(WARNING "error: verify_app failed")
   endif()
 endfunction()

cmake/modules/SetUpMacOS.cmake

 set(BORNAGAIN_ARCHITECTURE macosx)
 set(BORNAGAIN_PLATFORM macosx)
 
-set(SYSLIBS "-lm ${EXTRA_LDFLAGS} ${FINK_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} -ldl")
-set(XLIBS "${XPMLIBDIR} ${XPMLIB} ${X11LIBDIR} -lXext -lX11")
-set(CILIBS "-lm ${EXTRA_LDFLAGS} ${FINK_LDFLAGS} -ldl")
-#set(CRYPTLIBS "-lcrypt")
-set(CMAKE_M_LIBS -lm)
+#set(SYSLIBS "-lm ${EXTRA_LDFLAGS} ${FINK_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} -ldl")
+#set(XLIBS "${XPMLIBDIR} ${XPMLIB} ${X11LIBDIR} -lXext -lX11")
+#set(CILIBS "-lm ${EXTRA_LDFLAGS} ${FINK_LDFLAGS} -ldl")
+##set(CRYPTLIBS "-lcrypt")
+#set(CMAKE_M_LIBS -lm)
 
 #---This is needed to help CMake to locate the X11 headers in the correct place and not under /usr/include
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6)
+#set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6)
 #---------------------------------------------------------------------------------------------------------
 
 if (CMAKE_SYSTEM_NAME MATCHES Darwin)
@@ -26,7 +26,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
     #TODO: more stuff check configure script
     execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT)
     if(${SYSCTL_OUTPUT} MATCHES 64)
-       MESSAGE(STATUS "Found a 64bit system") 
+       MESSAGE(STATUS "Found a 64bit system")
        set(BORNAGAIN_ARCHITECTURE macosx64)
        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
        SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64")
@@ -35,57 +35,57 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
        SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
     else(${SYSCTL_OUTPUT} MATCHES 64)
-       MESSAGE(STATUS "Found a 32bit system") 
+       MESSAGE(STATUS "Found a 32bit system")
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
        SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
     endif(${SYSCTL_OUTPUT} MATCHES 64)
   endif()
-  
-  if (CMAKE_COMPILER_IS_GNUCXX)
-     message(STATUS "Found GNU compiler collection")
-     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
-     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
-     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-     SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
-     SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+#  if (CMAKE_COMPILER_IS_GNUCXX)
+#     message(STATUS "Found GNU compiler collection")
+#     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+#     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
+#     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
+#     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
+#     SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+#     SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
   
-     SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -flat_namespace -single_module -undefined dynamic_lookup")
-     SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -flat_namespace -single_module -undefined dynamic_lookup")
+#     SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -flat_namespace -single_module -undefined dynamic_lookup")
+#     SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -flat_namespace -single_module -undefined dynamic_lookup")
   
-     set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -bind_at_load -m64")
-     set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -bind_at_load -m64")
+#     set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -bind_at_load -m64")
+#     set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -bind_at_load -m64")
 
-     # Select flags.
-     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
-     set(CMAKE_CXX_FLAGS_RELEASE        "-O2")
-     set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
-     set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
-     set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
-     set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
-     set(CMAKE_C_FLAGS_RELEASE          "-O2")
-     set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
-     set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
-     set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+#     # Select flags.
+#     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+#     set(CMAKE_CXX_FLAGS_RELEASE        "-O2")
+#     set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+#     set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
+#     set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+#     set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+#     set(CMAKE_C_FLAGS_RELEASE          "-O2")
+#     set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+#     set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+#     set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
    
-     #settings for cint
-     set(CPPPREP "${CMAKE_CXX_COMPILER} -E -C")  
-     set(CXXOUT "-o ")
-     set(EXEEXT "")
-     set(SOEXT "so")
+#     #settings for cint
+#     set(CPPPREP "${CMAKE_CXX_COMPILER} -E -C")
+#     set(CXXOUT "-o ")
+#     set(EXEEXT "")
+#     set(SOEXT "so")
 
-  elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
+  if(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
   
      message(STATUS "Found LLVM compiler collection")
      execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 
      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
-     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
-     SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
-     SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+#     SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
+#     SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+#     SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
   
      SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -flat_namespace -single_module -undefined dynamic_lookup")
      SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -flat_namespace -single_module -undefined dynamic_lookup")
@@ -115,7 +115,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
   endif()
   
   #---Set Linker flags----------------------------------------------------------------------
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib")
+#  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib")
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SOURCE_DIR}/Core/Tools/inc -include WinDllMacros.h")