4 modified files
lcio
diff -u -r1.45 -r1.46
--- CMakeLists.txt 18 Jul 2008 07:08:55 -0000 1.45
+++ CMakeLists.txt 14 Oct 2008 13:54:26 -0000 1.46
@@ -25,6 +25,7 @@
# project options
OPTION( BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON )
+OPTION( BUILD_32BIT_COMPATIBLE "Set to ON to build in 32 bit compatibility mode" ON )
OPTION( BUILD_LCIO_TESTS "Set to ON to build LCIO tests under src/cpp/src/TESTS" OFF )
OPTION( BUILD_LCIO_EXAMPLES "Set to ON to build LCIO examples under src/cpp/src/EXAMPLES" OFF )
OPTION( BUILD_F77_TESTJOBS "Set to ON to build LCIO F77 testjobs" OFF )
@@ -42,6 +43,33 @@
SET( CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}" )
ENDIF()
+#---------------- 32/64 bit issues ---------------------------------------
+#INCLUDE( CheckTypeSize )
+#CHECK_TYPE_SIZE( "void*" SIZE_OF_VOID_P )
+
+IF( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+ MESSAGE( STATUS "32 bit architecture detected" )
+ENDIF()
+
+IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+ MESSAGE( STATUS "64 bit architecture detected" )
+
+ IF( BUILD_32BIT_COMPATIBLE )
+ IF( COMMAND SET_PROPERTY )
+ SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS 0)
+ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" )
+ ELSE()
+ MESSAGE( FATAL_ERROR "to build in 32 bit compatibility mode you need cmake >= 2.6" )
+ ENDIF()
+ MESSAGE( STATUS "Build in 32 bit compatibility mode" )
+ ELSE()
+ MESSAGE( STATUS "Build in native 64 bit mode" )
+ ENDIF()
+ENDIF()
+
+#-------------------------------------------------------------------------
+
+
# include FindJAVA.cmake for finding Java
INCLUDE( ${PROJECT_SOURCE_DIR}/FindJAVA.cmake )
@@ -327,7 +355,6 @@
ADD_CUSTOM_TARGET( uninstall "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" )
# create configuration file from .in file
-LIST( APPEND LCIO_DEFINITIONS "-Wno-long-long" )
CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/LCIOConfig.cmake.in"
"${PROJECT_BINARY_DIR}/LCIOConfig.cmake" @ONLY )
@@ -340,6 +367,9 @@
MESSAGE( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" )
MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" )
+IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+ MESSAGE( STATUS "BUILD_32BIT_COMPATIBLE = ${BUILD_32BIT_COMPATIBLE}" )
+ENDIF()
MESSAGE( STATUS "BUILD_LCIO_TESTS = ${BUILD_LCIO_TESTS}" )
MESSAGE( STATUS "BUILD_LCIO_EXAMPLES = ${BUILD_LCIO_EXAMPLES}" )
MESSAGE( STATUS "BUILD_F77_TESTJOBS = ${BUILD_F77_TESTJOBS}" )
@@ -376,6 +406,8 @@
# export build settings
INCLUDE( CMakeExportBuildSettings )
CMAKE_EXPORT_BUILD_SETTINGS( "LCIOBuildSettings.cmake" )
+INSTALL( FILES "${PROJECT_BINARY_DIR}/LCIOBuildSettings.cmake" DESTINATION lib/cmake )
# export library dependencies (keep this as the last line in the file)
EXPORT_LIBRARY_DEPENDENCIES( "LCIOLibDeps.cmake" )
+INSTALL( FILES "${PROJECT_BINARY_DIR}/LCIOLibDeps.cmake" DESTINATION lib/cmake )
lcio
diff -u -r1.7 -r1.8
--- LCIOConfig.cmake.in 22 Jan 2008 08:56:11 -0000 1.7
+++ LCIOConfig.cmake.in 14 Oct 2008 13:54:26 -0000 1.8
@@ -1,43 +1,43 @@
###############################################
-# cmake configuration file for @PROJECT_NAME@
+# cmake configuration file for LCIO
# @author Jan Engels, DESY
###############################################
-SET( @PROJECT_NAME@_FOUND FALSE )
-MARK_AS_ADVANCED( @PROJECT_NAME@_FOUND )
+SET( LCIO_FOUND FALSE )
+MARK_AS_ADVANCED( LCIO_FOUND )
# do not store find results in cache
-SET( @PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@_INCLUDE_DIR-NOTFOUND )
+SET( LCIO_INCLUDE_DIR LCIO_INCLUDE_DIR-NOTFOUND )
-FIND_PATH( @PROJECT_NAME@_INCLUDE_DIR
+FIND_PATH( LCIO_INCLUDE_DIR
NAMES lcio.h
PATHS @CMAKE_INSTALL_PREFIX@
PATH_SUFFIXES src/cpp/include include
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 )
+IF( NOT LCIO_INCLUDE_DIR )
+ MESSAGE( STATUS "Check for LCIO: ${LCIO_HOME}"
+ " -- failed to find LCIO include directory!!" )
+ELSE( NOT LCIO_INCLUDE_DIR )
+ MARK_AS_ADVANCED( LCIO_INCLUDE_DIR )
+ENDIF( NOT LCIO_INCLUDE_DIR )
# do not store find results in cache
-SET( @PROJECT_NAME@_LIB @PROJECT_NAME@_LIB-NOTFOUND )
+SET( LCIO_LIB LCIO_LIB-NOTFOUND )
-FIND_LIBRARY( @PROJECT_NAME@_LIB
+FIND_LIBRARY( LCIO_LIB
NAMES lcio
PATHS @CMAKE_INSTALL_PREFIX@
PATH_SUFFIXES 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 )
+IF( NOT LCIO_LIB )
+ MESSAGE( STATUS "Check for LCIO: ${LCIO_HOME}"
+ " -- failed to find LCIO library!!" )
+ELSE( NOT LCIO_LIB )
+ MARK_AS_ADVANCED( LCIO_LIB )
+ENDIF( NOT LCIO_LIB )
# do not store find results in cache
SET( SIO_LIB SIO_LIB-NOTFOUND )
@@ -49,25 +49,26 @@
NO_DEFAULT_PATH
)
IF( NOT SIO_LIB )
- MESSAGE( STATUS "Check for @PROJECT_NAME@: ${@PROJECT_NAME@_HOME}"
+ MESSAGE( STATUS "Check for LCIO: ${LCIO_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@_FOUND TRUE )
- SET( @PROJECT_NAME@_INCLUDE_DIRS ${@PROJECT_NAME@_INCLUDE_DIR} )
- SET( @PROJECT_NAME@_LIBRARIES ${@PROJECT_NAME@_LIB} ${SIO_LIB} )
- SET( @PROJECT_NAME@_DEFINITIONS "@LCIO_DEFINITIONS@" )
- MARK_AS_ADVANCED( @PROJECT_NAME@_INCLUDE_DIRS @PROJECT_NAME@_LIBRARIES @PROJECT_NAME@_DEFINITIONS )
- 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}"
+IF( LCIO_INCLUDE_DIR AND LCIO_LIB AND SIO_LIB )
+ SET( LCIO_FOUND TRUE )
+ SET( LCIO_INCLUDE_DIRS ${LCIO_INCLUDE_DIR} )
+ SET( LCIO_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib" )
+ SET( LCIO_LIBRARIES ${LCIO_LIB} ${SIO_LIB} )
+ #SET( LCIO_DEFINITIONS "-Wno-long-long" )
+ MARK_AS_ADVANCED( LCIO_INCLUDE_DIRS LCIO_LIBRARY_DIRS LCIO_LIBRARIES )
+ MESSAGE( STATUS "Check for LCIO: ${LCIO_HOME} -- works" )
+ELSE( LCIO_INCLUDE_DIR AND LCIO_LIB AND SIO_LIB )
+ IF( LCIO_FIND_REQUIRED )
+ MESSAGE( FATAL_ERROR "Check for LCIO: ${LCIO_HOME} -- failed!!" )
+ ELSE( LCIO_FIND_REQUIRED )
+ MESSAGE( STATUS "Check for LCIO: ${LCIO_HOME}"
" -- failed!! will skip this package..." )
- ENDIF( @PROJECT_NAME@_FIND_REQUIRED )
-ENDIF( @PROJECT_NAME@_INCLUDE_DIR AND @PROJECT_NAME@_LIB AND SIO_LIB )
+ ENDIF( LCIO_FIND_REQUIRED )
+ENDIF( LCIO_INCLUDE_DIR AND LCIO_LIB AND SIO_LIB )
lcio/doc
diff -u -r1.8 -r1.9
--- howto_change_version 27 Apr 2007 14:19:52 -0000 1.8
+++ howto_change_version 14 Oct 2008 13:54:27 -0000 1.9
@@ -3,9 +3,9 @@
CMakeLists.txt
- SET( ${PROJECT_NAME}_MAJOR_VERSION 1 )
- SET( ${PROJECT_NAME}_MINOR_VERSION 8 )
- SET( ${PROJECT_NAME}_PATCH_LEVEL 2 )
+ SET( LCIO_MAJOR_VERSION 1 )
+ SET( LCIO_MINOR_VERSION 8 )
+ SET( LCIO_PATCH_LEVEL 2 )
sio/CMakeLists.txt
SET( SIO_MAJOR_VERSION 1 )
lcio/sio
diff -u -r1.15 -r1.16
--- CMakeLists.txt 18 Jul 2008 07:08:55 -0000 1.15
+++ CMakeLists.txt 14 Oct 2008 13:54:27 -0000 1.16
@@ -26,11 +26,11 @@
TEST_BIG_ENDIAN( BIG_ENDIAN )
IF( NOT BIG_ENDIAN )
- ADD_DEFINITIONS( -D__LITTLE_ENDIAN__ )
+ ADD_DEFINITIONS( "-D__LITTLE_ENDIAN__" )
ENDIF()
IF( BUILD_WITH_DCAP )
- ADD_DEFINITIONS( -DSIO_USE_DCAP )
+ ADD_DEFINITIONS( "-DSIO_USE_DCAP" )
ENDIF()
INCLUDE_DIRECTORIES(
@@ -49,9 +49,9 @@
)
#------ require proper C++ -------
-ADD_DEFINITIONS( -Wall -ansi -pedantic )
+ADD_DEFINITIONS( "-Wall -ansi -pedantic" )
#----- need long long for int64 for now ------
-ADD_DEFINITIONS( -Wno-long-long -Wno-sign-compare )
+ADD_DEFINITIONS( "-Wno-long-long -Wno-sign-compare" )
ADD_LIBRARY( lib_SIO ${SIO_SRCS} )
@@ -72,3 +72,4 @@
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE )
+
CVSspam 0.2.8
