Merge pull request #937 from gpospelov/FindPython

Modern way of finding Python on a system

.appveyor.yml

@@ -10,7 +10,7 @@ platform:
 environment:
   APPVEYOR_RDP_PASSWORD: 7bKajQWvq4uhfpvc!
   BOOSTDIR: C:\Libraries\boost_1_67_0
-  PYTHONDIR: C:\Python36-x64
+  PYTHONDIR: "C:\\Python36-x64"
   QTDIR: "C:\\Qt\\5.11\\msvc2017_64"
   PATH: "%QTDIR%\\bin;%PYTHONDIR%;%PYTHONDIR%\\Scripts;%BOOSTDIR%\\lib64-msvc-14.1;%PATH%"
   PYTHONPATH: "%PYTHONDIR%;%PYTHONDIR%\\Lib;%PYTHONDIR%\\Lib\\site-packages;%PYTHONDIR%\\DLLs"
@@ -47,7 +47,7 @@ before_build:
 - 7z x %temp%\libfftw3.zip -oC:\projects\deps
 - dir C:\projects\deps
 - dir C:\projects\deps\include
-- set CMAKE_URL="https://cmake.org/files/v3.12/cmake-3.12.4-win64-x64.zip"
+- set CMAKE_URL="https://cmake.org/files/v3.17/cmake-3.17.2-win64-x64.zip"
 - appveyor DownloadFile %CMAKE_URL% -FileName %temp%\cmake.zip
 - 7z x %temp%\cmake.zip -oC:\projects\deps > nul
 - move C:\projects\deps\cmake-* C:\projects\deps\cmake # Move to a version-agnostic directory
@@ -60,7 +60,7 @@ build_script:
 - mkdir build
 - cd build
 - cmake --version
-- cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT=%BOOSTDIR% -DPYTHON_LIBRARY=%PYLIB% -DPYTHON_EXECUTABLE=%PYEXE% -DCMAKE_INCLUDE_PATH=C:/projects/deps/include ..
+- cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT=%BOOSTDIR% -DPython_LIBRARIES=%PYLIB% -DPython_EXECUTABLE=%PYEXE% -DCMAKE_INCLUDE_PATH=C:/projects/deps/include ..
 - cmake --build . --config Release
 
 test_script:

.travis/linux/Dockerfile

-FROM scgmlz/bornagain-dev:xenial
-RUN apt install libqt5svg5-dev
-
+FROM scgmlz/bornagain-dev:focal
 ADD . /source
 WORKDIR /source

.travis/linux/install.sh

-docker build -t bornagain/wily -f `dirname $0`/Dockerfile .
-docker run -d --name dd -it bornagain/wily
+docker build -t bornagain/focal -f `dirname $0`/Dockerfile .
+docker run --security-opt seccomp=unconfined -d --name dd -it bornagain/focal
 docker ps -a

CMakeLists.txt

