diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-06-12 20:41:50 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-06-12 20:41:50 (GMT) |
| commit | df1edcb9d3338628ee43794b8e4d6eae81ca1b0c (patch) | |
| tree | 16b7197bdcfae64cc1afc116cca1833b442dea9b | |
| parent | 07837ebe3a159e644fb73ef8b48461eb33dd65a6 (diff) | |
| download | CMake-df1edcb9d3338628ee43794b8e4d6eae81ca1b0c.zip CMake-df1edcb9d3338628ee43794b8e4d6eae81ca1b0c.tar.gz CMake-df1edcb9d3338628ee43794b8e4d6eae81ca1b0c.tar.bz2 | |
ENH: first include the processor specific file, then the compiler file, this
way the specific hardware file can set variables which can be used in the
toolchain rules (like CMAKE_C_COMPILE_OBJECT etc.)
Alex
| -rw-r--r-- | Modules/CMakeCInformation.cmake | 23 | ||||
| -rw-r--r-- | Modules/CMakeCXXInformation.cmake | 23 |
2 files changed, 24 insertions, 22 deletions
diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake index 1908b40..4d4e52a 100644 --- a/Modules/CMakeCInformation.cmake +++ b/Modules/CMakeCInformation.cmake @@ -18,17 +18,6 @@ IF(CMAKE_COMPILER_IS_GNUCC) SET(CMAKE_BASE_NAME gcc) ENDIF(CMAKE_COMPILER_IS_GNUCC) -IF(CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE) - INCLUDE(${CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE} OPTIONAL) -ELSE(CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE) - IF(CMAKE_C_COMPILER_ID) - INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) - ENDIF(CMAKE_C_COMPILER_ID) - IF (NOT _INCLUDED_FILE) - INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) - ENDIF (NOT _INCLUDED_FILE) -ENDIF(CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE) - IF(CMAKE_SYSTEM_AND_C_COMPILER_AND_PROCESSOR_INFO_FILE) INCLUDE(${CMAKE_SYSTEM_AND_C_COMPILER_AND_PROCESSOR_INFO_FILE} OPTIONAL) @@ -44,6 +33,18 @@ ELSE(CMAKE_SYSTEM_AND_C_COMPILER_AND_PROCESSOR_INFO_FILE) ENDIF(CMAKE_SYSTEM_AND_C_COMPILER_AND_PROCESSOR_INFO_FILE) +IF(CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE) + INCLUDE(${CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE} OPTIONAL) +ELSE(CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE) + IF(CMAKE_C_COMPILER_ID) + INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) + ENDIF(CMAKE_C_COMPILER_ID) + IF (NOT _INCLUDED_FILE) + INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) + ENDIF (NOT _INCLUDED_FILE) +ENDIF(CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE) + + # This should be included before the _INIT variables are # used to initialize the cache. Since the rule variables # have if blocks on them, users can still define them here. diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake index 6f286e5..ba76e34 100644 --- a/Modules/CMakeCXXInformation.cmake +++ b/Modules/CMakeCXXInformation.cmake @@ -20,17 +20,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_BASE_NAME g++) ENDIF(CMAKE_COMPILER_IS_GNUCXX) -IF(CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE) - INCLUDE(${CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE} OPTIONAL) -ELSE(CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE) - IF(CMAKE_CXX_COMPILER_ID) - INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-CXX OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) - ENDIF(CMAKE_CXX_COMPILER_ID) - IF (NOT _INCLUDED_FILE) - INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) - ENDIF (NOT _INCLUDED_FILE) -ENDIF(CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE) - IF(CMAKE_SYSTEM_AND_CXX_COMPILER_AND_PROCESSOR_INFO_FILE) INCLUDE(${CMAKE_SYSTEM_AND_CXX_COMPILER_AND_PROCESSOR_INFO_FILE} OPTIONAL) @@ -46,6 +35,18 @@ ELSE(CMAKE_SYSTEM_AND_CXX_COMPILER_AND_PROCESSOR_INFO_FILE) ENDIF(CMAKE_SYSTEM_AND_CXX_COMPILER_AND_PROCESSOR_INFO_FILE) +IF(CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE) + INCLUDE(${CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE} OPTIONAL) +ELSE(CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE) + IF(CMAKE_CXX_COMPILER_ID) + INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-CXX OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) + ENDIF(CMAKE_CXX_COMPILER_ID) + IF (NOT _INCLUDED_FILE) + INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) + ENDIF (NOT _INCLUDED_FILE) +ENDIF(CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE) + + # This should be included before the _INIT variables are # used to initialize the cache. Since the rule variables # have if blocks on them, users can still define them here. |