Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if(COLPACK_ENABLE_OPENMP)
if(MSVC AND NOT DEFINED OpenMP_RUNTIME_MSVC)
set(OpenMP_RUNTIME_MSVC llvm)
endif()
find_package(OpenMP REQUIRED)
find_package(OpenMP REQUIRED COMPONENTS CXX)
endif()

# Define variables to use for organizing the installation.
Expand Down
3 changes: 2 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
CMake 3.12 or newer is required
Options are renamed: ENABLE_EXAMPLES is now COLPACK_ENABLE_EXAMPLES, ENABLE_OPENMP is now COLPACK_ENABLE_OPENMP
The recovery routines in src/Recovery are now compiled into the library
OpenMP is linked via OpenMP::OpenMP_CXX, which fixes the build on macOS with libomp from Homebrew
OpenMP is linked via OpenMP::OpenMP_CXX, which fixes the build on macOS with libomp from Homebrew.
Only the CXX component of OpenMP is required, also if a parent project enables C or Fortran
MSVC is supported. It builds with /openmp:llvm, because OpenMP 2.0 does not support unsigned loop indices.
This requires CMake 3.30 or newer.
Windows builds use short intermediate paths (CMAKE_INTERMEDIATE_DIR_STRATEGY=SHORT), because the object paths
Expand Down