@@ -2,7 +2,7 @@
 # top-level CMakeLists.txt for building BornAgain
 ############################################################################
 
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 
 set(CMAKE_MODULE_PATH

Core/CMakeLists.txt

@@ -68,7 +68,7 @@ if(BORNAGAIN_PYTHON)
 
         add_custom_command (
             OUTPUT ${AUTO_DIR}/libBornAgainCore.py
-            COMMAND ${PYTHON_EXECUTABLE} ${WRAP_DIR}/swig/tweaks.py
+            COMMAND ${Python_EXECUTABLE} ${WRAP_DIR}/swig/tweaks.py
                    ${TMP_DIR}/libBornAgainCore.py
                    ${AUTO_DIR}/libBornAgainCore.py
             DEPENDS ${TMP_DIR}/libBornAgainCore.py
@@ -166,8 +166,8 @@ endif()
 
 if(BORNAGAIN_PYTHON)
     target_compile_definitions(${library_name} PUBLIC -DBORNAGAIN_PYTHON)
-    include_directories(${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR})
-    target_link_libraries(${library_name} ${PYTHON_LIBRARIES})
+    include_directories(${Python_INCLUDE_DIRS} ${Python_NumPy_INCLUDE_DIRS})
+    target_link_libraries(${library_name} ${Python_LIBRARIES})
 endif()
 
 if(APPLE AND BORNAGAIN_APPLE_BUNDLE)
@@ -220,8 +220,8 @@ if(WIN32)
             DESTINATION ${destination_lib} COMPONENT Libraries)
     endforeach()
 
-    get_filename_component(UTF_BASE_NAME ${PYTHON_LIBRARIES} NAME_WE)
-    get_filename_component(UTF_PATH ${PYTHON_EXECUTABLE} PATH)
+    get_filename_component(UTF_BASE_NAME ${Python_LIBRARIES} NAME_WE)
+    get_filename_component(UTF_PATH ${Python_EXECUTABLE} PATH)
     message(STATUS "Python dll: ${UTF_PATH}/${UTF_BASE_NAME}.dll")
     install(FILES ${UTF_PATH}/${UTF_BASE_NAME}.dll
         DESTINATION ${destination_lib} COMPONENT Libraries)

Fit/CMakeLists.txt

@@ -56,7 +56,7 @@ if(BORNAGAIN_PYTHON)
 
         add_custom_command (
             OUTPUT ${AUTO_DIR}/libBornAgainFit.py
-            COMMAND ${PYTHON_EXECUTABLE} ${WRAP_DIR}/swig/tweaks.py
+            COMMAND ${Python_EXECUTABLE} ${WRAP_DIR}/swig/tweaks.py
                    ${TMP_DIR}/libBornAgainFit.py
                    ${AUTO_DIR}/libBornAgainFit.py
             DEPENDS ${TMP_DIR}/libBornAgainFit.py
@@ -109,8 +109,8 @@ target_include_directories(${library_name} PUBLIC ${include_dirs})
 target_link_libraries(${library_name} ${RootMinimizers_LIBRARY}  ${Boost_LIBRARIES})
 
 if(BORNAGAIN_PYTHON)
-    include_directories(${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR})
-    target_link_libraries(${library_name} ${PYTHON_LIBRARIES})
+    include_directories(${Python_INCLUDE_DIRS} ${Python_NumPy_INCLUDE_DIRS})
+    target_link_libraries(${library_name} ${Python_LIBRARIES})
 endif()
 
 # --- custom actions

GUI/ba3d/CMakeLists.txt

@@ -19,6 +19,7 @@ set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${include_dirs})
 
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 
 add_subdirectory (ba3d)
 add_subdirectory (showcase)

Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp

@@ -92,7 +92,7 @@ std::unique_ptr<Simulation> CreateRealisticGISASSimulation()
     // define ROI and masks
     result->setRegionOfInterest(45.0, 35.0, 120.0, 120.0);
     result->addMask(Rectangle(100, 60, 110, 100));
-    return result;
+    return std::unique_ptr<Simulation>(result.release());
 }
 
 } // namespace
@@ -110,7 +110,7 @@ std::unique_ptr<Simulation> TestComponents::CreateSimpleGISAS()
 
     auto sample = std::unique_ptr<MultiLayer>(CylindersInDWBABuilder().buildSample());
     result->setSample(*sample);
-    return result;
+    return std::unique_ptr<Simulation>(result.release());
 }
 
 //! Creates simulation representing realistic GISAS.
@@ -151,7 +151,7 @@ std::unique_ptr<Simulation> TestComponents::CreateGiganticGISAS()
     result->setBeamParameters(1.0 * Units::angstrom, 0.2 * Units::degree, 0.0 * Units::degree);
     auto sample = std::unique_ptr<MultiLayer>(CylindersInBABuilder().buildSample());
     result->setSample(*sample);
-    return result;
+    return std::unique_ptr<Simulation>(result.release());
 }
 
 //! Creates simulation representing GISAS with huge wavelength.
@@ -174,7 +174,7 @@ std::unique_ptr<Simulation> TestComponents::CreateWavelengthGISAS()
 
     auto sample = std::unique_ptr<MultiLayer>(CylindersInBABuilder().buildSample());
     result->setSample(*sample);
-    return result;
+    return std::unique_ptr<Simulation>(result.release());
 }
 
 //! Creates simulation representing simple GISAS with MonteCarlo ON.
@@ -191,5 +191,5 @@ std::unique_ptr<Simulation> TestComponents::CreateMCGISAS()
     auto sample = createSampleSpheresDistribution(10);
     result->setSample(*sample);
     result->getOptions().setMonteCarloIntegration(true, 50);
