First installer wich kind of work under mingw

CMakeLists.txt

@@ -8,7 +8,7 @@ project(BornAgain)
 
 # --- General project settings ---
 if(NOT BORNAGAIN_PYTHON)
-    set(BORNAGAIN_PYTHON ON)
+#    set(BORNAGAIN_PYTHON ON)
 endif()
 set(BORNAGAIN_APP OFF)
 set(BORNAGAIN_GUI OFF)
@@ -39,4 +39,4 @@ add_subdirectory(Tests/FunctionalTests)
 
 
 # packaging
-#include(BornAgainCPack)
+include(BornAgainCPack)

Core/CMakeLists.txt

@@ -88,10 +88,17 @@ set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
 # -----------------------------------------------
 # installation
 # -----------------------------------------------
-install (TARGETS ${library_name} DESTINATION lib)
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ DESTINATION Examples FILES_MATCHING PATTERN "*.py")
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ DESTINATION Examples FILES_MATCHING PATTERN "README")
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/bin/ DESTINATION bin)
+install (TARGETS ${library_name} DESTINATION lib)
+install (TARGETS ${library_name} DESTINATION bin)
+
+if(WIN32)
+    install(FILES 
+    ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd
+    DESTINATION bin)
+endif()
 
 # list of headers to install
 file(GLOB include_files

Fit/CMakeLists.txt

@@ -70,6 +70,10 @@ set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
 # -----------------------------------------------
 install (TARGETS ${library_name} DESTINATION lib)
 
+if(WIN32 AND BORNAGAIN_PYTHON)
+    install(FILES ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd DESTINATION bin)
+endif()
+
 # list of headers to install
 file(GLOB include_files
     "Factory/inc/*.h"

cmake/modules/BornAgainCPack.cmake

-#---------------------------------------------------------------------------------------------------
-#  RootCPack.cmake
-#   - basic setup for packaging ROOT using CTest
-#---------------------------------------------------------------------------------------------------
+# file to build installer
 
 set(BORNAGAIN_MAJOR_VERSION "0")
-set(BORNAGAIN_MINOR_VERSION "8")
-set(BORNAGAIN_PATCH_VERSION "1")
+set(BORNAGAIN_MINOR_VERSION "9")
+set(BORNAGAIN_PATCH_VERSION "0")
 
-set(ROOT_VERSION "${BORNAGAIN_MAJOR_VERSION}.${BORNAGAIN_MINOR_VERSION}.${BORNAGAIN_PATCH_VERSION}")
+set(BORNAGAIN_VERSION "${BORNAGAIN_MAJOR_VERSION}.${BORNAGAIN_MINOR_VERSION}.${BORNAGAIN_PATCH_VERSION}")
 
+install (FILES ${Boost_LIBRARIES} DESTINATION bin)
+install (FILES ${FFTW_LIBRARY} DESTINATION bin)
+install (FILES ${GSL_LIBRARIES} DESTINATION bin)
 
-#---------------------------------------------------------------------------------------------------
-# Package up needed system libraries - only for WIN32?
-#
-include(InstallRequiredSystemLibraries)
-
-#----------------------------------------------------------------------------------------------------
-# General packaging setup - variable relavant to all package formats
-#
-set(CPACK_PACKAGE_DESCRIPTION "BornAgain project")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BornAgain project")
-#set(CPACK_PACKAGE_VENDOR "HEPSoft")
+set(CPACK_PACKAGE_NAME "BornAgain")
+set(CPACK_PACKAGE_DESCRIPTION "BornAgain: simulate and fit scattering at grazing incidence")
+set(CPACK_PACKAGE_VENDOR "Forschungszentrum Jlich")
 set(CPACK_PACKAGE_VERSION ${BORNAGAIN_VERSION})
 set(CPACK_PACKAGE_VERSION_MAJOR ${BORNAGAIN_MAJOR_VERSION})
 set(CPACK_PACKAGE_VERSION_MINOR ${BORNAGAIN_MINOR_VERSION})
 set(CPACK_PACKAGE_VERSION_PATCH ${BORNAGAIN_PATCH_VERSION})
 
-#---Resource Files-----------------------------------------------------------------------------------
-#configure_file(README/README README.txt COPYONLY)
-#configure_file(LICENSE LICENSE.txt COPYONLY)
-#set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/README.txt")
-#set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/LICENSE.txt")
-#set(CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/README.txt")
-
-#---Source package settings--------------------------------------------------------------------------
-set(CPACK_SOURCE_IGNORE_FILES 
-    ${PROJECT_BINARY_DIR}
-    ${PROJECT_SOURCE_DIR}/tests
-    "~$"
-    "/CVS/"
-    "/.svn/"
-    "/\\\\\\\\.svn/"
-    "/.git/"
-    "/\\\\\\\\.git/"
-    "\\\\\\\\.swp$"
-    "\\\\\\\\.swp$"
-    "\\\\.swp"
-    "\\\\\\\\.#"
-    "/#"
-)
-set(CPACK_SOURCE_STRIP_FILES "")
+configure_file(LICENSE LICENSE.txt COPYONLY)
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/LICENSE.txt")
 
-#---Binary package setup-----------------------------------------------------------------------------
-set(CPACK_PACKAGE_RELOCATABLE True)
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "BornAgain ${BORNAGAIN_MAJOR_VERSION}.${BORNAGAIN_MINOR_VERSION}")
-if(CMAKE_BUILD_TYPE STREQUAL Release)
-  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${BORNAGAIN_ARCHITECTURE}")
-else()
-  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${BORNAGAIN_ARCHITECTURE}-${CMAKE_BUILD_TYPE}")
-endif()
-#set(CPACK_PACKAGE_EXECUTABLES "root" "ROOT")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "BornAgain-${BORNAGAIN_MAJOR_VERSION}.${BORNAGAIN_MINOR_VERSION}.${BORNAGAIN_PATCH_VERSION}")
+set(CPACK_MONOLITHIC_INSTALL ON)
 
-if(WIN32)
-  set(CPACK_GENERATOR "NSIS;ZIP")
-  set(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
-elseif(APPLE)
-#  set(CPACK_GENERATOR "PackageMaker;TGZ")
-  set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
-else()
-  set(CPACK_GENERATOR "STGZ;TGZ")
-  set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;ZIP")
-endif()
-
-#----------------------------------------------------------------------------------------------------
-# Finally, generate the CPack per-generator options file and include the
-# base CPack configuration.
-#
-#configure_file(cmake/modules/CMakeCPackOptions.cmake.in CMakeCPackOptions.cmake @ONLY)
-set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_BINARY_DIR}/CMakeCPackOptions.cmake)
-include(CPack)
 
