Small modification to cmake scripts, to fix broken 'make install' using SWIG bindings

CMakeLists.txt

@@ -11,7 +11,7 @@ include(VERSION.cmake)
 
 # --- General project settings ---
 option(BORNAGAIN_PYTHON "Build with python support" ON)
-option(BORNAGAIN_USE_PYTHON3 "Build against python 3.5 instead of 2.7" ON)
+option(BORNAGAIN_USE_PYTHON3 "Build against python 3.5 instead of 2.7" OFF)
 option(BORNAGAIN_GENERATE_BINDINGS "Generate python bindings during build (requires swig)" OFF)
 option(BORNAGAIN_GENERATE_PYTHON_DOCS "Generate python documentation from the doxygen comments" OFF)
 option(BORNAGAIN_APP "Build test application" OFF)

Core/CMakeLists.txt

@@ -96,8 +96,6 @@ if(BORNAGAIN_PYTHON)
   list(APPEND source_files "PythonAPI/libBornAgainCore_wrap.cxx")
   #list(APPEND include_files "PythonAPI/libBornAgainCore_wrap.h")
   
-  # JMF: this should be done more carefully in the future
-  #
 
   # add_custom_target(
   #   ${library_name}_python
@@ -172,6 +170,7 @@ install (DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ DESTINATION ${destination_examp
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN "*.png")
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/cpp DESTINATION ${destination_examples} COMPONENT Examples)
 install (TARGETS ${library_name} DESTINATION ${destination_lib} COMPONENT Libraries)
+install (FILES ${CMAKE_BINARY_DIR}/lib/lib${library_name}.py DESTINATION ${destination_lib} COMPONENT Libraries) # required by swig
 install (FILES ${core_include_files} DESTINATION ${destination_include} COMPONENT Headers)
 
 if(WIN32)

Fit/CMakeLists.txt

@@ -180,6 +180,7 @@ endif()
 # -----------------------------------------------
 install (TARGETS ${library_name} DESTINATION ${destination_lib} COMPONENT Libraries)
 install (FILES ${fitkernel_include_files} DESTINATION ${destination_include}  COMPONENT Headers)
+install (FILES ${CMAKE_BINARY_DIR}/lib/lib${library_name}.py DESTINATION ${destination_lib} COMPONENT Libraries) # required by SWIG
 
 if(WIN32)
     if(BORNAGAIN_PYTHON)