-    return result;
+    return std::unique_ptr<Simulation>(result.release());
 }

Tests/Functional/Python/PyCore/CMakeLists.txt

@@ -21,5 +21,5 @@ set(tests ${sources})
 list(REMOVE_ITEM tests utils.py)
 
 foreach(_test ${tests})
-    add_test(PyCore/${_test} ${PYTHON_EXECUTABLE} ${OUTPUT_DIR}/${_test})
+    add_test(PyCore/${_test} ${Python_EXECUTABLE} ${OUTPUT_DIR}/${_test})
 endforeach()

Tests/Functional/Python/PyEmbedded/CMakeLists.txt

@@ -13,8 +13,8 @@ set(test_cases
 )
 
 include_directories(
-    ${PYTHON_INCLUDE_DIRS}
-    ${NUMPY_INCLUDE_DIR}
+    ${Python_INCLUDE_DIRS}
+    ${Python_NumPy_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/auto/Wrap
 )
 

Tests/Functional/Python/PyEmbedded/TestCases.cpp

@@ -33,10 +33,11 @@ bool SysPath::runTest()
 {
     // Python build info
     std::cout << "pythonExecutable(): " << BABuild::pythonExecutable() << std::endl;
+    std::cout << "pythonInterpreterID(): " << BABuild::pythonInterpreterID() << std::endl;
     std::cout << "pythonVersionString(): " << BABuild::pythonVersionString() << std::endl;
     std::cout << "pythonLibraries(): " << BABuild::pythonLibraries() << std::endl;
     std::cout << "pythonIncludeDirs(): " << BABuild::pythonIncludeDirs() << std::endl;
-    std::cout << "pythonLibsVersionString(): " << BABuild::pythonLibsVersionString() << std::endl;
+    std::cout << "pythonSiteLib(): " << BABuild::pythonSiteLib() << std::endl;
     std::cout << "numpyIncludeDir(): " << BABuild::numpyIncludeDir() << std::endl;
     std::cout << "numpyVersionString(): " << BABuild::numpyVersionString() << std::endl;
 

Tests/Functional/Python/PyExamples/CMakeLists.txt

@@ -24,6 +24,6 @@ foreach(example ${examples})
     get_filename_component(script_name ${script_path} NAME_WE)
     set(test_name PyExamples/${script_name})
 
-    add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_script} ${script_path})
+    add_test(${test_name} ${Python_EXECUTABLE} ${test_script} ${script_path})
     set_tests_properties(${test_name} PROPERTIES LABELS "Fullcheck")
 endforeach()

Tests/Functional/Python/PyFit/CMakeLists.txt

@@ -18,5 +18,5 @@ set(tests
 )
 
 foreach(_test ${tests})
-    add_test(PyFit/${_test} ${PYTHON_EXECUTABLE}  ${output_dir}/${_test})
+    add_test(PyFit/${_test} ${Python_EXECUTABLE}  ${output_dir}/${_test})
 endforeach()

Tests/Functional/Python/PyPersistence/CMakeLists.txt

@@ -21,7 +21,7 @@ function(test_example example tolerance)
     set(example_mod ${OUTPUT_DIR}/${EXAMPLE_NAME}_mod.py)
     configure_file(example_template.py ${example_mod} @ONLY)
 
-    add_test(${test_name} ${PYTHON_EXECUTABLE} "-B" "${example_mod}")
+    add_test(${test_name} ${Python_EXECUTABLE} "-B" "${example_mod}")
 endfunction()
 
 test_example("simulation/ex01_BasicParticles/CylindersAndPrisms" 2e-10)

cmake/bornagain/modules/BornAgainConfiguration.cmake

@@ -135,6 +135,17 @@ if(NOT BORNAGAIN_BUILDBOT_SERVER)
 configure_file(${TEMPLATE_DIR}/CTestCustom.cmake.in ${CMAKE_BINARY_DIR}/CTestCustom.cmake)
 endif()
 
