[Cmake-commits] [cmake-commits] hoffman committed FindOpenMP.cmake 1.1 1.2

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jan 28 12:55:09 EST 2009


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv27386

Modified Files:
	FindOpenMP.cmake 
Log Message:
ENH: clean up status and change order for more common compilers first


Index: FindOpenMP.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenMP.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** FindOpenMP.cmake	28 Jan 2009 17:45:03 -0000	1.1
--- FindOpenMP.cmake	28 Jan 2009 17:55:06 -0000	1.2
***************
*** 24,33 ****
  
  set(OpenMP_C_FLAG_CANDIDATES
!   #Empty, if compiler automatically accepts openmp
!   " "
    #Intel windows
    "-Qopenmp" 
    #Intel
    "-openmp" 
    #Sun
    "-xopenmp"
--- 24,37 ----
  
  set(OpenMP_C_FLAG_CANDIDATES
!   #Gnu
!   "-fopenmp"
!   #Microsoft Visual Studio
!   "/openmp"
    #Intel windows
    "-Qopenmp" 
    #Intel
    "-openmp" 
+   #Empty, if compiler automatically accepts openmp
+   " "
    #Sun
    "-xopenmp"
***************
*** 38,45 ****
    #Portland Group
    "-mp"
-   #Gnu
-   "-fopenmp"
-   #Microsoft Visual Studio
-   "/openmp"
  )
  set(OpenMP_CXX_FLAG_CANDIDATES ${OpenMP_C_FLAG_CANDIDATES})
--- 42,45 ----
***************
*** 50,54 ****
  #include <omp.h>
  int main() { 
! #ifdef _OpenMP
    return 0; 
  #else
--- 50,54 ----
  #include <omp.h>
  int main() { 
! #ifdef _OPENMP
    return 0; 
  #else
***************
*** 71,75 ****
    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
    unset(OpenMP_FLAG_DETECTED CACHE)
!   message(STATUS "Try OpenMP flag = [${FLAG}]")
    check_c_source_compiles("${OpenMP_CXX_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
    set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
--- 71,75 ----
    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
    unset(OpenMP_FLAG_DETECTED CACHE)
!   message(STATUS "Try OpenMP C flag = [${FLAG}]")
    check_c_source_compiles("${OpenMP_CXX_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
    set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
***************
*** 85,89 ****
    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
    unset(OpenMP_FLAG_DETECTED CACHE)
!   message(STATUS "Try OpenMP flag = [${FLAG}]")
    check_cxx_source_compiles("${OpenMP_C_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
    set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
--- 85,89 ----
    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
    unset(OpenMP_FLAG_DETECTED CACHE)
!   message(STATUS "Try OpenMP CXX flag = [${FLAG}]")
    check_cxx_source_compiles("${OpenMP_C_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
    set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")



More information about the Cmake-commits mailing list