Merge pull request #240 from fabinsch/cmake-fix-find-openmp

cmake: fix path to find-external/OpenMP

Author: jcarpent

.github/workflows/ci-linux-osx-win-conda.yml

@@ -119,16 +119,18 @@ jobs:
       shell: bash -l {0}
       run: |
         echo $(where ccache)
+        ls C:\\Miniconda3\\envs\\proxsuite\\Library\\lib
         git submodule update --init
         mkdir build
         cd build
-        cmake .. -G"Visual Studio 16 2019" -T "ClangCl" -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}/Library -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}  -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_SITELIB=${CONDA_PREFIX}/Lib/site-packages -DPYTHON_EXECUTABLE=${CONDA_PREFIX}/python.exe -DOpenMP_ROOT=$CONDA_PREFIX -DBUILD_WITH_OPENMP_SUPPORT:BOOL=OFF -DLINK_PYTHON_INTERFACE_TO_OPENMP:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON
+        cmake .. -G"Visual Studio 16 2019" -T "ClangCl" -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}/Library -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}  -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_SITELIB=${CONDA_PREFIX}/Lib/site-packages -DPYTHON_EXECUTABLE=${CONDA_PREFIX}/python.exe -DOpenMP_ROOT=$CONDA_PREFIX -DBUILD_WITH_OPENMP_SUPPORT:BOOL=ON -DLINK_PYTHON_INTERFACE_TO_OPENMP:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON
 
     - name: Configure [Conda/Windows-latest]
       if: contains(matrix.os, 'windows-latest')
       shell: bash -l {0}
       run: |
         echo $(where ccache)
+        ls C:\\Miniconda3\\envs\\proxsuite\\Library\\lib
         git submodule update --init
         mkdir build
         cd build

CMakeLists.txt

@@ -48,16 +48,12 @@ project(${PROJECT_NAME} ${PROJECT_ARGS})
 
 include(${CMAKE_CURRENT_LIST_DIR}/cmake-module/ide.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake-module/apple.cmake)
-if(APPLE OR WIN32) # Use the handmade approach
-  set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/find-external/OpenMP
-                        ${CMAKE_MODULE_PATH})
-elseif(UNIX)
-  if(${CMAKE_VERSION} VERSION_GREATER "3.20.0" OR ${CMAKE_VERSION}
-                                                  VERSION_EQUAL "3.20.0")
-    set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/find-external/OpenMP
-                          ${CMAKE_MODULE_PATH})
-  endif()
-endif(APPLE OR WIN32)
+
+if(NOT ${CMAKE_VERSION} VERSION_GREATER "3.26.0" OR WIN32)
+  set(CMAKE_MODULE_PATH
+      ${CMAKE_CURRENT_LIST_DIR}/cmake-module/find-external/OpenMP
+      ${CMAKE_MODULE_PATH})
+endif()
 include(${CMAKE_CURRENT_LIST_DIR}/cmake-module/julia.cmake)
 include(CMakeDependentOption)
 

bindings/python/CMakeLists.txt

@@ -130,13 +130,44 @@ add_header_group(PYWRAP_HEADERS)
 add_source_group(PYWRAP_SOURCES)
 
 # --- INSTALL SCRIPTS
-set(PYTHON_FILES __init__.py)
 
-foreach(python ${PYTHON_FILES})
-  python_build(${PROJECT_NAME} ${python})
-  install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/proxsuite/${python}"
+# On Windows, we need to enforce the environment variable KMP_DUPLICATE_LIB_OK
+# to True to to allow the program to continue to execute with OpenMP support
+if(WIN32
+   AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
+   AND BUILD_WITH_OPENMP_SUPPORT)
+  set(OPENMP_KMP_DUPLICATE_LIB_OK_SCRIPT
+      "import os\n" "os.environ[\"KMP_DUPLICATE_LIB_OK\"] = \"1\"\n\n")
+
+  if(CMAKE_GENERATOR MATCHES "Visual Studio|Xcode")
+    set(PYTHON_MODULE_DIR "${CMAKE_CURRENT_BINARY_DIR}/proxsuite/$<CONFIG>")
+  else()
+    set(PYTHON_MODULE_DIR "${CMAKE_CURRENT_BINARY_DIR}/proxsuite")
+  endif()
+
+  set(original_init_dot_py_file ${CMAKE_CURRENT_LIST_DIR}/proxsuite/__init__.py)
+  set(generated_init_dot_py_file
+      ${CMAKE_CURRENT_BINARY_DIR}/proxsuite/__init__.py)
+  set(generated_init_dot_pyc_file ${PYTHON_MODULE_DIR}/__init__.pyc)
+
+  # Copy content of the __init__.py file
+  file(READ ${original_init_dot_py_file} INIT_CONTENT)
+  # Create a new __init__.py file containing both the content of __init__.py
+  # prepended with the OPENMP_KMP_DUPLICATE_LIB_OK_SCRIPT content
+  file(WRITE ${generated_init_dot_py_file}
+       ${OPENMP_KMP_DUPLICATE_LIB_OK_SCRIPT})
+  file(APPEND ${generated_init_dot_py_file} ${INIT_CONTENT})
+
+  python_build_file(${generated_init_dot_py_file}
+                    ${generated_init_dot_pyc_file})
+  install(FILES "${generated_init_dot_py_file}"
+          DESTINATION ${${PYWRAP}_INSTALL_DIR})
+
+else()
+  python_build(${PROJECT_NAME} __init__.py)
+  install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/proxsuite/__init__.py"
           DESTINATION ${${PYWRAP}_INSTALL_DIR})
-endforeach(python)
+endif()
 
 python_build_get_target(compile_pyc)
 add_dependencies(python ${compile_pyc})