diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-03-02 12:52:52 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-03-02 12:52:52 (GMT) |
| commit | 2f78d874a75e8032b90997df3449040c941b1b5b (patch) | |
| tree | 5408031de6c0e838e0de29ee010364a84f4010a3 /Modules/CMakeJavaInformation.cmake | |
| parent | f2922860c64d056a5d1cdb9ca350df738e52a029 (diff) | |
| download | CMake-2f78d874a75e8032b90997df3449040c941b1b5b.zip CMake-2f78d874a75e8032b90997df3449040c941b1b5b.tar.gz CMake-2f78d874a75e8032b90997df3449040c941b1b5b.tar.bz2 | |
ENH: fix for bug 2921, move _OVERRIDE variable to a better position to allow changing _INIT variables
Diffstat (limited to 'Modules/CMakeJavaInformation.cmake')
| -rw-r--r-- | Modules/CMakeJavaInformation.cmake | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Modules/CMakeJavaInformation.cmake b/Modules/CMakeJavaInformation.cmake index 65c833e..d7692bc 100644 --- a/Modules/CMakeJavaInformation.cmake +++ b/Modules/CMakeJavaInformation.cmake @@ -1,3 +1,16 @@ +# 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) # this is a place holder if java needed flags for javac they would go here. IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY) |