diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-26 17:54:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-26 17:54:13 +0300 |
| commit | 94d88df3a8954f8c9c3be3c6a4ea9dce0dceb849 (patch) | |
| tree | 1b9751fb6b665de1203f079d5d2bafabd44eb007 /CMakeLists.txt | |
| parent | 115e1d441b5d005bb3c53a134d1ad2683ffb9735 (diff) | |
| parent | b7a9e980a11a085a3bc7ef8e267b967197f47447 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1813f9a15ef..4d599277fec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1122,7 +1122,10 @@ endif() #----------------------------------------------------------------------------- # Configure OpenMP. if(WITH_OPENMP) - find_package(OpenMP) + if(NOT OPENMP_CUSTOM) + find_package(OpenMP) + endif() + if(OPENMP_FOUND) if(NOT WITH_OPENMP_STATIC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") |