This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 1c2a51a800691344234f5500919c0b005f2196ec (commit)
via 30b10c7d6d4d570855a01376295d3125d8fad6ea (commit)
from fa843e7614ccf613e7709cefbcaa8935616d5900 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2a51a800691344234f5500919c0b005f2196ec
commit 1c2a51a800691344234f5500919c0b005f2196ec
Merge: fa843e7 30b10c7
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Fri Nov 13 11:53:23 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Nov 13 11:53:23 2015 -0500
Merge topic 'add-cray-linux-platform' into next
30b10c7d Cray: Make use of "_" consistent in private variable names
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30b10c7d6d4d570855a01376295d3125d8fad6ea
commit 30b10c7d6d4d570855a01376295d3125d8fad6ea
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Fri Nov 13 10:52:09 2015 -0600
Commit: Chuck Atkins <chuck.atk...@kitware.com>
CommitDate: Fri Nov 13 10:52:09 2015 -0600
Cray: Make use of "_" consistent in private variable names
diff --git a/Modules/Platform/CrayLinuxEnvironment.cmake
b/Modules/Platform/CrayLinuxEnvironment.cmake
index b7be431..404dad9 100644
--- a/Modules/Platform/CrayLinuxEnvironment.cmake
+++ b/Modules/Platform/CrayLinuxEnvironment.cmake
@@ -38,8 +38,8 @@ set(CMAKE_DL_LIBS dl)
# Get the install directory of the running cmake to the search directories
# CMAKE_ROOT is CMAKE_INSTALL_PREFIX/share/cmake, so we need to go two levels
up
-get_filename_component(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)
-get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+get_filename_component(__cmake_install_dir "${CMAKE_ROOT}" PATH)
+get_filename_component(__cmake_install_dir "${__cmake_install_dir}" PATH)
# Note: Some cray's have the SYSROOT_DIR variable defined, pointing to a copy
@@ -53,7 +53,7 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
$ENV{SYSROOT_DIR}/usr/local $ENV{SYSROOT_DIR}/usr $ENV{SYSROOT_DIR}/
# CMake install location
- "${_CMAKE_INSTALL_DIR}"
+ "${__cmake_install_dir}"
)
if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
@@ -97,7 +97,6 @@ list(APPEND CMAKE_Fortran_IMPLICIT_INCLUDE_DIRECTORIES
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
# Check to see if we're using the cray compiler wrapers and load accordingly
if we are
-# Make sure we have the appropriate environment loaded
if(DEFINED ENV{CRAYPE_DIR})
set(_CRAYPE_ROOT "$ENV{CRAYPE_DIR}")
elseif(DEFINED ENV{ASYNCPE_DIR})
diff --git a/Modules/Platform/CrayPrgEnv-ToolChain.cmake
b/Modules/Platform/CrayPrgEnv-ToolChain.cmake
index a2fe598..53c6490 100644
--- a/Modules/Platform/CrayPrgEnv-ToolChain.cmake
+++ b/Modules/Platform/CrayPrgEnv-ToolChain.cmake
@@ -5,8 +5,10 @@ endif()
set(__CrayPrgEnv 1)
if(DEFINED ENV{CRAYPE_VERSION})
message(STATUS "Cray Programming Environment $ENV{CRAYPE_VERSION}")
+ set(__verbose_flag "-craype-verbose")
elseif(DEFINED ENV{ASYNCPE_VERSION})
message(STATUS "Cray Programming Environment $ENV{ASYNCPE_VERSION}")
+ set(__verbose_flag "-v")
else()
message(STATUS "Cray Programming Environment")
endif()
@@ -16,11 +18,11 @@ if(NOT __CrayLinuxEnvironment)
endif()
# Flags for the Cray wrappers
-foreach(_lang C CXX Fortran)
- set(CMAKE_STATIC_LIBRARY_LINK_${_lang}_FLAGS "-static")
- set(CMAKE_SHARED_LIBRARY_${_lang}_FLAGS "")
- set(CMAKE_SHARED_LIBRARY_CREATE_${_lang}_FLAGS "-shared")
- set(CMAKE_SHARED_LIBRARY_LINK_${_lang}_FLAGS "-dynamic")
+foreach(__lang C CXX Fortran)
+ set(CMAKE_STATIC_LIBRARY_LINK_${__lang}_FLAGS "-static")
+ set(CMAKE_SHARED_LIBRARY_${__lang}_FLAGS "")
+ set(CMAKE_SHARED_LIBRARY_CREATE_${__lang}_FLAGS "-shared")
+ set(CMAKE_SHARED_LIBRARY_LINK_${__lang}_FLAGS "-dynamic")
endforeach()
# If the link type is not explicitly specified in the environment then
@@ -35,42 +37,53 @@ if(NOT ((CMAKE_C_FLAGS MATCHES "(^| )-dynamic($| )") OR
endif()
# Parse the implicit directories used by the wrappers
-get_property(_LANGS GLOBAL PROPERTY ENABLED_LANGUAGES)
-foreach(_lang IN LISTS _LANGS)
+get_property(__langs GLOBAL PROPERTY ENABLED_LANGUAGES)
+foreach(__lang IN LISTS __langs)
+ if(__lang STREQUAL "C")
+ set(__empty_fname empty.c)
+ elseif(__lang STREQUAL CXX)
+ set(__empty_fname empty.cxx)
+ elseif(__lang STREQUAL Fortran)
+ set(__empty_fname empty.f90)
+ else()
+ continue()
+ endif()
+
execute_process(
- COMMAND ${CMAKE_${_lang}_COMPILER} -craype-verbose /dev/null
- OUTPUT_VARIABLE _CRAY_FLAGS
+ COMMAND ${CMAKE_${__lang}_COMPILER} ${__verbose_flag} ${__empty_fname}
+ OUTPUT_VARIABLE __cray_output
ERROR_QUIET
)
+ string(REGEX MATCH "(^|\n)[^\n]*${__empty_fname}[^\n]*" __cray_driver_cmd
"${__cray_output}")
# Parse include paths
- string(REGEX MATCHALL " -I([^ ]+)" _CRAY_INCLUDE_FLAGS "${_CRAY_FLAGS}")
- foreach(_flag IN LISTS _CRAY_INCLUDE_FLAGS)
+ string(REGEX MATCHALL " -I([^ ]+)" __cray_include_flags
"${__cray_driver_cmd}")
+ foreach(_flag IN LISTS __cray_include_flags)
string(REGEX REPLACE "^ -I([^ ]+)" "\\1" _dir "${_flag}")
- list(APPEND CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES ${_dir})
+ list(APPEND CMAKE_${__lang}_IMPLICIT_INCLUDE_DIRECTORIES ${_dir})
endforeach()
- if(CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES)
- list(REMOVE_DUPLICATES CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES)
+ if(CMAKE_${__lang}_IMPLICIT_INCLUDE_DIRECTORIES)
+ list(REMOVE_DUPLICATES CMAKE_${__lang}_IMPLICIT_INCLUDE_DIRECTORIES)
endif()
# Parse library paths
- string(REGEX MATCHALL " -L([^ ]+)" _CRAY_LIBRARY_DIR_FLAGS "${_CRAY_FLAGS}")
- foreach(_flag IN LISTS _CRAY_LIBRARY_DIR_FLAGS)
+ string(REGEX MATCHALL " -L([^ ]+)" __cray_library_dir_flags
"${__cray_driver_cmd}")
+ foreach(_flag IN LISTS __cray_library_dir_flags)
string(REGEX REPLACE "^ -L([^ ]+)" "\\1" _dir "${_flag}")
- list(APPEND CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES ${_dir})
+ list(APPEND CMAKE_${__lang}_IMPLICIT_LINK_DIRECTORIES ${_dir})
endforeach()
- if(CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES)
- list(REMOVE_DUPLICATES CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES)
+ if(CMAKE_${__lang}_IMPLICIT_LINK_DIRECTORIES)
+ list(REMOVE_DUPLICATES CMAKE_${__lang}_IMPLICIT_LINK_DIRECTORIES)
endif()
# Parse library paths
- string(REGEX MATCHALL " -l([^ ]+)" _CRAY_LIBRARY_FLAGS "${_CRAY_FLAGS}")
- foreach(_flag IN LISTS _CRAY_LIBRARY_FLAGS)
+ string(REGEX MATCHALL " -l([^ ]+)" __cray_library_flags
"${__cray_driver_cmd}")
+ foreach(_flag IN LISTS __cray_library_flags)
string(REGEX REPLACE "^ -l([^ ]+)" "\\1" _dir "${_flag}")
- list(APPEND CMAKE_${_lang}_IMPLICIT_LINK_LIBRARIES ${_dir})
+ list(APPEND CMAKE_${__lang}_IMPLICIT_LINK_LIBRARIES ${_dir})
endforeach()
- if(CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES)
- list(REMOVE_DUPLICATES CMAKE_${_lang}_IMPLICIT_LINK_LIBRARIES)
+ if(CMAKE_${__lang}_IMPLICIT_LINK_DIRECTORIES)
+ list(REMOVE_DUPLICATES CMAKE_${__lang}_IMPLICIT_LINK_LIBRARIES)
endif()
endforeach()
@@ -100,15 +113,15 @@ endmacro()
# Determine the common directories between all languages and add them
# as system search paths
-set(_CRAY_INCLUDE_PATH_VARS)
-set(_CRAY_LIBRARY_PATH_VARS)
-foreach(_lang IN LISTS _LANGS)
- list(APPEND _CRAY_INCLUDE_PATH_VARS
CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES)
- list(APPEND _CRAY_LIBRARY_PATH_VARS CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES)
+set(__cray_include_path_vars)
+set(__cray_library_path_vars)
+foreach(__lang IN LISTS __langs)
+ list(APPEND __cray_include_path_vars
CMAKE_${__lang}_IMPLICIT_INCLUDE_DIRECTORIES)
+ list(APPEND __cray_library_path_vars
CMAKE_${__lang}_IMPLICIT_LINK_DIRECTORIES)
endforeach()
-if(_CRAY_INCLUDE_PATH_VARS)
- __list_intersection(CMAKE_SYSTEM_INCLUDE_PATH ${_CRAY_INCLUDE_PATH_VARS})
+if(__cray_include_path_vars)
+ __list_intersection(CMAKE_SYSTEM_INCLUDE_PATH ${__cray_include_path_vars})
endif()
-if(_CRAY_LIBRARY_PATH_VARS)
- __list_intersection(CMAKE_SYSTEM_LIBRARY_PATH ${_CRAY_LIBRARY_PATH_VARS})
+if(__cray_library_path_vars)
+ __list_intersection(CMAKE_SYSTEM_LIBRARY_PATH ${__cray_library_path_vars})
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/CrayLinuxEnvironment.cmake | 7 +--
Modules/Platform/CrayPrgEnv-ToolChain.cmake | 79 ++++++++++++++++-----------
2 files changed, 49 insertions(+), 37 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
