From eaf53158f49e6e7581613376e8c054e18bdffc23 Mon Sep 17 00:00:00 2001 From: Chuck Cranor Date: Tue, 29 Jan 2019 08:17:44 -0700 Subject: 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. --- Modules/Compiler/CrayPrgEnv-CXX.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Modules/Compiler/CrayPrgEnv-CXX.cmake') diff --git a/Modules/Compiler/CrayPrgEnv-CXX.cmake b/Modules/Compiler/CrayPrgEnv-CXX.cmake index aad85b67e2..442370ecce 100644 --- a/Modules/Compiler/CrayPrgEnv-CXX.cmake +++ b/Modules/Compiler/CrayPrgEnv-CXX.cmake @@ -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) -- cgit v1.2.1