From f6c21894952fb07e50e511efaa3baded794d631f Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 26 May 2016 14:41:23 -0400 Subject: [PATCH] Modules: Rename internal platform-specific compiler determination modules Rename Modules/Platform/-.cmake files to Modules/Platform/-Determine-.cmake to clarify their role. For compatibility with user-provided modules, load the old names if they exist. --- Modules/CMakeDetermineCCompiler.cmake | 1 + Modules/CMakeDetermineCXXCompiler.cmake | 1 + Modules/CMakeDetermineFortranCompiler.cmake | 1 + .../Platform/{CYGWIN-CXX.cmake => CYGWIN-Determine-CXX.cmake} | 0 .../Platform/{Darwin-CXX.cmake => Darwin-Determine-CXX.cmake} | 0 Modules/Platform/{Linux-CXX.cmake => Linux-Determine-CXX.cmake} | 0 .../Platform/{Windows-CXX.cmake => Windows-Determine-CXX.cmake} | 0 7 files changed, 3 insertions(+) rename Modules/Platform/{CYGWIN-CXX.cmake => CYGWIN-Determine-CXX.cmake} (100%) rename Modules/Platform/{Darwin-CXX.cmake => Darwin-Determine-CXX.cmake} (100%) rename Modules/Platform/{Linux-CXX.cmake => Linux-Determine-CXX.cmake} (100%) rename Modules/Platform/{Windows-CXX.cmake => Windows-Determine-CXX.cmake} (100%) diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index f8c6303248..73d9fb3fcf 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -34,6 +34,7 @@ include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake) # Load system-specific compiler preferences for this language. +include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL) include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL) if(NOT CMAKE_C_COMPILER_NAMES) set(CMAKE_C_COMPILER_NAMES cc) diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index 3c9bbc26a4..063b68e1eb 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -33,6 +33,7 @@ include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake) # Load system-specific compiler preferences for this language. +include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL) include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL) if(NOT CMAKE_CXX_COMPILER_NAMES) set(CMAKE_CXX_COMPILER_NAMES CC) diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake index 4f2a70c4d3..0f27a789c1 100644 --- a/Modules/CMakeDetermineFortranCompiler.cmake +++ b/Modules/CMakeDetermineFortranCompiler.cmake @@ -20,6 +20,7 @@ # as a default compiler include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake) +include(Platform/${CMAKE_SYSTEM_NAME}-Determine-Fortran OPTIONAL) include(Platform/${CMAKE_SYSTEM_NAME}-Fortran OPTIONAL) if(NOT CMAKE_Fortran_COMPILER_NAMES) set(CMAKE_Fortran_COMPILER_NAMES f95) diff --git a/Modules/Platform/CYGWIN-CXX.cmake b/Modules/Platform/CYGWIN-Determine-CXX.cmake similarity index 100% rename from Modules/Platform/CYGWIN-CXX.cmake rename to Modules/Platform/CYGWIN-Determine-CXX.cmake diff --git a/Modules/Platform/Darwin-CXX.cmake b/Modules/Platform/Darwin-Determine-CXX.cmake similarity index 100% rename from Modules/Platform/Darwin-CXX.cmake rename to Modules/Platform/Darwin-Determine-CXX.cmake diff --git a/Modules/Platform/Linux-CXX.cmake b/Modules/Platform/Linux-Determine-CXX.cmake similarity index 100% rename from Modules/Platform/Linux-CXX.cmake rename to Modules/Platform/Linux-Determine-CXX.cmake diff --git a/Modules/Platform/Windows-CXX.cmake b/Modules/Platform/Windows-Determine-CXX.cmake similarity index 100% rename from Modules/Platform/Windows-CXX.cmake rename to Modules/Platform/Windows-Determine-CXX.cmake