2 added + 5 modified, total 7 files
lcio
diff -N cmake_uninstall.cmake.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ cmake_uninstall.cmake.in 24 Apr 2007 15:10:02 -0000 1.1
@@ -0,0 +1,27 @@
+##########################################
+# create an uninstall target for cmake
+# http://www.cmake.org/Wiki/CMake_FAQ
+##########################################
+
+IF(NOT EXISTS "@[log in to unmask]")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@[log in to unmask]\"")
+ENDIF(NOT EXISTS "@[log in to unmask]")
+
+FILE(READ "@[log in to unmask]" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF("${rm_retval}" STREQUAL 0)
+ ELSE("${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ ENDIF("${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
lcio
diff -u -r1.1 -r1.2
--- CMakeLists.txt 21 Mar 2007 14:15:01 -0000 1.1
+++ CMakeLists.txt 24 Apr 2007 15:10:02 -0000 1.2
@@ -1,61 +1,108 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-PROJECT(LCIO)
+#################################
+# cmake file for building LCIO
+# @author Frank Gaede, DESY
+# @author Jan Engels, DESY
+#################################
+
+# cmake minimum required version
+CMAKE_MINIMUM_REQUIRED( VERSION 2.4 )
+SET( CMAKE_BACKWARDS_COMPATIBILITY 2.2 )
+MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
+
+# allow more human readable "if then else" constructs
+SET( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
+
+# project name
+PROJECT( LCIO )
+
+# project version
+SET( ${PROJECT_NAME}_MAJOR_VERSION 1 )
+SET( ${PROJECT_NAME}_MINOR_VERSION 9 )
+SET( ${PROJECT_NAME}_PATCH_LEVEL 0 )
+SET( ${PROJECT_NAME}_VERSION
+ "${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL}" )
+SET( ${PROJECT_NAME}_SOVERSION
+ "${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}" )
+
+# build shared libraries per default
+IF( NOT DEFINED BUILD_SHARED_LIBS )
+ SET( BUILD_SHARED_LIBS ON )
+ENDIF()
+
+# set default cmake build type to RelWithDebInfo
+IF( NOT CMAKE_BUILD_TYPE )
+ SET( CMAKE_BUILD_TYPE "RelWithDebInfo" )
+ENDIF()
+
+# set default install prefix to project root directory
+IF( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
+ SET( CMAKE_INSTALL_PREFIX "${${PROJECT_NAME}_SOURCE_DIR}" )
+ENDIF()
+
+# add library install path to the rpath list
+SET( CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" )
+MARK_AS_ADVANCED( CMAKE_INSTALL_RPATH )
+
+# append link pathes to rpath list
+SET( CMAKE_INSTALL_RPATH_USE_LINK_PATH 1 )
+MARK_AS_ADVANCED( CMAKE_INSTALL_RPATH_USE_LINK_PATH )
+
+# output directories
+SET( EXECUTABLE_OUTPUT_PATH "${${PROJECT_NAME}_BINARY_DIR}/bin" CACHE PATH
+ "EXECUTABLE_OUTPUT_PATH" FORCE )
+SET( LIBRARY_OUTPUT_PATH "${${PROJECT_NAME}_BINARY_DIR}/lib" CACHE PATH
+ "LIBRARY_OUTPUT_PATH" FORCE )
+MARK_AS_ADVANCED( EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH )
+
+# input directories
+ADD_SUBDIRECTORY( sio sio )
+ADD_SUBDIRECTORY( src/cpp lcio )
+ADD_SUBDIRECTORY( src/f77 f77 EXCLUDE_FROM_ALL )
+
+# create uninstall configuration file
+CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY )
+
+# create uninstall target
+ADD_CUSTOM_TARGET( uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" )
+
+# create configuration file from .in file
+CONFIGURE_FILE( "${${PROJECT_NAME}_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
+ "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY )
+
+# install configuration file
+INSTALL( FILES "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+ DESTINATION . )
+
+# display status message for important variables
+MESSAGE( STATUS )
+MESSAGE( STATUS "-------------------------------------------------------------------------------" )
+MESSAGE( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" )
+MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
+MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" )
+MESSAGE( STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}" )
+MESSAGE( STATUS "BUILD_LCIO_TESTJOBS = ${BUILD_LCIO_TESTJOBS}" )
+MESSAGE( STATUS "BUILD_F77_TESTJOBS = ${BUILD_F77_TESTJOBS}" )
+MESSAGE( STATUS "Change a value with: cmake -D<Variable>=<Value>" )
+MESSAGE( STATUS "-------------------------------------------------------------------------------" )
+MESSAGE( STATUS )
+
+# force some variables that could be defined in the command line
+# to be written to cache
+SET( BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}" CACHE BOOL
+ "Build shared libraries flag" FORCE )
+SET( CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH
+ "Where to install ${PROJECT_NAME}" FORCE )
+SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
+ "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE )
+SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" CACHE PATH
+ "Path to custom CMake Modules" FORCE )
+SET( BUILD_LCIO_TESTJOBS "${BUILD_LCIO_TESTJOBS}" CACHE BOOL
+ "Set to ON to build LCIO testbobs" FORCE )
+SET( BUILD_F77_TESTJOBS "${BUILD_F77_TESTJOBS}" CACHE BOOL
+ "Set to ON to build LCIO F77 testbobs" FORCE )
-SET(LCIO_MAJOR_VERSION 1)
-SET(LCIO_MINOR_VERSION 8)
-SET(LCIO_PATCH_LEVEL 1)
-
-SET(LCIO_VERSION "v01-08-01")
-
-IF(NOT CMAKE_BUILD_TYPE)
- SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
- "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
- FORCE)
-ENDIF(NOT CMAKE_BUILD_TYPE)
-
-#------ require proper C++ -------
-ADD_DEFINITIONS(-Wall -ansi -pedantic)
-#----- need long long for int64 for now ------
-#FIXME: should establish wether we are on a 32bit or 64 bit machine ....
-ADD_DEFINITIONS( -Wno-long-long )
-
-
-#----- if no install prefix set install in source directory -----
-IF( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
- SET( CMAKE_INSTALL_PREFIX ${LCIO_SOURCE_DIR} )
-ENDIF( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
-
-#---- add own find modules to global module search path -------
-SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LCIO_SOURCE_DIR}/CMake )
-
-#------ optionally we can build with CLHEP -------
-SET(CLHEP_DIR "" CACHE PATH "if specified LCIO is build with CLHEP" )
-IF( CLHEP_DIR )
- FIND_PACKAGE("CLHEP" REQUIRED )
- ADD_DEFINITIONS(-DUSE_CLHEP)
- INCLUDE_DIRECTORIES ( ${CLHEP_INCLUDE_DIRS} )
-ENDIF( CLHEP_DIR )
-
-#------------------------------------------------
-
-
-ADD_SUBDIRECTORY(sio sio)
-ADD_SUBDIRECTORY(src/cpp lcio)
-
-
-# --- get all dependencies of sio (actually zlib only)
-FOREACH( dep ${sio_LIB_DEPENDS} )
- set( siodeps ${siodeps} ${dep} )
-ENDFOREACH( dep ${sio_LIB_DEPENDS} )
-
-#----- siodeps is used in LCIOConfig.cmake.in :
-CONFIGURE_FILE(${LCIO_SOURCE_DIR}/LCIOConfig.cmake.in
- ${LCIO_BINARY_DIR}/LCIOConfig.cmake @ONLY )
-
-#----- install configure file for dependend packages
-INSTALL(FILES ${LCIO_BINARY_DIR}/LCIOConfig.cmake DESTINATION .)
-
-
-#EXPORT_LIBRARY_DEPENDENCIES( lciodep.cmake)
-
-
+# export library dependencies (keep this as the last line in the file)
+EXPORT_LIBRARY_DEPENDENCIES( "${PROJECT_NAME}LibDeps.cmake" )
lcio
diff -u -r1.1 -r1.2
--- LCIOConfig.cmake.in 21 Mar 2007 14:53:33 -0000 1.1
+++ LCIOConfig.cmake.in 24 Apr 2007 15:10:02 -0000 1.2
@@ -1,40 +1,67 @@
-
-
-FIND_PATH(LCIO_INCLUDE NAMES lcio.h
- PATHS @CMAKE_INSTALL_PREFIX@/include
- NO_DEFAULT_PATH
+###############################################
+# cmake configuration file for @PROJECT_NAME@
+# @author Jan Engels, DESY
+###############################################
+
+# do not store find results in cache
+SET( @PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@_INCLUDE_DIR-NOTFOUND )
+
+FIND_PATH( @PROJECT_NAME@_INCLUDE_DIR
+ NAMES lcio.h
+ PATHS @CMAKE_INSTALL_PREFIX@
+ PATH_SUFFIXES src/cpp/include
+ NO_DEFAULT_PATH
)
-
-FIND_LIBRARY(LCIO_LIB NAMES lcio
- PATHS @CMAKE_INSTALL_PREFIX@/lib
- NO_DEFAULT_PATH
+IF( NOT @PROJECT_NAME@_INCLUDE_DIR )
+ MESSAGE( STATUS "Check for @PROJECT_NAME@: ${@PROJECT_NAME@_HOME}"
+ " -- failed to find @PROJECT_NAME@ include directory!!" )
+ELSE( NOT @PROJECT_NAME@_INCLUDE_DIR )
+ MARK_AS_ADVANCED( @PROJECT_NAME@_INCLUDE_DIR )
+ENDIF( NOT @PROJECT_NAME@_INCLUDE_DIR )
+
+
+# do not store find results in cache
+SET( @PROJECT_NAME@_LIB @PROJECT_NAME@_LIB-NOTFOUND )
+
+FIND_LIBRARY( @PROJECT_NAME@_LIB
+ NAMES lcio
+ PATHS @CMAKE_INSTALL_PREFIX@
+ PATH_SUFFIXES lib
+ NO_DEFAULT_PATH
)
-FIND_LIBRARY(SIO_LIB NAMES sio
- PATHS @CMAKE_INSTALL_PREFIX@/lib
- NO_DEFAULT_PATH
+IF( NOT @PROJECT_NAME@_LIB )
+ MESSAGE( STATUS "Check for @PROJECT_NAME@: ${@PROJECT_NAME@_HOME}"
+ " -- failed to find @PROJECT_NAME@ library!!" )
+ELSE( NOT @PROJECT_NAME@_LIB )
+ MARK_AS_ADVANCED( @PROJECT_NAME@_LIB )
+ENDIF( NOT @PROJECT_NAME@_LIB )
+
+# do not store find results in cache
+SET( SIO_LIB SIO_LIB-NOTFOUND )
+
+FIND_LIBRARY( SIO_LIB
+ NAMES sio
+ PATHS @CMAKE_INSTALL_PREFIX@
+ PATH_SUFFIXES lib
+ NO_DEFAULT_PATH
)
-
-SET(LCIO_INCLUDE_DIRS ${LCIO_INCLUDE} )
-SET(LCIO_LIBRARIES ${LCIO_LIB} ${SIO_LIB} @siodeps@)
-
-SET(LCIO_FOUND False)
-
-IF(LCIO_INCLUDE)
- IF(LCIO_LIB)
- IF(SIO_LIB)
- SET(LCIO_FOUND True)
- ENDIF(SIO_LIB)
- ENDIF(LCIO_LIB)
-ENDIF(LCIO_INCLUDE)
-
-IF (NOT LCIO_FOUND)
- MESSAGE(STATUS "LCIO not found.")
- IF (LCIO_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "LCIO is required ! "
- "Set path to LCIO with '-D LCIO_DIR=lcio_path")
- ENDIF (LCIO_FIND_REQUIRED)
-ENDIF(NOT LCIO_FOUND)
-
-
-
-
\ No newline at end of file
+IF( NOT SIO_LIB )
+ MESSAGE( STATUS "Check for @PROJECT_NAME@: ${@PROJECT_NAME@_HOME}"
+ " -- failed to find SIO library!!" )
+ELSE( NOT SIO_LIB )
+ MARK_AS_ADVANCED( SIO_LIB )
+ENDIF( NOT SIO_LIB )
+
+# set variables and display results
+IF( @PROJECT_NAME@_INCLUDE_DIR AND @PROJECT_NAME@_LIB AND SIO_LIB )
+ SET( @PROJECT_NAME@_LIBRARIES ${@PROJECT_NAME@_LIB} ${SIO_LIB} )
+ MARK_AS_ADVANCED( @PROJECT_NAME@_LIBRARIES )
+ MESSAGE( STATUS "Check for @PROJECT_NAME@: ${@PROJECT_NAME@_HOME} -- works" )
+ELSE( @PROJECT_NAME@_INCLUDE_DIR AND @PROJECT_NAME@_LIB AND SIO_LIB )
+ IF( @PROJECT_NAME@_FIND_REQUIRED )
+ MESSAGE( FATAL_ERROR "Check for @PROJECT_NAME@: ${@PROJECT_NAME@_HOME} -- failed!!" )
+ ELSE( @PROJECT_NAME@_FIND_REQUIRED )
+ MESSAGE( STATUS "Check for @PROJECT_NAME@: ${@PROJECT_NAME@_HOME}"
+ " -- failed!! will skip this package..." )
+ ENDIF( @PROJECT_NAME@_FIND_REQUIRED )
+ENDIF( @PROJECT_NAME@_INCLUDE_DIR AND @PROJECT_NAME@_LIB AND SIO_LIB )
lcio/sio
diff -u -r1.1 -r1.2
--- CMakeLists.txt 21 Mar 2007 14:15:01 -0000 1.1
+++ CMakeLists.txt 24 Apr 2007 15:10:03 -0000 1.2
@@ -1,23 +1,31 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-PROJECT(SIO)
-
-SET(SIO_MAJOR_VERSION 1)
-SET(SIO_MINOR_VERSION 8)
-SET(SIO_PATCH_LEVEL 1)
-
-SET(SIO_VERSION "v01-08-01")
-
+#################################
+# cmake file for building SIO
+# @author Frank Gaede, DESY
+# @author Jan Engels, DESY
+#################################
+
+# project name
+PROJECT( SIO )
+
+# project version
+SET( SIO_MAJOR_VERSION 1 )
+SET( SIO_MINOR_VERSION 9 )
+SET( SIO_PATCH_LEVEL 0 )
+SET( ${PROJECT_NAME}_VERSION
+ "${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL}" )
+SET( ${PROJECT_NAME}_SOVERSION
+ "${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}" )
#INCLUDE(FindZLIB)
-FIND_PACKAGE(ZLIB REQUIRED)
+FIND_PACKAGE( ZLIB REQUIRED )
#ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
#ZLIB_LIBRARIES - List of libraries when using zlib.
#ZLIB_FOUND - True if zlib found.
#MESSAGE(STATUS "ZLIB_LIBRARIES: " ${ZLIB_LIBRARIES})
-INCLUDE(TestBigEndian)
-TEST_BIG_ENDIAN(BIG_ENDIAN)
+INCLUDE( TestBigEndian )
+TEST_BIG_ENDIAN( BIG_ENDIAN )
INCLUDE_DIRECTORIES(
${SIO_SOURCE_DIR}/include
@@ -33,18 +41,29 @@
${SIO_SOURCE_DIR}/src/SIO_stream.cc
${SIO_SOURCE_DIR}/src/SIO_streamManager.cc
)
-ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 -Wno-sign-compare )
-#IF(NOT CMAKE_BUILD_TYPE)
-# SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-# "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
-# FORCE)
-#ENDIF(NOT CMAKE_BUILD_TYPE)
-
-ADD_LIBRARY(sio ${SIO_SRCS})
-TARGET_LINK_LIBRARIES(sio ${ZLIB_LIBRARIES})
-
-#---- export zlib for the LCIOConfig.cmake -----
-SET( ZLIB ${ZLIB_LIBRARIES} )
-INSTALL(TARGETS sio DESTINATION lib)
+#------ require proper C++ -------
+ADD_DEFINITIONS( "-Wall -ansi -pedantic" )
+#----- need long long for int64 for now ------
+#FIXME: should establish wether we are on a 32bit or 64 bit machine ....
+ADD_DEFINITIONS( "-Wno-long-long" )
+
+ADD_DEFINITIONS( "-D_FILE_OFFSET_BITS=64 -Wno-sign-compare" )
+
+ADD_LIBRARY( lib_${PROJECT_NAME} ${SIO_SRCS} )
+
+SET_TARGET_PROPERTIES( lib_${PROJECT_NAME} PROPERTIES
+ # create *nix style library versions + symbolic links
+ VERSION ${${PROJECT_NAME}_VERSION}
+ SOVERSION ${${PROJECT_NAME}_SOVERSION}
+ # avoid conflicts between library and binary target names
+ OUTPUT_NAME sio
+)
+
+TARGET_LINK_LIBRARIES( lib_${PROJECT_NAME} ${ZLIB_LIBRARIES} )
+# install library
+INSTALL( TARGETS lib_${PROJECT_NAME} DESTINATION lib PERMISSIONS
+ OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE )
lcio/src/cpp
diff -u -r1.1 -r1.2
--- CMakeLists.txt 21 Mar 2007 14:15:01 -0000 1.1
+++ CMakeLists.txt 24 Apr 2007 15:10:03 -0000 1.2
@@ -1,3 +1,8 @@
+#################################
+# cmake file for building LCIO
+# @author Frank Gaede, DESY
+# @author Jan Engels, DESY
+#################################
INCLUDE_DIRECTORIES (
${LCIO_SOURCE_DIR}/sio/include
@@ -56,10 +61,12 @@
./src/IMPL/TrackerPulseImpl.cc
./src/IMPL/TrackerRawDataImpl.cc
./src/IMPL/VertexImpl.cc
- )
+)
+
SET( LCIO_IOIMPL_SRCS
./src/IOIMPL/LCFactory.cc
)
+
SET( LCIO_SIO_SRCS
./src/SIO/LCSIO.cc
./src/SIO/SIOCalHitHandler.cc
@@ -90,7 +97,7 @@
./src/SIO/SIOVertexHandler.cc
./src/SIO/SIOWriter.cc
./src/SIO/SIOReader.cc
- )
+)
SET( LCIO_UTIL_SRCS
./src/UTIL/BitField64.cc
@@ -105,31 +112,64 @@
./src/UTIL/lXDR.cc
./src/UTIL/LCTOOLS.cc
./src/UTIL/CellIDEncoder.cc
- )
+)
+
+#------ require proper C++ -------
+ADD_DEFINITIONS( -Wall -ansi -pedantic )
+#----- need long long for int64 for now ------
+#FIXME: should establish wether we are on a 32bit or 64 bit machine ....
+ADD_DEFINITIONS( -Wno-long-long )
#---- special flags for cfortran code : --------
SET_SOURCE_FILES_PROPERTIES(
${LCIO_CPPFORT_SRCS} PROPERTIES
COMPILE_FLAGS "-Df2cFortran -Wno-unused"
- )
+)
-ADD_LIBRARY(lcio
- ${LCIO_IMPL_SRCS}
- ${LCIO_IOIMPL_SRCS}
+ADD_LIBRARY( lib_${PROJECT_NAME}F77
${LCIO_CPPFORT_SRCS}
- ${LCIO_UTIL_SRCS}
- ${LCIO_SIO_SRCS}
- )
+)
-TARGET_LINK_LIBRARIES(lcio sio)
+SET_TARGET_PROPERTIES( lib_${PROJECT_NAME}F77 PROPERTIES
+ # create *nix style library versions + symbolic links
+ VERSION ${${PROJECT_NAME}_VERSION}
+ SOVERSION ${${PROJECT_NAME}_SOVERSION}
+ # avoid conflicts between library and binary target names
+ OUTPUT_NAME lcioF77
+)
+
+ADD_CUSTOM_TARGET( lib DEPENDS lib_${PROJECT_NAME} lib_${PROJECT_NAME}F77 lib_SIO )
+
+ADD_LIBRARY( lib_${PROJECT_NAME}
+ ${LCIO_IMPL_SRCS}
+ ${LCIO_IOIMPL_SRCS}
+ ${LCIO_UTIL_SRCS}
+ ${LCIO_SIO_SRCS}
+)
+
+SET_TARGET_PROPERTIES( lib_${PROJECT_NAME} PROPERTIES
+ # create *nix style library versions + symbolic links
+ VERSION ${${PROJECT_NAME}_VERSION}
+ SOVERSION ${${PROJECT_NAME}_SOVERSION}
+ # avoid conflicts between library and binary target names
+ OUTPUT_NAME lcio
+)
+
+TARGET_LINK_LIBRARIES( lib_LCIO lib_SIO )
+TARGET_LINK_LIBRARIES( lib_LCIOF77 lib_LCIO )
+
+# create symbolic bin target for calling targets bin_XXX
+ADD_CUSTOM_TARGET( bin )
# ==== a macro for adding binaries from the EXAMPLE directory =====
-MACRO(ADD_LCIO_BIN file)
- ADD_EXECUTABLE( ${file} ./src/EXAMPLE/${file}.cc)
+MACRO( ADD_LCIO_BIN file )
+ ADD_EXECUTABLE( bin_${file} ./src/EXAMPLE/${file}.cc )
+ ADD_DEPENDENCIES( bin bin_${file} )
# MESSAGE( STATUS " in ADD_LCIO_BIN : " ${file} " " ./src/EXAMPLE/${file}.cc )
- TARGET_LINK_LIBRARIES(${file} lcio )
- INSTALL(TARGETS ${file} DESTINATION bin)
-ENDMACRO(ADD_LCIO_BIN)
+ SET_TARGET_PROPERTIES( bin_${file} PROPERTIES OUTPUT_NAME ${file} )
+ TARGET_LINK_LIBRARIES( bin_${file} lib_${PROJECT_NAME} )
+ INSTALL( TARGETS bin_${file} DESTINATION bin )
+ENDMACRO()
#===================================================================
ADD_LCIO_BIN( simjob )
@@ -138,19 +178,27 @@
ADD_LCIO_BIN( dumpevent )
ADD_LCIO_BIN( copyfix )
-OPTION(BUILD_LCIO_TESTJOBS FALSE)
+OPTION( BUILD_LCIO_TESTJOBS OFF )
-IF( BUILD_LCIO_TESTJOBS)
+IF( BUILD_LCIO_TESTJOBS )
ADD_LCIO_BIN( readcalibration )
ADD_LCIO_BIN( stdhepjob )
ADD_LCIO_BIN( testvtx )
ADD_LCIO_BIN( lcrtrelation )
-ENDIF( BUILD_LCIO_TESTJOBS)
+ENDIF()
#------------- install the library and the (public) header files -------
-INSTALL(TARGETS lcio DESTINATION lib)
+INSTALL( TARGETS lib_${PROJECT_NAME} DESTINATION lib PERMISSIONS
+ OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE )
+
+INSTALL( TARGETS lib_${PROJECT_NAME}F77 DESTINATION lib PERMISSIONS
+ OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE )
INSTALL(DIRECTORY ${LCIO_SOURCE_DIR}/src/cpp/include/ DESTINATION include
PATTERN "*~" EXCLUDE
@@ -159,4 +207,3 @@
PATTERN "*CPPFORT*" EXCLUDE
PATTERN "*CVS*" EXCLUDE)
-
lcio/src/cpp/src/CPPFORT
diff -u -r1.1 -r1.2
--- lcrdrrep.icc 25 Jun 2004 16:36:14 -0000 1.1
+++ lcrdrrep.icc 24 Apr 2007 15:10:03 -0000 1.2
@@ -1,9 +1,13 @@
extern "C"{
- void processevent_( PTRTYPE* ) ;
- void modifyevent_( PTRTYPE* ) ;
- void processrunheader_( PTRTYPE* ) ;
- void modifyrunheader_( PTRTYPE* ) ;
+// void processevent_( PTRTYPE* ) ;
+// void modifyevent_( PTRTYPE* ) ;
+// void processrunheader_( PTRTYPE* ) ;
+// void modifyrunheader_( PTRTYPE* ) ;
+ void processevent_( PTRTYPE* ) {}
+ void modifyevent_( PTRTYPE* ) {}
+ void processrunheader_( PTRTYPE* ) {}
+ void modifyrunheader_( PTRTYPE* ) {}
}
lcio/src/f77
diff -N CMakeLists.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ CMakeLists.txt 24 Apr 2007 15:10:03 -0000 1.1
@@ -0,0 +1,45 @@
+#####################################
+# cmake file for building f77 bins
+# @author Jan Engels, DESY
+#####################################
+
+# force cmake to use g77 fortran compiler
+SET( CMAKE_Fortran_COMPILER_INIT g77 )
+
+# project name
+PROJECT( LCIOF77 Fortran )
+
+# set this to on to build f77 testjobs
+OPTION( BUILD_F77_TESTJOBS OFF )
+
+# fortran testjobs
+SET( f77_bins
+ anajob
+ recjob
+ simjob
+ simjob_chain
+)
+
+IF( BUILD_F77_TESTJOBS )
+
+ # 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 )
+
+ # install binary commando
+ INSTALL( TARGETS f77_${bin} DESTINATION bin )
+ ENDFOREACH()
+ENDIF()
CVSspam 0.2.8