-#----------------------------------------------------------------------------------------------------
-# Define components and installation types (after CPack included!)
-#
-cpack_add_install_type(full      DISPLAY_NAME "Full Installation")
-cpack_add_install_type(minimal   DISPLAY_NAME "Minimal Installation")
-cpack_add_install_type(developer DISPLAY_NAME "Developer Installation")
 
-cpack_add_component(applications 
-    DISPLAY_NAME "BornAgain Applications" 
-    DESCRIPTION "BornAgain executables such as root.exe"
-	  INSTALL_TYPES full minimal developer)
-
-cpack_add_component(libraries 
-    DISPLAY_NAME "BornAgain Libraries" 
-    DESCRIPTION "All BornAgain libraries and dictionaries"
-	  INSTALL_TYPES full minimal developer)
-
-cpack_add_component(headers 
-    DISPLAY_NAME "C++ Headers" 
-    DESCRIPTION "These are needed to do any development"
-	  INSTALL_TYPES full developer)
-	  
-cpack_add_component(tests 
-    DISPLAY_NAME "BornAgain Tests and Tutorials" 
-    DESCRIPTION "These are needed to do any test and tutorial"
-	  INSTALL_TYPES full developer)
+# -------------------------------
+set(CPACK_GENERATOR NSIS)
 
+set(CPACK_NSIS_MODIFY_PATH ON)
 
+include(CPack)