Print

Print


Commit in projects/slic/branches/v00-00-01_SLIC-218-dev on MAIN
CMakeLists.txt+3-92894 -> 2895
add installation of bin

projects/slic/branches/v00-00-01_SLIC-218-dev
CMakeLists.txt 2894 -> 2895
--- projects/slic/branches/v00-00-01_SLIC-218-dev/CMakeLists.txt	2014-01-17 23:01:15 UTC (rev 2894)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/CMakeLists.txt	2014-01-17 23:05:51 UTC (rev 2895)
@@ -86,6 +86,7 @@
 # configure files
 CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/include/PackageInfo.hh.in ${PROJECT_SOURCE_DIR}/include/PackageInfo.hh)
 CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/include/Geant4VersionInfo.hh.in ${PROJECT_SOURCE_DIR}/include/Geant4VersionInfo.hh )
+CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/scripts/create_slic_tarball.sh.in ${PROJECT_SOURCE_DIR}/scripts/create_slic_tarball.sh )
 
 # additional compilation flags
 ADD_DEFINITIONS( ${Geant4_DEFINITIONS} )
@@ -124,7 +125,7 @@
 FILE( GLOB_RECURSE library_sources ${PROJECT_SOURCE_DIR}/src/*.cc )
 
 # executable
-ADD_EXECUTABLE( bin_slic ${library_sources} slic.cc )
+ADD_EXECUTABLE( slic ${library_sources} slic.cc )
 
 # configure and output documentation using doxygen
 OPTION( INSTALL_DOC "Set to OFF to skip build/install documentation" ON )
@@ -154,15 +155,8 @@
     MESSAGE( STATUS "INSTALL_DOC is set to OFF.  Documentation will not be created." )
 ENDIF()
 
-# create library
-ADD_SHARED_LIBRARY( slic ${library_sources} )
-INSTALL_SHARED_LIBRARY( slic DESTINATION lib )
-TARGET_LINK_LIBRARIES( slic ${CMAKE_DL_LIBS} )
-
 # install
-SET_TARGET_PROPERTIES( bin_slic PROPERTIES OUTPUT_NAME slic )
-TARGET_LINK_LIBRARIES( bin_slic slic )
-INSTALL( TARGETS bin_slic DESTINATION bin )
+INSTALL( TARGETS slic slic DESTINATION bin )
 
 #get_cmake_property(_variableNames VARIABLES)
 #foreach (_variableName ${_variableNames})
SVNspam 0.1


Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1