+if (WIN32)
+    # Necessary to provide correct slashes in BABuild.h
+    file(TO_CMAKE_PATH ${Python_EXECUTABLE} Python_EXECUTABLE)
+    file(TO_CMAKE_PATH ${Python_STDLIB} Python_STDLIB)
+    file(TO_CMAKE_PATH ${Python_LIBRARIES} Python_LIBRARIES)
+    file(TO_CMAKE_PATH ${Python_STDLIB} Python_STDLIB)
+    file(TO_CMAKE_PATH ${Python_INCLUDE_DIRS} Python_INCLUDE_DIRS)
+    file(TO_CMAKE_PATH ${Python_NumPy_INCLUDE_DIRS} Python_NumPy_INCLUDE_DIRS)
+    file(TO_CMAKE_PATH ${Python_SITELIB} Python_SITELIB)
+endif()
+
 configure_file(${TEMPLATE_DIR}/BAVersion.h.in  ${BUILD_INC_DIR}/BAVersion.h @ONLY)
 configure_file(${TEMPLATE_DIR}/BABuild.h.in  ${BUILD_INC_DIR}/BABuild.h @ONLY)
 configure_file(${TEMPLATE_DIR}/BATesting.h.in  ${BUILD_INC_DIR}/BATesting.h @ONLY)
@@ -162,10 +173,6 @@ configure_file(${TEMPLATE_DIR}/thisbornagain.csh.in
 
 if(BUILD_DEBIAN)
     set(CMAKE_INSTALL_PREFIX "/usr")
-    execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c
-        "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix=None))"
-        OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
-        OUTPUT_STRIP_TRAILING_WHITESPACE )
     configure_file(${TEMPLATE_DIR}/postinst.in ${BUILD_VAR_DIR}/postinst @ONLY)
     configure_file(${TEMPLATE_DIR}/prerm.in ${BUILD_VAR_DIR}/prerm @ONLY)
     set(CMAKE_INSTALL_RPATH \$ORIGIN/../;\$ORIGIN/../../lib/${destination_suffix})

cmake/bornagain/modules/CPackApple.cmake

 # BornAgain Mac packaging 
 
-set(SELECTED_PYTHON_VERSION "python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+set(SELECTED_PYTHON_VERSION "python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}")
 
 set(CPACK_PACKAGE_FILE_NAME
     "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${SELECTED_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}-10.10+")

cmake/bornagain/modules/CPackWindows.cmake

 # BornAgain Windows packaging
 
-set(SELECTED_PYTHON_VERSION "python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+set(SELECTED_PYTHON_VERSION "python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}")
 
 set(CPACK_PACKAGE_FILE_NAME
     "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${SELECTED_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}")

cmake/bornagain/modules/CheckCode.cmake

@@ -10,7 +10,7 @@ if(NOT MSVC)
 #   file(GLOB_RECURSE SRC2 "GUI/*.h")
 
     add_test(NAME "CodeLineLength"
-        COMMAND ${PYTHON_EXECUTABLE}
+        COMMAND ${Python_EXECUTABLE}
         ${CMAKE_SOURCE_DIR}/dev-tools/analyze/check-line-length.py ${SRC_LEN_LIM}
         ${SRC1} ${SRC2})
 endif()

cmake/bornagain/modules/FixAppleBundle.cmake.in

@@ -3,4 +3,4 @@
 ###############################################################################
 
 set(bundle ${CMAKE_INSTALL_PREFIX}/BornAgain.app )
-execute_process(COMMAND @PYTHON_EXECUTABLE@ @CMAKE_SOURCE_DIR@/cmake/bornagain/scripts/fix_apple_bundle.py ${bundle})
+execute_process(COMMAND @Python_EXECUTABLE@ @CMAKE_SOURCE_DIR@/cmake/bornagain/scripts/fix_apple_bundle.py ${bundle})

cmake/bornagain/modules/GeneratePythonDocs.cmake

@@ -12,7 +12,7 @@ function(GeneratePythonDocs PD_TARGET SWIG_DIR)
             )
         add_custom_command(
             OUTPUT ${PD_TARGET}
-            COMMAND ${PYTHON_EXECUTABLE} ${SWIG_DIR}/doxy2swig.py
+            COMMAND ${Python_EXECUTABLE} ${SWIG_DIR}/doxy2swig.py
             ${TMP_DIR}/xml/index.xml ${PD_TARGET}
             DEPENDS ${TMP_DIR}/xml/index.xml
             )