 |
 |
| Commit in gdml2/CPPGDML on MAIN | |||
| CMakeLists.txt | +4 | -2 | 1.3 -> 1.4 |
| cmake/GDMLConfig.cmake.in | +8 | -2 | 1.1 -> 1.2 |
| /GDMLConfigVersion.cmake.in | +1 | -1 | 1.1 -> 1.2 |
| +13 | -5 | ||
fix ups mostly to config of find_package
diff -u -r1.3 -r1.4 --- CMakeLists.txt 10 Apr 2013 21:27:47 -0000 1.3 +++ CMakeLists.txt 10 Apr 2013 22:32:41 -0000 1.4 @@ -79,13 +79,15 @@
INCLUDE_DIRECTORIES( ${XERCES_INCLUDE_DIR} ${Geant4_INCLUDE_DIRS} )
# libraries
-LINK_LIBRARIES( ${XERCES_LIBRARIES} ${Geant4_LIBRARIES} )
+LINK_LIBRARIES( ${XERCES_LIBRARIES} ${Geant4_LIBRARIES} )
# output shared library
ADD_LIBRARY( gdml SHARED ${library_sources} )
# install library
-INSTALL( TARGETS gdml DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
+SET( GDML_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib )
+#INSTALL( TARGETS gdml DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
+INSTALL( TARGETS gdml DESTINATION ${GDML_LIB_INSTALL_DIR}/lib )
# generate package configuration GENERATE_PACKAGE_CONFIGURATION_FILES( GDMLConfig.cmake GDMLConfigVersion.cmake GDMLLibDeps.cmake )
\ No newline at end of file
diff -u -r1.1 -r1.2 --- GDMLConfig.cmake.in 10 Apr 2013 20:36:42 -0000 1.1 +++ GDMLConfig.cmake.in 10 Apr 2013 22:32:41 -0000 1.2 @@ -11,10 +11,16 @@
SET( GDML_DIR "@CMAKE_INSTALL_PREFIX@" ) SET( GDML_VERSION "@GDML_VERSION@" )
+INCLUDE( "@[log in to unmask]" ) +
SET(GDML_INCLUDE_DIRS "@library_source_dirs@" )
-SET(GDML_LIBRARIES gdml)
+SET(GDML_LIBRARY gdml)
+
+SET( GDML_LIBRARY_DIR "@GDML_LIB_INSTALL_DIR@" )
+
+INCLUDE( "${GDML_DIR}/lib/cmake/GDMLLibDeps.cmake" )
INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( GDML DEFAULT_MSG GDML_DIR GDML_INCLUDE_DIRS GDML_LIBRARIES ${GDML_COMPONENT_VARIABLES} )
\ No newline at end of file
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( GDML DEFAULT_MSG GDML_DIR GDML_INCLUDE_DIRS GDML_LIBRARY GDML_LIBRARY_DIR ${GDML_COMPONENT_VARIABLES} )
diff -u -r1.1 -r1.2 --- GDMLConfigVersion.cmake.in 10 Apr 2013 20:36:42 -0000 1.1 +++ GDMLConfigVersion.cmake.in 10 Apr 2013 22:32:41 -0000 1.2 @@ -6,6 +6,6 @@
SET( ${PACKAGE_FIND_NAME}_VERSION_MINOR @GDML_VERSION_MINOR@ )
SET( ${PACKAGE_FIND_NAME}_VERSION_PATCH @GDML_VERSION_PATCH@ )
-INCLUDE( "@[log in to unmask]" )
+INCLUDE( "@[log in to unmask]" )
CHECK_PACKAGE_VERSION( ${PACKAGE_FIND_NAME} @GDML_VERSION@ )
\ No newline at end of file
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1