summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeDetermineJavaCompiler.cmake
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-07-20 19:44:55 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-07-20 19:44:55 (GMT)
commitb8b298104b18486e65fd40ae410a327d9e6fe8f3 (patch)
treed447d9b5cbf635545721fd27046e9520e02f0a4b /Modules/CMakeDetermineJavaCompiler.cmake
parentff250565a2316b6bd639fba2db1c8180a8f590db (diff)
downloadCMake-b8b298104b18486e65fd40ae410a327d9e6fe8f3.zip
CMake-b8b298104b18486e65fd40ae410a327d9e6fe8f3.tar.gz
CMake-b8b298104b18486e65fd40ae410a327d9e6fe8f3.tar.bz2
ENH: make sure flags set in CC or CXX environment variables stay with the compiler
Diffstat (limited to 'Modules/CMakeDetermineJavaCompiler.cmake')
-rw-r--r--Modules/CMakeDetermineJavaCompiler.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake
index 03e7719..3b787a9 100644
--- a/Modules/CMakeDetermineJavaCompiler.cmake
+++ b/Modules/CMakeDetermineJavaCompiler.cmake
@@ -6,6 +6,9 @@ IF(NOT CMAKE_Java_COMPILER)
# prefer the environment variable CC
IF($ENV{JAVA_COMPILER} MATCHES ".+")
GET_FILENAME_COMPONENT(CMAKE_Java_COMPILER_INIT $ENV{JAVA_COMPILER} PROGRAM PROGRAM_ARGS CMAKE_Java_FLAGS_ENV_INIT)
+ IF(CMAKE_Java_FLAGS_ENV_INIT)
+ SET(CMAKE_Java_COMPILER_ARG1 ${CMAKE_Java_FLAGS_ENV_INIT} CACHE STRING "First argument to Java compiler")
+ ENDIF(CMAKE_Java_FLAGS_ENV_INIT)
IF(EXISTS ${CMAKE_Java_COMPILER_INIT})
ELSE(EXISTS ${CMAKE_Java_COMPILER_INIT})
MESSAGE(SEND_ERROR "Could not find compiler set in environment variable JAVA_COMPILER:\n$ENV{JAVA_COMPILER}.")