diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-19 23:05:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-01-19 23:15:36 (GMT) |
| commit | a146e03422dcfaa6df6dc2f5ce594862126b17ef (patch) | |
| tree | 1f01015337becf942f34b63d43b9bb694ce043df /Modules/CMakeJavaInformation.cmake | |
| parent | 295b5b60df5d9427fdb891fd51333c12089ee129 (diff) | |
| download | CMake-a146e03422dcfaa6df6dc2f5ce594862126b17ef.zip CMake-a146e03422dcfaa6df6dc2f5ce594862126b17ef.tar.gz CMake-a146e03422dcfaa6df6dc2f5ce594862126b17ef.tar.bz2 | |
Fix relative CMAKE_USER_MAKE_RULES_OVERRIDE (#11725)
In commit 295b5b60 (Honor CMAKE_USER_MAKE_RULES_OVERRIDE in try_compile,
2010-06-29) we started passing the value of this variable when building
a try_compile project. If the variable contains a relative path it must
be treated with respect to the file where it is first used. Ensure that
the value is converted to a full path so that it is correctly referenced
in the try_compile projects.
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 f537da5..f6503bb 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) |