diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-03-02 07:52:52 -0500 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-03-02 07:52:52 -0500 |
| commit | 2f78d874a75e8032b90997df3449040c941b1b5b (patch) | |
| tree | 5408031de6c0e838e0de29ee010364a84f4010a3 /Modules/CMakeCXXInformation.cmake | |
| parent | f2922860c64d056a5d1cdb9ca350df738e52a029 (diff) | |
| download | cmake-2f78d874a75e8032b90997df3449040c941b1b5b.tar.gz | |
ENH: fix for bug 2921, move _OVERRIDE variable to a better position to allow changing _INIT variables
Diffstat (limited to 'Modules/CMakeCXXInformation.cmake')
| -rw-r--r-- | Modules/CMakeCXXInformation.cmake | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake index 390904ad66..60a30f8b49 100644 --- a/Modules/CMakeCXXInformation.cmake +++ b/Modules/CMakeCXXInformation.cmake @@ -3,7 +3,6 @@ # It also loads the available platform file for the system-compiler # if it exists. - GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE) # since the gnu compiler has several names force g++ IF(CMAKE_COMPILER_IS_GNUCXX) @@ -12,6 +11,20 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) +# 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. +# But, it should still be after the platform file so changes can +# be made to those values. + +IF(CMAKE_USER_MAKE_RULES_OVERRIDE) + INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE}) +ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE) + +IF(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX) + INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_CXX}) +ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX) + # for most systems a module is the same as a shared library # so unless the variable CMAKE_MODULE_EXISTS is set just |