diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-26 20:24:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-26 20:24:05 (GMT) |
| commit | 7e6a00465989208905432bd41885db6133fa2742 (patch) | |
| tree | 1b5e9b85d3684842547dca2ec29216a48e831f1a /Modules/CMakeJavaInformation.cmake | |
| parent | 5cd8b8bdfb6dada773c44af784df2e8e7540802d (diff) | |
| parent | a146e03422dcfaa6df6dc2f5ce594862126b17ef (diff) | |
| download | CMake-7e6a00465989208905432bd41885db6133fa2742.zip CMake-7e6a00465989208905432bd41885db6133fa2742.tar.gz CMake-7e6a00465989208905432bd41885db6133fa2742.tar.bz2 | |
Merge topic 'relative-CMAKE_USER_MAKE_RULES_OVERRIDE'
a146e03 Fix relative CMAKE_USER_MAKE_RULES_OVERRIDE (#11725)
Diffstat (limited to 'Modules/CMakeJavaInformation.cmake')
| -rw-r--r-- | Modules/CMakeJavaInformation.cmake | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Modules/CMakeJavaInformation.cmake b/Modules/CMakeJavaInformation.cmake index e9bc9be..e192db1 100644 --- a/Modules/CMakeJavaInformation.cmake +++ b/Modules/CMakeJavaInformation.cmake @@ -1,6 +1,6 @@ #============================================================================= -# Copyright 2004-2009 Kitware, Inc. +# Copyright 2004-2011 Kitware, Inc. # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. @@ -19,12 +19,16 @@ # 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) + # Save the full path of the file so try_compile can use it. + INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE} RESULT_VARIABLE _override) + SET(CMAKE_USER_MAKE_RULES_OVERRIDE "${_override}") +ENDIF() + +IF(CMAKE_USER_MAKE_RULES_OVERRIDE_Java) + # Save the full path of the file so try_compile can use it. + INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_Java} RESULT_VARIABLE _override) + SET(CMAKE_USER_MAKE_RULES_OVERRIDE_Java "${_override}") +ENDIF() # this is a place holder if java needed flags for javac they would go here. IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY) |