Print

Print


Commit in lcio on MAIN
CMakeLists.txt+55-551.29 -> 1.30
replaced CMAKE_XXX_DIR with PROJECT_XXX_DIR

lcio
CMakeLists.txt 1.29 -> 1.30
diff -u -r1.29 -r1.30
--- CMakeLists.txt	12 Jul 2007 12:45:00 -0000	1.29
+++ CMakeLists.txt	12 Sep 2007 07:50:54 -0000	1.30
@@ -35,7 +35,7 @@
 
 # set default install prefix to project root directory
 IF( CMAKE_INSTALL_PREFIX STREQUAL "/usr/local" )
-    SET( CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}" )
+    SET( CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}" )
 ENDIF()
 
 # include FindJAVA.cmake for finding Java
@@ -52,14 +52,14 @@
 # generating header files with ant aid.generate
 SET( ENV{JDK_HOME} "${JAVA_HOME}" )
 SET( ENV{JAVA_HOME} "${JAVA_HOME}" )
-SET( ENV{LCIO} "${CMAKE_SOURCE_DIR}" )
-SET( ENV{PATH} "${CMAKE_SOURCE_DIR}/tools:${JAVA_BIN_PATH}:$ENV{PATH}" )
+SET( ENV{LCIO} "${PROJECT_SOURCE_DIR}" )
+SET( ENV{PATH} "${PROJECT_SOURCE_DIR}/tools:${JAVA_BIN_PATH}:$ENV{PATH}" )
 
 # generate header files with ant aid.generate
-IF( NOT EXISTS "${CMAKE_SOURCE_DIR}/src/cpp/include/EVENT/LCIO.h" )
+IF( NOT EXISTS "${PROJECT_SOURCE_DIR}/src/cpp/include/EVENT/LCIO.h" )
 
     MESSAGE( STATUS "Generating header files with ant aid.generate..." )
