View | Details | Raw Unified | Return to bug 223678 | Differences between
and this patch

Collapse All | Expand All

(-)/tmp/FindOpenMP.cmake (-2 / +36 lines)
Lines 81-86 Link Here
81
81
82
set(OpenMP_pthread_LIBRARY -lpthread)
82
set(OpenMP_pthread_LIBRARY -lpthread)
83
83
84
find_file(_path_to_omp_h omp.h)
85
if(NOT _path_to_omp_h)
86
  find_file(_path_to_omp_h omp.h
87
    HINTS ${ENV{LOCALBASE}}/include /usr/local/include)
88
endif()
89
if(_path_to_omp_h)
90
  get_filename_component(OpenMP_INCLUDE_DIR ${_path_to_omp_h} DIRECTORY)
91
else()
92
  set(OpenMP_INCLUDE_DIR)
93
endif()
94
95
find_library(_path_to_omp_lib omp)
96
if(NOT _path_to_omp_lib)
97
  find_library(_path_to_omp_lib omp
98
    PATHS ${ENV{LOCALBASE}}/lib /usr/local/lib)
99
endif()
100
if(_path_to_omp_lib)
101
  get_filename_component(OpenMP_LIB_DIR ${_path_to_omp_lib} DIRECTORY)
102
else()
103
  set(OpenMP_LIB_DIR)
104
endif()
105
84
function(_OPENMP_FLAG_CANDIDATES LANG)
106
function(_OPENMP_FLAG_CANDIDATES LANG)
85
  if(NOT OpenMP_${LANG}_FLAG)
107
  if(NOT OpenMP_${LANG}_FLAG)
86
    unset(OpenMP_FLAG_CANDIDATES)
108
    unset(OpenMP_FLAG_CANDIDATES)
Lines 186-200 Link Here
186
    if(OpenMP_VERBOSE_COMPILE_OPTIONS)
208
    if(OpenMP_VERBOSE_COMPILE_OPTIONS)
187
      string(APPEND OPENMP_FLAGS_TEST " ${OpenMP_VERBOSE_COMPILE_OPTIONS}")
209
      string(APPEND OPENMP_FLAGS_TEST " ${OpenMP_VERBOSE_COMPILE_OPTIONS}")
188
    endif()
210
    endif()
211
    set(_extra_flag "")
212
    if(OpenMP_INCLUDE_DIR)
213
      string(APPEND _extra_flag " -I${OpenMP_INCLUDE_DIR}")
214
    endif()
215
    if(OpenMP_LIB_DIR)
216
      string(APPEND _extra_flag " -L${OpenMP_LIB_DIR}")
217
    endif()
218
189
    string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}")
219
    string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}")
190
    try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}
220
    try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}
191
      CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}"
221
      CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST} ${_extra_flag}"
192
      LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG}
222
      LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG}
193
      OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
223
      OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
194
    )
224
    )
195
225
196
    if(OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG})
226
    if(OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG})
197
      set("${OPENMP_FLAG_VAR}" "${OPENMP_FLAG}" PARENT_SCOPE)
227
      set("${OPENMP_FLAG_VAR}" "${OPENMP_FLAG} ${_extra_flag}" PARENT_SCOPE)
198
228
199
      if(CMAKE_${LANG}_VERBOSE_FLAG)
229
      if(CMAKE_${LANG}_VERBOSE_FLAG)
200
        unset(OpenMP_${LANG}_IMPLICIT_LIBRARIES)
230
        unset(OpenMP_${LANG}_IMPLICIT_LIBRARIES)
Lines 448-453 Link Here
448
unset(_OpenMP_MIN_VERSION)
478
unset(_OpenMP_MIN_VERSION)
449
479
450
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
480
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
481
if(NOT OpenMP_FIND_QUIETLY)
482
  message(STATUS "OpenMP includes  ${OpenMP_INCLUDE_DIR}")
483
  message(STATUS "OpenMP libraries ${OpenMP_LIB_DIR}")
484
endif()
451
485
452
foreach(LANG IN LISTS OpenMP_FINDLIST)
486
foreach(LANG IN LISTS OpenMP_FINDLIST)
453
  if(CMAKE_${LANG}_COMPILER_LOADED)
487
  if(CMAKE_${LANG}_COMPILER_LOADED)

Return to bug 223678