| 1 |
jlec 12/02/06 13:52:50 |
| 2 |
|
| 3 |
Added: cmake-2.8.7-FindOpenMP.patch |
| 4 |
Log: |
| 5 |
Adding patch for language selective openmp support testing, http://public.kitware.com/Bug/view.php?id=11910 ; approved by tampakrap |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/cmake/files/cmake-2.8.7-FindOpenMP.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.7-FindOpenMP.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.7-FindOpenMP.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cmake-2.8.7-FindOpenMP.patch |
| 16 |
=================================================================== |
| 17 |
http://public.kitware.com/Bug/view.php?id=11910 |
| 18 |
--- Modules/FindOpenMP.cmake 2011-03-01 17:34:59.000000000 +0900 |
| 19 |
+++ Modules/FindOpenMP.cmake 2011-03-01 17:35:26.000000000 +0900 |
| 20 |
@@ -72,41 +72,53 @@ |
| 21 |
endif(DEFINED OpenMP_C_FLAGS AND DEFINED OpenMP_CXX_FLAGS) |
| 22 |
|
| 23 |
# check c compiler |
| 24 |
-foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES}) |
| 25 |
- set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") |
| 26 |
- set(CMAKE_REQUIRED_FLAGS "${FLAG}") |
| 27 |
- unset(OpenMP_FLAG_DETECTED CACHE) |
| 28 |
- message(STATUS "Try OpenMP C flag = [${FLAG}]") |
| 29 |
- check_c_source_compiles("${OpenMP_CXX_TEST_SOURCE}" OpenMP_FLAG_DETECTED) |
| 30 |
- set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") |
| 31 |
- if(OpenMP_FLAG_DETECTED) |
| 32 |
- set(OpenMP_C_FLAGS_INTERNAL "${FLAG}") |
| 33 |
- break() |
| 34 |
- endif(OpenMP_FLAG_DETECTED) |
| 35 |
-endforeach(FLAG ${OpenMP_C_FLAG_CANDIDATES}) |
| 36 |
+IF (CMAKE_C_COMPILER) |
| 37 |
+ foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES}) |
| 38 |
+ set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") |
| 39 |
+ set(CMAKE_REQUIRED_FLAGS "${FLAG}") |
| 40 |
+ unset(OpenMP_FLAG_DETECTED CACHE) |
| 41 |
+ message(STATUS "Try OpenMP C flag = [${FLAG}]") |
| 42 |
+ check_c_source_compiles("${OpenMP_C_TEST_SOURCE}" OpenMP_FLAG_DETECTED) |
| 43 |
+ set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") |
| 44 |
+ if(OpenMP_FLAG_DETECTED) |
| 45 |
+ set(OpenMP_C_FLAGS_INTERNAL "${FLAG}") |
| 46 |
+ break() |
| 47 |
+ endif(OpenMP_FLAG_DETECTED) |
| 48 |
+ endforeach(FLAG ${OpenMP_C_FLAG_CANDIDATES}) |
| 49 |
+ENDIF (CMAKE_C_COMPILER) |
| 50 |
|
| 51 |
# check cxx compiler |
| 52 |
-foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES}) |
| 53 |
- set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") |
| 54 |
- set(CMAKE_REQUIRED_FLAGS "${FLAG}") |
| 55 |
- unset(OpenMP_FLAG_DETECTED CACHE) |
| 56 |
- message(STATUS "Try OpenMP CXX flag = [${FLAG}]") |
| 57 |
- check_cxx_source_compiles("${OpenMP_C_TEST_SOURCE}" OpenMP_FLAG_DETECTED) |
| 58 |
- set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") |
| 59 |
- if(OpenMP_FLAG_DETECTED) |
| 60 |
- set(OpenMP_CXX_FLAGS_INTERNAL "${FLAG}") |
| 61 |
- break() |
| 62 |
- endif(OpenMP_FLAG_DETECTED) |
| 63 |
-endforeach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES}) |
| 64 |
+IF (CMAKE_CXX_COMPILER) |
| 65 |
+ foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES}) |
| 66 |
+ set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") |
| 67 |
+ set(CMAKE_REQUIRED_FLAGS "${FLAG}") |
| 68 |
+ unset(OpenMP_FLAG_DETECTED CACHE) |
| 69 |
+ message(STATUS "Try OpenMP CXX flag = [${FLAG}]") |
| 70 |
+ check_cxx_source_compiles("${OpenMP_CXX_TEST_SOURCE}" OpenMP_FLAG_DETECTED) |
| 71 |
+ set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") |
| 72 |
+ if(OpenMP_FLAG_DETECTED) |
| 73 |
+ set(OpenMP_CXX_FLAGS_INTERNAL "${FLAG}") |
| 74 |
+ break() |
| 75 |
+ endif(OpenMP_FLAG_DETECTED) |
| 76 |
+ endforeach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES}) |
| 77 |
+ENDIF (CMAKE_CXX_COMPILER) |
| 78 |
|
| 79 |
set(OpenMP_C_FLAGS "${OpenMP_C_FLAGS_INTERNAL}" |
| 80 |
CACHE STRING "C compiler flags for OpenMP parallization") |
| 81 |
|
| 82 |
set(OpenMP_CXX_FLAGS "${OpenMP_CXX_FLAGS_INTERNAL}" |
| 83 |
CACHE STRING "C++ compiler flags for OpenMP parallization") |
| 84 |
+ |
| 85 |
# handle the standard arguments for find_package |
| 86 |
-find_package_handle_standard_args(OpenMP DEFAULT_MSG |
| 87 |
- OpenMP_C_FLAGS OpenMP_CXX_FLAGS ) |
| 88 |
+IF (CMAKE_C_COMPILER) |
| 89 |
+ find_package_handle_standard_args(OpenMP DEFAULT_MSG |
| 90 |
+ OpenMP_C_FLAGS ) |
| 91 |
+ENDIF (CMAKE_C_COMPILER) |
| 92 |
+ |
| 93 |
+IF (CMAKE_CXX_COMPILER) |
| 94 |
+ find_package_handle_standard_args(OpenMP DEFAULT_MSG |
| 95 |
+ OpenMP_CXX_FLAGS ) |
| 96 |
+ENDIF (CMAKE_CXX_COMPILER) |
| 97 |
|
| 98 |
mark_as_advanced( |
| 99 |
OpenMP_C_FLAGS |
Archives