-    EXEC_PROGRAM( ant "${CMAKE_SOURCE_DIR}"
+    EXEC_PROGRAM( ant "${PROJECT_SOURCE_DIR}"
         ARGS aid.generate
         OUTPUT_VARIABLE out_tmp
         RETURN_VALUE out_ret )
@@ -93,62 +93,62 @@
         # generate shell script for setting environment
         # and calling ant aid
         MESSAGE( STATUS "Generating shell script for calling ant..." )
-        FILE( WRITE "${CMAKE_BINARY_DIR}/script.sh"
-            "export LCIO=${CMAKE_SOURCE_DIR}\n"
+        FILE( WRITE "${PROJECT_BINARY_DIR}/script.sh"
+            "export LCIO=${PROJECT_SOURCE_DIR}\n"
             "export JDK_HOME=${JAVA_HOME}\n"
             "export JAVA_HOME=${JAVA_HOME}\n"
-            "export PATH=${CMAKE_SOURCE_DIR}/tools:${JAVA_BIN_PATH}:$PATH\n"
+            "export PATH=${PROJECT_SOURCE_DIR}/tools:${JAVA_BIN_PATH}:$PATH\n"
             "ant $1" )
      
         # create "always out-of-date" headers target
         ADD_CUSTOM_TARGET( headers
-            COMMAND ${SH} "${CMAKE_BINARY_DIR}/script.sh" aid.generate
-            WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+            COMMAND ${SH} "${PROJECT_BINARY_DIR}/script.sh" aid.generate
+            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
             COMMENT "Generating header files with ant aid.generate..."
             VERBATIM )
         
         #ADD_CUSTOM_COMMAND(
-        #    OUTPUT "${CMAKE_BINARY_DIR}/src/cpp/include/EVENT/LCIO.h"
-        #    COMMAND ${SH} ARGS "${CMAKE_BINARY_DIR}/script.sh" aid.generate
-        #    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+        #    OUTPUT "${PROJECT_BINARY_DIR}/src/cpp/include/EVENT/LCIO.h"
+        #    COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/script.sh" aid.generate
+        #    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
         #    COMMENT "Generating header files with ant aid.generate..."
         #    VERBATIM )
         #
         #ADD_CUSTOM_TARGET( headers DEPENDS
-        #        "${CMAKE_BINARY_DIR}/src/cpp/include/EVENT/LCIO.h" )
+        #        "${PROJECT_BINARY_DIR}/src/cpp/include/EVENT/LCIO.h" )
 
         # LCIO - JAVA
         ADD_CUSTOM_COMMAND(
-            OUTPUT "${CMAKE_SOURCE_DIR}/lib/lcio.jar"
-            COMMAND ${SH} ARGS "${CMAKE_BINARY_DIR}/script.sh" aid
-            WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+            OUTPUT "${PROJECT_SOURCE_DIR}/lib/lcio.jar"
+            COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/script.sh" aid
+            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
             COMMENT "Building LCIO Java..."
             VERBATIM )
 
         # create java target
-        ADD_CUSTOM_TARGET( jar DEPENDS "${CMAKE_SOURCE_DIR}/lib/lcio.jar" )
+        ADD_CUSTOM_TARGET( jar DEPENDS "${PROJECT_SOURCE_DIR}/lib/lcio.jar" )
 
         # create custom target for cleaning class files
         ADD_CUSTOM_TARGET( jar_clean
-            COMMAND ${SH} "${CMAKE_BINARY_DIR}/script.sh" clean
-            WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+            COMMAND ${SH} "${PROJECT_BINARY_DIR}/script.sh" clean
+            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
             COMMENT "Cleaning java classes with ant clean..."
             VERBATIM )
 
         # tell make clean to also erase lcio.jar
         SET_DIRECTORY_PROPERTIES( PROPERTIES
-            ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_SOURCE_DIR}/lib/lcio.jar" )
+            ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_SOURCE_DIR}/lib/lcio.jar" )
 
         #JAVADOC
         IF( JAVA_DOC )
             ADD_CUSTOM_COMMAND(
-                OUTPUT "${CMAKE_SOURCE_DIR}/doc/api/index.html"
-                COMMAND ${SH} ARGS "${CMAKE_BINARY_DIR}/script.sh" doc
-                WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+                OUTPUT "${PROJECT_SOURCE_DIR}/doc/api/index.html"
+                COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/script.sh" doc
+                WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
                 COMMENT "Building Java API Documentation..."
                 VERBATIM )
             
-            ADD_CUSTOM_TARGET( doc_java DEPENDS "${CMAKE_SOURCE_DIR}/doc/api/index.html" )
+            ADD_CUSTOM_TARGET( doc_java DEPENDS "${PROJECT_SOURCE_DIR}/doc/api/index.html" )
             # tell doc target to call doc_java
             ADD_DEPENDENCIES( doc doc_java )
         ENDIF()
@@ -183,27 +183,27 @@
     
     # c++ documentation
     ADD_CUSTOM_COMMAND(
-        OUTPUT  "${CMAKE_SOURCE_DIR}/doc/doxygen_api/html"
+        OUTPUT  "${PROJECT_SOURCE_DIR}/doc/doxygen_api/html"
         COMMAND "${DOXYGEN_EXECUTABLE}"
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/doc/doxygen_api"
+        WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/doc/doxygen_api"
         COMMENT "Building C++ API Documentation..."
         VERBATIM )
     
     ADD_CUSTOM_TARGET( doc_cpp
-            DEPENDS "${CMAKE_SOURCE_DIR}/doc/doxygen_api/html" )
+            DEPENDS "${PROJECT_SOURCE_DIR}/doc/doxygen_api/html" )
 
     # user manual
     ADD_CUSTOM_COMMAND(
-        OUTPUT  "${CMAKE_BINARY_DIR}/manual"
+        OUTPUT  "${PROJECT_BINARY_DIR}/manual"
         # first we copy directory from source tree to binary tree to
         # keep the source tree unchanged
         COMMAND "${CMAKE_COMMAND}" -E copy_directory
-            "${CMAKE_SOURCE_DIR}/src/latex/manual"
-            "${CMAKE_BINARY_DIR}/manual"
+            "${PROJECT_SOURCE_DIR}/src/latex/manual"
+            "${PROJECT_BINARY_DIR}/manual"
         VERBATIM )
 
     ADD_CUSTOM_COMMAND(
-        OUTPUT  "${CMAKE_SOURCE_DIR}/doc/manual.pdf"
+        OUTPUT  "${PROJECT_SOURCE_DIR}/doc/manual.pdf"
         COMMAND "${LATEX_COMPILER}" ARGS -interaction=batchmode manual.tex
         COMMAND "${LATEX_COMPILER}" ARGS -interaction=batchmode manual.tex
         COMMAND "${DVIPS_CONVERTER}" ARGS -q -o manual.ps manual.dvi
@@ -212,37 +212,37 @@
             -mkdir -dir manual_html -verbosity 0 -info 0 -no_auto_link -split 0 -no_navigation manual.tex
         # copy files to doc directory
         COMMAND "${CMAKE_COMMAND}" -E copy "manual.pdf"
-            "${CMAKE_SOURCE_DIR}/doc"
+            "${PROJECT_SOURCE_DIR}/doc"
         COMMAND "${CMAKE_COMMAND}" -E copy "manual.ps"
-            "${CMAKE_SOURCE_DIR}/doc"
+            "${PROJECT_SOURCE_DIR}/doc"
         COMMAND "${CMAKE_COMMAND}" -E copy_directory "manual_html"
-            "${CMAKE_SOURCE_DIR}/doc/manual_html"
-        DEPENDS "${CMAKE_BINARY_DIR}/manual"
-        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/manual"
+            "${PROJECT_SOURCE_DIR}/doc/manual_html"
+        DEPENDS "${PROJECT_BINARY_DIR}/manual"
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/manual"
         COMMENT "Building Documentation - Users Manual..."
         VERBATIM )
 
     ADD_CUSTOM_TARGET( doc_manual
-            DEPENDS "${CMAKE_SOURCE_DIR}/doc/manual.pdf" )
+            DEPENDS "${PROJECT_SOURCE_DIR}/doc/manual.pdf" )
 
     # reference manual
     # FIXME this is not working correctly: latex returns error!
     #ADD_CUSTOM_COMMAND(
