ctd and finished

Core/CMakeLists.txt

@@ -18,9 +18,10 @@ if(${Cerf_IS_CPP})
     string(APPEND CMAKE_CXX_FLAGS " -DCERF_AS_CPP=ON")
 endif()
 
+# --- make the library ---
+
 MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap)
 
-# exposing library name and list of include directories outside
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 
 # --- external dependencies ---
@@ -53,17 +54,3 @@ if(BORNAGAIN_MPI)
     include_directories(${MPI_INCLUDE_PATH})
     target_link_libraries(${lib} ${MPI_LIBRARIES})
 endif()
-
-if(APPLE AND BORNAGAIN_APPLE_BUNDLE)
-    set(link_flags "-Wl,-rpath,@loader_path/../../Frameworks")
-    set_target_properties(${lib} PROPERTIES LINK_FLAGS ${link_flags})
-endif()
-
-# --- installation ---
-
-install(TARGETS ${lib} DESTINATION ${destination_lib} COMPONENT Libraries)
-
-foreach(file ${include_files})
-    get_filename_component(dir ${file} DIRECTORY)
-    install(FILES ${file} DESTINATION ${destination_include}/${name}/${dir})
-endforeach()

Fit/CMakeLists.txt

@@ -10,21 +10,10 @@ set(lib BornAgain${name})
 file(GLOB source_files */*.cpp)
 file(GLOB include_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h)
 
-if(BORNAGAIN_PYTHON)
-    list(APPEND source_files "${AUTO_DIR}/lib${lib}_wrap.cpp")
-endif()
+# --- make the library ---
 
-# --- making library ---
+MakeLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap)
 
-add_library(${lib} SHARED ${source_files})
-set_target_properties(${lib} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
-set(${lib}_LIBRARY_TYPE SHARED)
-
-if(BORNAGAIN_PYTHON)
-    SwigLib(${name} ${lib} ${CMAKE_CURRENT_BINARY_DIR}/Wrap)
-endif(BORNAGAIN_PYTHON)
-
-# exposing library name and list of include directories outside
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 
 # --- external dependencies ---
@@ -32,18 +21,3 @@ set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 target_include_directories(${lib}
     PUBLIC ${RootMinimizers_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
 target_link_libraries(${lib} ${RootMinimizers_LIBRARY} ${Boost_LIBRARIES})
-
-
-if(APPLE AND BORNAGAIN_APPLE_BUNDLE)
-    set(link_flags "-Wl,-rpath,@loader_path/../../Frameworks")
-    set_target_properties(${lib} PROPERTIES LINK_FLAGS ${link_flags})
-endif()
-
-# --- installation ---
-
-install(TARGETS ${lib} DESTINATION ${destination_lib} COMPONENT Libraries)
-
-foreach(file ${include_files})
-    get_filename_component(dir ${file} DIRECTORY)
-    install(FILES ${file} DESTINATION ${destination_include}/${name}/${dir})
-endforeach()

cmake/BornAgain/MakeLib.cmake

@@ -3,12 +3,24 @@ function(MakeLib name lib tmpdir)
     if(BORNAGAIN_PYTHON)
         list(APPEND source_files "${AUTO_DIR}/lib${lib}_wrap.cpp")
     endif()
+
     add_library(${lib} SHARED ${source_files})
     set_target_properties(${lib} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
+    if(APPLE AND BORNAGAIN_APPLE_BUNDLE)
+        set(link_flags "-Wl,-rpath,@loader_path/../../Frameworks")
+        set_target_properties(${lib} PROPERTIES LINK_FLAGS ${link_flags})
+    endif()
+
     set(${lib}_LIBRARY_TYPE SHARED)
 
     if(BORNAGAIN_PYTHON)
         SwigLib(${name} ${lib} ${tmpdir})
     endif(BORNAGAIN_PYTHON)
 
+    install(TARGETS ${lib} DESTINATION ${destination_lib} COMPONENT Libraries)
+    foreach(file ${include_files})
+        get_filename_component(dir ${file} DIRECTORY)
+        install(FILES ${file} DESTINATION ${destination_include}/${name}/${dir})
+    endforeach()
+
 endfunction()