diff -u -r1.16 -r1.17
--- CMakeLists.txt	27 Jun 2007 13:35:24 -0000	1.16
+++ CMakeLists.txt	2 Jul 2007 10:09:57 -0000	1.17
@@ -25,7 +25,7 @@

 OPTION( BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON )
 OPTION( BUILD_LCIO_TESTJOBS "Set to ON to build LCIO testjobs" OFF )
 OPTION( BUILD_F77_TESTJOBS "Set to ON to build LCIO F77 testjobs" OFF )

-OPTION( INSTALL_DOC "Set to ON to install Documentation" ON )

+OPTION( INSTALL_DOC "Set to OFF to skip build/install Documentation" ON )

 
 # set default cmake build type to RelWithDebInfo
 IF( NOT CMAKE_BUILD_TYPE )

@@ -42,34 +42,37 @@

 IF( NOT DEFINED ENV{JDK_HOME} AND NOT DEFINED ENV{JAVA_HOME} )
     MESSAGE( STATUS "Autodetecting java..." )
     FIND_PACKAGE( Java )

-    IF( JAVA_RUNTIME )

+    IF( JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_ARCHIVE )

         SET( java_bin "${JAVA_RUNTIME}" )

-        #IF( UNIX )
-        #    # initialize flow-control variable
-        #    SET( link_found TRUE )
-        #    
-        #    # dereference links
-        #    WHILE( link_found )
-        #        # check if the java binary is a symbolic link
-        #        EXEC_PROGRAM( file ARGS "${java_bin}"
-        #            OUTPUT_VARIABLE out_tmp
-        #            RETURN_VALUE out_ret )
-        #        IF( out_ret )
-        #            MESSAGE( STATUS "Error dereferencing links to Java Home!!" )
-        #            MESSAGE( FATAL_ERROR "${out_tmp}" )
-        #        ENDIF()
-        #        # set variable if link is found
-        #        STRING( REGEX MATCH " symbolic link to " link_found "${out_tmp}" )
-        #        IF( link_found )
-        #            # get the file to where the link points to
-        #            STRING( REGEX REPLACE ".* symbolic link to (.*)" "\\1" out_regex "${out_tmp}" )
-        #            MESSAGE( STATUS "Java binary ${java_bin} is a symbolic link to ${out_regex}" )
-        #            SET( java_bin "${out_regex}" )
-        #        ENDIF()
-        #    ENDWHILE()
-        #ENDIF()
-        # get java_path out of java binary
-        STRING( REGEX REPLACE "(.*)\\/bin\\/java$" "\\1" java_path ${java_bin} )

+        IF( UNIX AND NOT APPLE )
+            # initialize flow-control variable
+            SET( link_found TRUE )
+            
+            # dereference links
+            WHILE( link_found )
+                # check if the java binary is a symbolic link
+                EXEC_PROGRAM( file ARGS "${java_bin}"
+                    OUTPUT_VARIABLE out_tmp
+                    RETURN_VALUE out_ret )
+                IF( out_ret )
+                    MESSAGE( STATUS "Error dereferencing links to Java Home!!" )
+                    MESSAGE( FATAL_ERROR "${out_tmp}" )
+                ENDIF()
+                # set variable if link is found
+                STRING( REGEX MATCH " symbolic link to " link_found "${out_tmp}" )
+                IF( link_found )
+                    # get the file to where the link points to
+                    STRING( REGEX REPLACE ".* symbolic link to (.*)" "\\1" out_regex "${out_tmp}" )
+                    MESSAGE( STATUS "Java binary ${java_bin} is a symbolic link to ${out_regex}" )
+                    SET( java_bin "${out_regex}" )
+                ENDIF()
+            ENDWHILE()
+        ENDIF()
+        
+        # extract java_path out of full path to java runtime
+        STRING( REGEX REPLACE "(.*)\\/[^/]+\\/java$" "\\1" java_path ${java_bin} )
+        # extract java_bin_path out of full path to java runtime
+        STRING( REGEX REPLACE "(.*)\\/java$" "\\1" java_bin_path ${java_bin} )

     ELSE()
         MESSAGE( FATAL_ERROR "Java was not found in your system!!" )
     ENDIF()

@@ -92,14 +95,42 @@

             SET( java_path "$ENV{JDK_HOME}" )
         ENDIF()
         IF( DEFINED ENV{JAVA_HOME} )

-            SET( java_path "$ENV{JAVA_HOME}" )

+            SET( java_path "$ENV{JAVA_HOME}" ) 

         ENDIF()
     ENDIF()

-    SET( java_bin "${java_path}/bin/java" )
-    IF( NOT EXISTS "${java_bin}" )
-        MESSAGE( FATAL_ERROR
-            "Java runtime not found in: ${java_bin}" )

diff -u -r1.4 -r1.5
--- CMakeLists.txt	22 Jun 2007 12:20:59 -0000	1.4
+++ CMakeLists.txt	2 Jul 2007 10:09:57 -0000	1.5
@@ -17,26 +17,23 @@

     simjob_chain
 )
 

-IF( BUILD_F77_TESTJOBS )
-    
-    # create symbolic bin target for calling targets bin_XXX
-    ADD_CUSTOM_TARGET( f77 )

+# create symbolic bin target for calling targets bin_XXX
+ADD_CUSTOM_TARGET( f77 )

-    # loop through list of binaries
-    FOREACH( bin ${f77_bins} )
-        # create target for binary
-        ADD_EXECUTABLE( f77_${bin} EXCLUDE_FROM_ALL ${bin}.F )
-        # tell bin target to call this bin_XXX target
-        ADD_DEPENDENCIES( f77 f77_${bin} )
-        # avoid conflicts between library and binary target names
-        SET_TARGET_PROPERTIES( f77_${bin} PROPERTIES OUTPUT_NAME ${bin}_F )
-        # link against project library
-        
-        #FIXME: frtbegin g2c and gfortran needs to be tested
-        #TARGET_LINK_LIBRARIES( f77_${bin} lib_LCIO lib_LCIOF77 frtbegin g2c )
-        TARGET_LINK_LIBRARIES( f77_${bin} lib_LCIO lib_LCIOF77 )