-    #    OUTPUT  "${CMAKE_SOURCE_DIR}/doc/doxygen_api/latex/refman.dvi"
+    #    OUTPUT  "${PROJECT_SOURCE_DIR}/doc/doxygen_api/latex/refman.dvi"
     #    COMMAND "${LATEX_COMPILER}" ARGS -interaction=batchmode refman.tex
     #    COMMAND "${LATEX_COMPILER}" ARGS -interaction=batchmode refman.tex
     #    COMMAND "${DVIPS_CONVERTER}" ARGS -q -o refman.ps refman.dvi
     #    # FIXME psnup should be detected
-    #    COMMAND "psnup" ARGS -q -2 refman.ps ${CMAKE_SOURCE_DIR}/doc/lciorefman.ps
+    #    COMMAND "psnup" ARGS -q -2 refman.ps ${PROJECT_SOURCE_DIR}/doc/lciorefman.ps
     #    COMMAND "${PDFLATEX_COMPILER}" ARGS -interaction=batchmode refman.tex
-    #    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/doc/doxygen_api/latex"
+    #    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/doc/doxygen_api/latex"
     #    COMMENT "Building Documentation - Reference Manual..."
     #    VERBATIM )
 
     #ADD_CUSTOM_TARGET( doc_refman
     #        DEPENDS
-    #            "${CMAKE_SOURCE_DIR}/doc/doxygen_api/html"
-    #            "${CMAKE_SOURCE_DIR}/doc/doxygen_api/latex/refman.dvi" )
+    #            "${PROJECT_SOURCE_DIR}/doc/doxygen_api/html"
+    #            "${PROJECT_SOURCE_DIR}/doc/doxygen_api/latex/refman.dvi" )
     
     #ADD_DEPENDENCIES( doc doc_cpp doc_manual doc_refman )
     ADD_DEPENDENCIES( doc doc_cpp doc_manual )
@@ -262,16 +262,16 @@
 # installation rules
 IF( INSTALL_JAR )
     # make sure jar is built before calling make install
-    INSTALL( CODE "EXEC_PROGRAM(${CMAKE_BUILD_TOOL} ${CMAKE_BINARY_DIR} ARGS jar)" )
+    INSTALL( CODE "EXEC_PROGRAM(${CMAKE_BUILD_TOOL} ${PROJECT_BINARY_DIR} ARGS jar)" )
     # install jar
-    INSTALL( FILES "${CMAKE_SOURCE_DIR}/lib/lcio.jar" DESTINATION lib )
+    INSTALL( FILES "${PROJECT_SOURCE_DIR}/lib/lcio.jar" DESTINATION lib )
 ENDIF()
 IF( INSTALL_DOC )
     # make sure documentation is built before make install is called
-    INSTALL( CODE "EXEC_PROGRAM(${CMAKE_BUILD_TOOL} ${CMAKE_BINARY_DIR} ARGS doc)" )
+    INSTALL( CODE "EXEC_PROGRAM(${CMAKE_BUILD_TOOL} ${PROJECT_BINARY_DIR} ARGS doc)" )
 
     # install documentation
-    INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/doc"
+    INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/doc"
             DESTINATION .
             PATTERN "*CVS*" EXCLUDE )
 ENDIF()
@@ -299,9 +299,9 @@
 MARK_AS_ADVANCED( CMAKE_INSTALL_RPATH_USE_LINK_PATH )
 
 # output directories
-SET( EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH
+SET( EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin" CACHE PATH
     "EXECUTABLE_OUTPUT_PATH" FORCE )
-SET( LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH
+SET( LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib" CACHE PATH
     "LIBRARY_OUTPUT_PATH" FORCE )
 MARK_AS_ADVANCED( EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH )
 
@@ -347,19 +347,19 @@
 ENDIF()
 
 # create uninstall configuration file 
-CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/cmake_uninstall.cmake.in"
-                "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
+CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+                "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake"
                 IMMEDIATE @ONLY )
 
 # create uninstall target
-ADD_CUSTOM_TARGET( uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" )
+ADD_CUSTOM_TARGET( uninstall "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" )
 
 # create configuration file from .in file
-CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
-                "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY )
+CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
+                "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY )
 
 # install configuration file
-INSTALL( FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+INSTALL( FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
         DESTINATION . )
 
 # display status message for important variables
CVSspam 0.2.8