mirror of
https://github.com/reactos/CMake.git
synced 2024-11-27 13:30:39 +00:00
CrayPrgEnv/ParseImplicitIncludes: simplify for new implict include parser
Remove now redundant implicit parser code from CrayPrgEnv.cmake, as
this function is now supported in the general cmake code
(e.g. Modules/CMakeParseImplicit{Include,Link}Info.cmake).
This simplifies __CrayPrgEnv_setup() to take only one arg (${lang})
and allows us to remove a level of inclusion as
CrayPrgEnv-${lang}.cmake is now compiler independent we
do not need the CrayPrgEnv-${compiler}-${lang} files any more.
This commit is contained in:
Chuck Cranor
parent
ef8f237686
commit
eaf53158f4
@ -4,8 +4,4 @@ endif()
|
||||
set(__craylinux_crayprgenv_c 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv)
|
||||
macro(__CrayPrgEnv_setup_C compiler_cmd link_cmd)
|
||||
__CrayPrgEnv_setup(C
|
||||
${CMAKE_ROOT}/Modules/CMakeCCompilerABI.c
|
||||
${compiler_cmd} ${link_cmd})
|
||||
endmacro()
|
||||
__CrayPrgEnv_setup(C)
|
||||
|
||||
@ -4,8 +4,4 @@ endif()
|
||||
set(__craylinux_crayprgenv_cxx 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv)
|
||||
macro(__CrayPrgEnv_setup_CXX compiler_cmd link_cmd)
|
||||
__CrayPrgEnv_setup(CXX
|
||||
${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp
|
||||
${compiler_cmd} ${link_cmd})
|
||||
endmacro()
|
||||
__CrayPrgEnv_setup(CXX)
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_cray_c)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_cray_c 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-C)
|
||||
__CrayPrgEnv_setup_C("/opt/cray/cce/.*/ccfe" "/opt/cray/cce/.*/ld")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_cray_cxx)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_cray_cxx 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-CXX)
|
||||
__CrayPrgEnv_setup_CXX("/opt/cray/cce/.*/ccfe" "/opt/cray/cce/.*/ld")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_cray_fortran)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_cray_fortran 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-Fortran)
|
||||
__CrayPrgEnv_setup_Fortran("/opt/cray/cce/.*/ftnfe" "/opt/cray/cce/.*/ld")
|
||||
@ -4,8 +4,4 @@ endif()
|
||||
set(__craylinux_crayprgenv_fortran 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv)
|
||||
macro(__CrayPrgEnv_setup_Fortran compiler_cmd link_cmd)
|
||||
__CrayPrgEnv_setup(Fortran
|
||||
${CMAKE_ROOT}/Modules/CMakeFortranCompilerABI.F
|
||||
${compiler_cmd} ${link_cmd})
|
||||
endmacro()
|
||||
__CrayPrgEnv_setup(Fortran)
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_gnu_c)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_gnu_c 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-C)
|
||||
__CrayPrgEnv_setup_C("/opt/gcc/.*/cc1" "/opt/gcc/.*/collect2")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_gnu_cxx)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_gnu_cxx 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-CXX)
|
||||
__CrayPrgEnv_setup_CXX("/opt/gcc/.*/cc1plus" "/opt/gcc/.*/collect2")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_gnu_fortran)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_gnu_fortran 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-Fortran)
|
||||
__CrayPrgEnv_setup_Fortran("/opt/gcc/.*/f951" "/opt/gcc/.*/collect2")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_intel_c)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_intel_c 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-C)
|
||||
__CrayPrgEnv_setup_C("/opt/intel/.*/mcpcom" "^ld ")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_intel_cxx)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_intel_cxx 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-CXX)
|
||||
__CrayPrgEnv_setup_CXX("/opt/intel/.*/mcpcom" "^ld ")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_intel_fortran)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_intel_fortran 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-Fortran)
|
||||
__CrayPrgEnv_setup_Fortran("/opt/intel/.*/fortcom" "^ld ")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_pgi_c)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_pgi_c 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-C)
|
||||
__CrayPrgEnv_setup_C("/opt/pgi/[^ ]*/pgc" "/usr/bin/ld")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_pgi_cxx)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_pgi_cxx 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-CXX)
|
||||
__CrayPrgEnv_setup_CXX("/opt/pgi/[^ ]*/pgcpp" "/usr/bin/ld")
|
||||
@ -1,7 +0,0 @@
|
||||
if(__craylinux_crayprgenv_pgi_fortran)
|
||||
return()
|
||||
endif()
|
||||
set(__craylinux_crayprgenv_pgi_fortran 1)
|
||||
|
||||
include(Compiler/CrayPrgEnv-Fortran)
|
||||
__CrayPrgEnv_setup_Fortran("/opt/pgi/[^ ]*/pgf" "/usr/bin/ld")
|
||||
@ -4,54 +4,7 @@ if(__craylinux_crayprgenv)
|
||||
endif()
|
||||
set(__craylinux_crayprgenv 1)
|
||||
|
||||
macro(__cray_extract_args cmd tag_regex out_var make_absolute)
|
||||
string(REGEX MATCHALL "${tag_regex}" args "${cmd}")
|
||||
foreach(arg IN LISTS args)
|
||||
string(REGEX REPLACE "^${tag_regex}$" "\\2" param "${arg}")
|
||||
if(make_absolute)
|
||||
get_filename_component(param "${param}" ABSOLUTE)
|
||||
endif()
|
||||
list(APPEND ${out_var} ${param})
|
||||
endforeach()
|
||||
endmacro()
|
||||
|
||||
function(__cray_extract_implicit src compiler_cmd link_cmd lang include_dirs_var link_dirs_var link_libs_var)
|
||||
set(BIN "${CMAKE_PLATFORM_INFO_DIR}/CrayExtractImplicit_${lang}.bin")
|
||||
execute_process(
|
||||
COMMAND ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_VERBOSE_FLAG} -o ${BIN}
|
||||
RESULT_VARIABLE result
|
||||
OUTPUT_VARIABLE output
|
||||
ERROR_VARIABLE error
|
||||
)
|
||||
if(EXISTS "${BIN}")
|
||||
file(REMOVE "${BIN}")
|
||||
endif()
|
||||
set(include_dirs)
|
||||
set(link_dirs)
|
||||
set(link_libs)
|
||||
string(REGEX REPLACE "\r?\n" ";" output_lines "${output}\n${error}")
|
||||
foreach(line IN LISTS output_lines)
|
||||
if("${line}" MATCHES "${compiler_cmd}")
|
||||
__cray_extract_args("${line}" " -(I ?|isystem )([^ ]*)" include_dirs 1)
|
||||
set(processed_include 1)
|
||||
endif()
|
||||
if("${line}" MATCHES "${link_cmd}")
|
||||
__cray_extract_args("${line}" " -(L ?)([^ ]*)" link_dirs 1)
|
||||
__cray_extract_args("${line}" " -(l ?)([^ ]*)" link_libs 0)
|
||||
set(processed_link 1)
|
||||
endif()
|
||||
if(processed_include AND processed_link)
|
||||
break()
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
set(${include_dirs_var} "${include_dirs}" PARENT_SCOPE)
|
||||
set(${link_dirs_var} "${link_dirs}" PARENT_SCOPE)
|
||||
set(${link_libs_var} "${link_libs}" PARENT_SCOPE)
|
||||
set(CRAY_${lang}_EXTRACTED_IMPLICIT 1 CACHE INTERNAL "" FORCE)
|
||||
endfunction()
|
||||
|
||||
macro(__CrayPrgEnv_setup lang test_src compiler_cmd link_cmd)
|
||||
macro(__CrayPrgEnv_setup lang)
|
||||
if(DEFINED ENV{CRAYPE_VERSION})
|
||||
message(STATUS "Cray Programming Environment $ENV{CRAYPE_VERSION} ${lang}")
|
||||
elseif(DEFINED ENV{ASYNCPE_VERSION})
|
||||
@ -81,12 +34,4 @@ macro(__CrayPrgEnv_setup lang test_src compiler_cmd link_cmd)
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
||||
set(CMAKE_LINK_SEARCH_START_STATIC TRUE)
|
||||
endif()
|
||||
if(NOT CRAY_${lang}_EXTRACTED_IMPLICIT)
|
||||
__cray_extract_implicit(
|
||||
${test_src} ${compiler_cmd} ${link_cmd} ${lang}
|
||||
CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES
|
||||
CMAKE_${lang}_IMPLICIT_LINK_LIBRARIES
|
||||
)
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user