Merge pull request #13 from slaclab/iss12

update GDML cmake config

CMakeLists.txt

@@ -76,7 +76,7 @@ SET( SLIC_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include )
 INCLUDE_DIRECTORIES( ${SLIC_INCLUDE_DIR} )
 
 # include directories
-INCLUDE_DIRECTORIES( ${XERCES_INCLUDE_DIR} ${LCIO_INCLUDE_DIRS} ${Geant4_INCLUDE_DIRS} ${GDML_INCLUDE_DIRS} ${LCDD_INCLUDE_DIR} ${HEPPDT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${XERCES_INCLUDE_DIR} ${LCIO_INCLUDE_DIRS} ${Geant4_INCLUDE_DIRS} ${GDML_INCLUDE_DIR} ${LCDD_INCLUDE_DIR} ${HEPPDT_INCLUDE_DIR} )
 
 # add GDML link directory
 LINK_DIRECTORIES( ${GDML_LIBRARY_DIR} )

cmake/FindGDML.cmake

-FIND_PATH( GDML_DIR G4Binding/G4Processor/G4Processor/GDMLProcessor.h )
+FIND_PATH( GDML_DIR include/G4Processor/GDMLProcessor.h )
 
 FIND_LIBRARY( GDML_LIBRARY gdml ${GDML_DIR}/lib/ )
 
-LIST( APPEND GDML_INCLUDE_DIRS 
-  ${GDML_DIR}/Common/Processes
-  ${GDML_DIR}/Common/Saxana  
-  ${GDML_DIR}/Common/Schema  
-  ${GDML_DIR}/Common/Writer
-  ${GDML_DIR}/G4Binding/G4Evaluator
-  ${GDML_DIR}/G4Binding/G4Processor
-  ${GDML_DIR}/G4Binding/G4Subscribers
-  ${GDML_DIR}/G4Binding/G4Writer
-  ${GDML_DIR}/STEPBinding/STEPWriter
-)
+SET( GDML_LIBRARY ${GDML_LIBRARY} )
+
+SET( GDML_INCLUDE_DIR ${GDML_DIR}/include )
 
 INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( GDML DEFAULT_MSG GDML_DIR )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( GDML DEFAULT_MSG GDML_LIBRARY GDML_DIR )