3 modified files
lcio
diff -u -r1.34 -r1.35
--- CMakeLists.txt 18 Oct 2007 09:45:15 -0000 1.34
+++ CMakeLists.txt 5 Nov 2007 17:12:19 -0000 1.35
@@ -336,6 +336,8 @@
INCLUDE_DIRECTORIES( ${CLHEP_INCLUDE_DIR} )
LINK_LIBRARIES( ${CLHEP_LIBRARIES} )
ADD_DEFINITIONS( ${CLHEP_DEFINITIONS} )
+ SEPARATE_ARGUMENTS( CLHEP_DEFINITIONS )
+ LIST( APPEND ${PROJECT_NAME}_DEFINITIONS ${CLHEP_DEFINITIONS} )
ENDIF()
SET( BUILD_WITH "${BUILD_WITH}" CACHE STRING
@@ -358,6 +360,7 @@
ADD_CUSTOM_TARGET( uninstall "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" )
# create configuration file from .in file
+LIST( APPEND ${PROJECT_NAME}_DEFINITIONS "-Wno-long-long" )
CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY )
lcio
diff -u -r1.4 -r1.5
--- LCIOConfig.cmake.in 24 Apr 2007 16:36:14 -0000 1.4
+++ LCIOConfig.cmake.in 5 Nov 2007 17:12:19 -0000 1.5
@@ -55,9 +55,7 @@
# 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} )
- # need long long for int64 for now
- # FIXME: should establish wether we are on a 32bit or 64 bit machine ...
- SET( @PROJECT_NAME@_DEFINITIONS "-Wno-long-long" )
+ SET( @PROJECT_NAME@_DEFINITIONS "@LCIO_DEFINITIONS@" )
MARK_AS_ADVANCED( @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 )
lcio/src/cpp
diff -u -r1.11 -r1.12
--- CMakeLists.txt 16 Oct 2007 15:40:02 -0000 1.11
+++ CMakeLists.txt 5 Nov 2007 17:12:19 -0000 1.12
@@ -115,7 +115,7 @@
)
#------ require proper C++ -------
-ADD_DEFINITIONS( -Wall -ansi -pedantic )
+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 )
CVSspam 0.2.8
