1 added + 2 removed + 1 modified, total 4 files
lcio
diff -u -r1.83.4.3 -r1.83.4.4
--- CMakeLists.txt 9 Mar 2011 11:00:57 -0000 1.83.4.3
+++ CMakeLists.txt 16 Mar 2011 16:30:06 -0000 1.83.4.4
@@ -20,15 +20,16 @@
### DEPENDENCIES ############################################################
+LIST( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
+
#FIND_PACKAGE( ILCUTIL COMPONENTS ILCSOFT_CMAKE_MODULES REQUIRED )
-FIND_PACKAGE( ILCSOFT_CMAKE_MODULES REQUIRED )
# load default settings from ILCSOFT_CMAKE_MODULES
INCLUDE( ilcsoft_default_settings )
# JAVA (needed to generate c++ headers)
-INCLUDE( ${PROJECT_SOURCE_DIR}/cmake/FindJAVA.cmake )
+INCLUDE( FindJAVA4LCIO )
IF( NOT JAVA_FOUND )
MESSAGE( FATAL_ERROR "Failed to find Java! Please set JAVA_DIR=/path/to/java" )
ENDIF()
lcio/cmake
diff -N FindJAVA4LCIO.cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ FindJAVA4LCIO.cmake 16 Mar 2011 16:30:09 -0000 1.1.2.1
@@ -0,0 +1,236 @@
+##################################################################################
+# cmake module for finding JAVA
+#
+# looks in following locations in the following order:
+# JAVA_DIR, JAVA_HOME, JDK_HOME, ENV{JAVA_HOME}, ENV{JDK_HOME}
+#
+# sets following variables:
+#
+# JAVA_FOUND - set to TRUE or FALSE (javadoc is ignored for the test)
+#
+# JAVA_DIR - base dir where subdirs bin, lib, jre and include are located
+# JAVA_HOME - same as JAVA_DIR
+# JAVA_BIN_PATH - path to subdirectory "${JAVA_DIR}/bin"
+#
+# JAVA_RUNTIME - path to ${JAVA_BIN_PATH}/java
+# JAVA_COMPILE - path to ${JAVA_BIN_PATH}/javac
+# JAVA_ARCHIVE - path to ${JAVA_BIN_PATH}/jar
+# JAVA_DOC - path to ${JAVA_BIN_PATH}/javadoc
+#
+# JAVA_VERSION_MAJOR
+# JAVA_VERSION_MINOR
+# JAVA_VERSION_PATCH
+# JAVA_VERSION (MAJOR.MINOR.PATCH)
+#
+# @author Jan Engels, DESY
+##################################################################################
+
+SET( JAVA_FOUND FALSE )
+MARK_AS_ADVANCED( JAVA_FOUND )
+
+IF( NOT JAVA_DIR AND JAVA_HOME )
+ SET( JAVA_DIR "${JAVA_HOME}" )
+ENDIF()
+
+IF( NOT JAVA_DIR AND JDK_HOME )
+ SET( JAVA_DIR "${JDK_HOME}" )
+ENDIF()
+
+IF( NOT JAVA_DIR AND DEFINED ENV{JAVA_HOME} )
+ SET( JAVA_DIR "$ENV{JAVA_HOME}" )
+ENDIF()
+
+IF( NOT JAVA_DIR AND DEFINED ENV{JDK_HOME} )
+ SET( JAVA_DIR "$ENV{JDK_HOME}" )
+ENDIF()
+
+
+IF( NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Check for Java: ${JAVA_DIR}" )
+ENDIF()
+
+IF( JAVA_DIR )
+
+ SET( JAVA_BIN_PATH JAVA_BIN_PATH-NOTFOUND )
+ FIND_PATH( JAVA_BIN_PATH
+ javac
+ ${JAVA_DIR}/bin
+ ${JAVA_DIR}/Commands
+ NO_DEFAULT_PATH )
+
+ IF( NOT JAVA_BIN_PATH AND NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "${JAVA_DIR} is not a valid path for Java!!" )
+ ENDIF()
+
+ IF( JAVA_BIN_PATH )
+ # find java, javac, jar and javadoc
+ SET( JAVA_RUNTIME JAVA_RUNTIME-NOTFOUND )
+ FIND_PROGRAM( JAVA_RUNTIME
+ java
+ ${JAVA_BIN_PATH}
+ NO_DEFAULT_PATH )
+
+ SET( JAVA_COMPILE JAVA_COMPILE-NOTFOUND )
+ FIND_PROGRAM( JAVA_COMPILE
+ javac
+ ${JAVA_BIN_PATH}
+ NO_DEFAULT_PATH )
+
+ SET( JAVA_ARCHIVE JAVA_ARCHIVE-NOTFOUND )
+ FIND_PROGRAM( JAVA_ARCHIVE
+ jar
+ ${JAVA_BIN_PATH}
+ NO_DEFAULT_PATH )
+
+ SET( JAVA_DOC JAVA_DOC-NOTFOUND )
+ FIND_PROGRAM( JAVA_DOC
+ javadoc
+ ${JAVA_BIN_PATH}
+ NO_DEFAULT_PATH )
+
+ # abort if not found
+ IF( NOT JAVA_RUNTIME AND NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Could not find java!!" )
+ ENDIF()
+ IF( NOT JAVA_COMPILE AND NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Could not find javac!!" )
+ ENDIF()
+ IF( NOT JAVA_ARCHIVE AND NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Could not find jar!!" )
+ ENDIF()
+ IF( NOT JAVA_DOC AND NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Could not find javadoc!!" )
+ ENDIF()
+ ENDIF()
+
+
+ELSE() # try to autodetect java
+
+
+ IF( NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Autodetecting Java..." )
+ ENDIF()
+
+ # use the CMake FindJava.cmake module
+ FIND_PACKAGE( Java )
+
+ #MESSAGE( STATUS "JAVA_RUNTIME: ${JAVA_RUNTIME}" )
+ #MESSAGE( STATUS "JAVA_COMPILE: ${JAVA_COMPILE}" )
+ #MESSAGE( STATUS "JAVA_ARCHIVE: ${JAVA_ARCHIVE}" )
+
+ IF( JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_ARCHIVE )
+
+ IF( UNIX AND NOT APPLE )
+
+ # look for the readlink binary
+ FIND_PROGRAM( READLINK_BIN readlink )
+ MARK_AS_ADVANCED( READLINK_BIN )
+
+ IF( READLINK_BIN )
+
+ # dereference links
+ EXEC_PROGRAM( ${READLINK_BIN} ARGS "-f ${JAVA_COMPILE}"
+ OUTPUT_VARIABLE javac_dereferenced
+ RETURN_VALUE return_value )
+
+ IF( NOT return_value )
+ GET_FILENAME_COMPONENT( JAVA_BIN_PATH ${javac_dereferenced} PATH )
+ ELSE()
+ GET_FILENAME_COMPONENT( JAVA_BIN_PATH ${JAVA_COMPILE} PATH )
+ ENDIF()
+ ENDIF()
+
+ GET_FILENAME_COMPONENT( JAVA_DIR ${JAVA_BIN_PATH} PATH )
+
+ ELSE()
+
+ SET( JAVA_HOME_MAC JAVA_HOME_MAC-NOTFOUND )
+ FIND_PROGRAM( JAVA_HOME_MAC
+ java_home
+ /usr/libexec/
+ )
+
+ IF( JAVA_HOME_MAC )
+
+ EXEC_PROGRAM( "${JAVA_HOME_MAC}"
+ OUTPUT_VARIABLE JAVA_DIR
+ RETURN_VALUE _exit_code
+ )
+
+ IF( _exit_code )
+ IF( NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Failed to execute java_home" )
+ ENDIF()
+ ENDIF()
+
+ SET( JAVA_BIN_PATH JAVA_BIN_PATH-NOTFOUND )
+ FIND_PATH( JAVA_BIN_PATH
+ javac
+ ${JAVA_DIR}/bin
+ ${JAVA_DIR}/Commands
+ NO_DEFAULT_PATH )
+
+ IF( NOT JAVA_BIN_PATH AND NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "${JAVA_DIR} is not a valid path for Java!!" )
+ ENDIF()
+
+ ELSE()
+ IF( NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Failed to autodetect Java!!" )
+ ENDIF()
+ ENDIF()
+
+ ENDIF()
+ ELSE()
+ IF( NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Failed to autodetect Java!!" )
+ ENDIF()
+ ENDIF()
+
+ENDIF()
+
+IF( JAVA_DIR )
+ SET( JAVA_HOME "${JAVA_DIR}" )
+ IF( NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "JAVA_HOME set to ${JAVA_DIR}" )
+ ENDIF()
+ENDIF()
+
+IF( JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_ARCHIVE )
+
+ SET( JAVA_FOUND TRUE )
+
+ # parse the output of java -version
+ EXEC_PROGRAM( "${JAVA_RUNTIME}" ARGS "-version"
+ OUTPUT_VARIABLE out_tmp
+ RETURN_VALUE _exit_code )
+
+ IF( _exit_code )
+ IF( NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Failed to execute java -version!! JAVA_VERSION will not be set!!" )
+ ENDIF()
+ ELSE()
+ # extract major/minor version and patch level from "java -version" output
+ STRING( REGEX REPLACE ".* version \"([0-9]+)\\.[0-9]+\\.[0-9]+.*"
+ "\\1" JAVA_VERSION_MAJOR "${out_tmp}" )
+ STRING( REGEX REPLACE ".* version \"[0-9]+\\.([0-9]+)\\.[0-9]+.*"
+ "\\1" JAVA_VERSION_MINOR "${out_tmp}" )
+ STRING( REGEX REPLACE ".* version \"[0-9]+\\.[0-9]+\\.([0-9]+).*"
+ "\\1" JAVA_VERSION_PATCH "${out_tmp}" )
+
+ SET( JAVA_VERSION "${JAVA_VERSION_MAJOR}.${JAVA_VERSION_MINOR}.${JAVA_VERSION_PATCH}" )
+
+ # display info
+ IF( NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Found Java (version ${JAVA_VERSION})" )
+ ENDIF()
+ ENDIF()
+ELSE()
+ IF( JAVA_FIND_REQUIRED )
+ MESSAGE( FATAL_ERROR "Failed to find Java!!" )
+ ENDIF()
+ IF( NOT JAVA_FIND_QUIETLY )
+ MESSAGE( STATUS "Failed to find Java!!" )
+ ENDIF()
+ENDIF()
+
lcio/cmake
diff -N FindILCSOFT_CMAKE_MODULES.cmake
--- FindILCSOFT_CMAKE_MODULES.cmake 9 Mar 2011 11:19:33 -0000 1.1.2.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-
-# --------- CMakeModules version ----------------
-SET( ILCSOFT_CMAKE_MODULES_VERSION_MAJOR 1 )
-SET( ILCSOFT_CMAKE_MODULES_VERSION_MINOR 11 )
-SET( ILCSOFT_CMAKE_MODULES_VERSION_PATCH 0 )
-SET( ILCSOFT_CMAKE_MODULES_VERSION_TWEAK 0 )
-# -----------------------------------------------
-
-
-SET( ILCSOFT_CMAKE_MODULES_VERSION ${ILCSOFT_CMAKE_MODULES_VERSION_MAJOR}.${ILCSOFT_CMAKE_MODULES_VERSION_MINOR}.${ILCSOFT_CMAKE_MODULES_VERSION_PATCH}.${ILCSOFT_CMAKE_MODULES_VERSION_TWEAK} )
-
-GET_FILENAME_COMPONENT( ILCSOFT_CMAKE_MODULES_ROOT ${CMAKE_CURRENT_LIST_FILE} PATH )
-IF( NOT ILCSOFT_CMAKE_MODULES_FIND_QUIETLY )
- MESSAGE( STATUS "Check for ILCSOFT_CMAKE_MODULES: ${ILCSOFT_CMAKE_MODULES_ROOT}" )
-ENDIF()
-
-INCLUDE( MacroCheckPackageVersion )
-CHECK_PACKAGE_VERSION( ILCSOFT_CMAKE_MODULES ${ILCSOFT_CMAKE_MODULES_VERSION} )
-
-SET( ILCSOFT_CMAKE_MODULES_VERSION_SUITABLE TRUE )
-IF( PACKAGE_VERSION_UNSUITABLE )
- SET( ILCSOFT_CMAKE_MODULES_VERSION_SUITABLE FALSE )
-ENDIF()
-
-# ---------- final checking ---------------------------------------------------
-INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( ILCSOFT_CMAKE_MODULES DEFAULT_MSG ILCSOFT_CMAKE_MODULES_VERSION_SUITABLE )
-
lcio/cmake
diff -N FindJAVA.cmake
--- FindJAVA.cmake 9 Mar 2011 10:37:45 -0000 1.1.2.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,236 +0,0 @@
-##################################################################################
-# cmake module for finding JAVA
-#
-# looks in following locations in the following order:
-# JAVA_DIR, JAVA_HOME, JDK_HOME, ENV{JAVA_HOME}, ENV{JDK_HOME}
-#
-# sets following variables:
-#
-# JAVA_FOUND - set to TRUE or FALSE (javadoc is ignored for the test)
-#
-# JAVA_DIR - base dir where subdirs bin, lib, jre and include are located
-# JAVA_HOME - same as JAVA_DIR
-# JAVA_BIN_PATH - path to subdirectory "${JAVA_DIR}/bin"
-#
-# JAVA_RUNTIME - path to ${JAVA_BIN_PATH}/java
-# JAVA_COMPILE - path to ${JAVA_BIN_PATH}/javac
-# JAVA_ARCHIVE - path to ${JAVA_BIN_PATH}/jar
-# JAVA_DOC - path to ${JAVA_BIN_PATH}/javadoc
-#
-# JAVA_VERSION_MAJOR
-# JAVA_VERSION_MINOR
-# JAVA_VERSION_PATCH
-# JAVA_VERSION (MAJOR.MINOR.PATCH)
-#
-# @author Jan Engels, DESY
-##################################################################################
-
-SET( JAVA_FOUND FALSE )
-MARK_AS_ADVANCED( JAVA_FOUND )
-
-IF( NOT JAVA_DIR AND JAVA_HOME )
- SET( JAVA_DIR "${JAVA_HOME}" )
-ENDIF()
-
-IF( NOT JAVA_DIR AND JDK_HOME )
- SET( JAVA_DIR "${JDK_HOME}" )
-ENDIF()
-
-IF( NOT JAVA_DIR AND DEFINED ENV{JAVA_HOME} )
- SET( JAVA_DIR "$ENV{JAVA_HOME}" )
-ENDIF()
-
-IF( NOT JAVA_DIR AND DEFINED ENV{JDK_HOME} )
- SET( JAVA_DIR "$ENV{JDK_HOME}" )
-ENDIF()
-
-
-IF( NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Check for Java: ${JAVA_DIR}" )
-ENDIF()
-
-IF( JAVA_DIR )
-
- SET( JAVA_BIN_PATH JAVA_BIN_PATH-NOTFOUND )
- FIND_PATH( JAVA_BIN_PATH
- javac
- ${JAVA_DIR}/bin
- ${JAVA_DIR}/Commands
- NO_DEFAULT_PATH )
-
- IF( NOT JAVA_BIN_PATH AND NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "${JAVA_DIR} is not a valid path for Java!!" )
- ENDIF()
-
- IF( JAVA_BIN_PATH )
- # find java, javac, jar and javadoc
- SET( JAVA_RUNTIME JAVA_RUNTIME-NOTFOUND )
- FIND_PROGRAM( JAVA_RUNTIME
- java
- ${JAVA_BIN_PATH}
- NO_DEFAULT_PATH )
-
- SET( JAVA_COMPILE JAVA_COMPILE-NOTFOUND )
- FIND_PROGRAM( JAVA_COMPILE
- javac
- ${JAVA_BIN_PATH}
- NO_DEFAULT_PATH )
-
- SET( JAVA_ARCHIVE JAVA_ARCHIVE-NOTFOUND )
- FIND_PROGRAM( JAVA_ARCHIVE
- jar
- ${JAVA_BIN_PATH}
- NO_DEFAULT_PATH )
-
- SET( JAVA_DOC JAVA_DOC-NOTFOUND )
- FIND_PROGRAM( JAVA_DOC
- javadoc
- ${JAVA_BIN_PATH}
- NO_DEFAULT_PATH )
-
- # abort if not found
- IF( NOT JAVA_RUNTIME AND NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Could not find java!!" )
- ENDIF()
- IF( NOT JAVA_COMPILE AND NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Could not find javac!!" )
- ENDIF()
- IF( NOT JAVA_ARCHIVE AND NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Could not find jar!!" )
- ENDIF()
- IF( NOT JAVA_DOC AND NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Could not find javadoc!!" )
- ENDIF()
- ENDIF()
-
-
-ELSE() # try to autodetect java
-
-
- IF( NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Autodetecting Java..." )
- ENDIF()
-
- # use the CMake FindJava.cmake module
- FIND_PACKAGE( Java )
-
- #MESSAGE( STATUS "JAVA_RUNTIME: ${JAVA_RUNTIME}" )
- #MESSAGE( STATUS "JAVA_COMPILE: ${JAVA_COMPILE}" )
- #MESSAGE( STATUS "JAVA_ARCHIVE: ${JAVA_ARCHIVE}" )
-
- IF( JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_ARCHIVE )
-
- IF( UNIX AND NOT APPLE )
-
- # look for the readlink binary
- FIND_PROGRAM( READLINK_BIN readlink )
- MARK_AS_ADVANCED( READLINK_BIN )
-
- IF( READLINK_BIN )
-
- # dereference links
- EXEC_PROGRAM( ${READLINK_BIN} ARGS "-f ${JAVA_COMPILE}"
- OUTPUT_VARIABLE javac_dereferenced
- RETURN_VALUE return_value )
-
- IF( NOT return_value )
- GET_FILENAME_COMPONENT( JAVA_BIN_PATH ${javac_dereferenced} PATH )
- ELSE()
- GET_FILENAME_COMPONENT( JAVA_BIN_PATH ${JAVA_COMPILE} PATH )
- ENDIF()
- ENDIF()
-
- GET_FILENAME_COMPONENT( JAVA_DIR ${JAVA_BIN_PATH} PATH )
-
- ELSE()
-
- SET( JAVA_HOME_MAC JAVA_HOME_MAC-NOTFOUND )
- FIND_PROGRAM( JAVA_HOME_MAC
- java_home
- /usr/libexec/
- )
-
- IF( JAVA_HOME_MAC )
-
- EXEC_PROGRAM( "${JAVA_HOME_MAC}"
- OUTPUT_VARIABLE JAVA_DIR
- RETURN_VALUE _exit_code
- )
-
- IF( _exit_code )
- IF( NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Failed to execute java_home" )
- ENDIF()
- ENDIF()
-
- SET( JAVA_BIN_PATH JAVA_BIN_PATH-NOTFOUND )
- FIND_PATH( JAVA_BIN_PATH
- javac
- ${JAVA_DIR}/bin
- ${JAVA_DIR}/Commands
- NO_DEFAULT_PATH )
-
- IF( NOT JAVA_BIN_PATH AND NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "${JAVA_DIR} is not a valid path for Java!!" )
- ENDIF()
-
- ELSE()
- IF( NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Failed to autodetect Java!!" )
- ENDIF()
- ENDIF()
-
- ENDIF()
- ELSE()
- IF( NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Failed to autodetect Java!!" )
- ENDIF()
- ENDIF()
-
-ENDIF()
-
-IF( JAVA_DIR )
- SET( JAVA_HOME "${JAVA_DIR}" )
- IF( NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "JAVA_HOME set to ${JAVA_DIR}" )
- ENDIF()
-ENDIF()
-
-IF( JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_ARCHIVE )
-
- SET( JAVA_FOUND TRUE )
-
- # parse the output of java -version
- EXEC_PROGRAM( "${JAVA_RUNTIME}" ARGS "-version"
- OUTPUT_VARIABLE out_tmp
- RETURN_VALUE _exit_code )
-
- IF( _exit_code )
- IF( NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Failed to execute java -version!! JAVA_VERSION will not be set!!" )
- ENDIF()
- ELSE()
- # extract major/minor version and patch level from "java -version" output
- STRING( REGEX REPLACE ".* version \"([0-9]+)\\.[0-9]+\\.[0-9]+.*"
- "\\1" JAVA_VERSION_MAJOR "${out_tmp}" )
- STRING( REGEX REPLACE ".* version \"[0-9]+\\.([0-9]+)\\.[0-9]+.*"
- "\\1" JAVA_VERSION_MINOR "${out_tmp}" )
- STRING( REGEX REPLACE ".* version \"[0-9]+\\.[0-9]+\\.([0-9]+).*"
- "\\1" JAVA_VERSION_PATCH "${out_tmp}" )
-
- SET( JAVA_VERSION "${JAVA_VERSION_MAJOR}.${JAVA_VERSION_MINOR}.${JAVA_VERSION_PATCH}" )
-
- # display info
- IF( NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Found Java (version ${JAVA_VERSION})" )
- ENDIF()
- ENDIF()
-ELSE()
- IF( JAVA_FIND_REQUIRED )
- MESSAGE( FATAL_ERROR "Failed to find Java!!" )
- ENDIF()
- IF( NOT JAVA_FIND_QUIETLY )
- MESSAGE( STATUS "Failed to find Java!!" )
- ENDIF()
-ENDIF()
-
CVSspam 0.2.8
