Skip to content

Commit 5d4e48a

Browse files
fabinschjcarpent
authored andcommitted
cmake: fix find openMP
1 parent 1a1b547 commit 5d4e48a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
git submodule update --init
123123
mkdir build
124124
cd build
125-
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
125+
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
126126
127127
- name: Configure [Conda/Windows-latest]
128128
if: contains(matrix.os, 'windows-latest')

CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ project(${PROJECT_NAME} ${PROJECT_ARGS})
4949
include(${CMAKE_CURRENT_LIST_DIR}/cmake-module/ide.cmake)
5050
include(${CMAKE_CURRENT_LIST_DIR}/cmake-module/apple.cmake)
5151
if(APPLE OR WIN32) # Use the handmade approach
52-
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/find-external/OpenMP
53-
${CMAKE_MODULE_PATH})
52+
set(CMAKE_MODULE_PATH
53+
${CMAKE_CURRENT_LIST_DIR}/cmake-module/find-external/OpenMP
54+
${CMAKE_MODULE_PATH})
5455
elseif(UNIX)
5556
if(${CMAKE_VERSION} VERSION_GREATER "3.20.0" OR ${CMAKE_VERSION}
5657
VERSION_EQUAL "3.20.0")
57-
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/find-external/OpenMP
58-
${CMAKE_MODULE_PATH})
58+
set(CMAKE_MODULE_PATH
59+
${CMAKE_CURRENT_LIST_DIR}/cmake-module/find-external/OpenMP
60+
${CMAKE_MODULE_PATH})
5961
endif()
6062
endif(APPLE OR WIN32)
6163
include(${CMAKE_CURRENT_LIST_DIR}/cmake-module/julia.cmake)

0 commit comments

Comments
 (0)