3 modified files
lcio
diff -u -r1.4 -r1.5
--- CMakeLists.txt 25 Apr 2007 12:28:30 -0000 1.4
+++ CMakeLists.txt 25 Apr 2007 12:53:32 -0000 1.5
@@ -16,6 +16,7 @@
PROJECT( LCIO )
# project options
+OPTION( BUILD_SHARED_LIBS "Set this 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 )
@@ -29,9 +30,9 @@
"${${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()
+#IF( NOT DEFINED BUILD_SHARED_LIBS )
+# SET( BUILD_SHARED_LIBS ON )
+#ENDIF()
# set default cmake build type to RelWithDebInfo
IF( NOT CMAKE_BUILD_TYPE )
lcio/sio
diff -u -r1.2 -r1.3
--- CMakeLists.txt 24 Apr 2007 15:10:03 -0000 1.2
+++ CMakeLists.txt 25 Apr 2007 12:53:32 -0000 1.3
@@ -56,6 +56,8 @@
# create *nix style library versions + symbolic links
VERSION ${${PROJECT_NAME}_VERSION}
SOVERSION ${${PROJECT_NAME}_SOVERSION}
+ # allow creating static and shared libs without conflicts
+ CLEAN_DIRECT_OUTPUT 1
# avoid conflicts between library and binary target names
OUTPUT_NAME sio
)
lcio/src/cpp
diff -u -r1.4 -r1.5
--- CMakeLists.txt 25 Apr 2007 12:28:30 -0000 1.4
+++ CMakeLists.txt 25 Apr 2007 12:53:32 -0000 1.5
@@ -134,6 +134,8 @@
# create *nix style library versions + symbolic links
VERSION ${${PROJECT_NAME}_VERSION}
SOVERSION ${${PROJECT_NAME}_SOVERSION}
+ # allow creating static and shared libs without conflicts
+ CLEAN_DIRECT_OUTPUT 1
# avoid conflicts between library and binary target names
OUTPUT_NAME lcioF77
)
@@ -151,6 +153,8 @@
# create *nix style library versions + symbolic links
VERSION ${${PROJECT_NAME}_VERSION}
SOVERSION ${${PROJECT_NAME}_SOVERSION}
+ # allow creating static and shared libs without conflicts
+ CLEAN_DIRECT_OUTPUT 1
# avoid conflicts between library and binary target names
OUTPUT_NAME lcio
)
CVSspam 0.2.8