Fix building wrappers on Linux systems

ianna · Nov 28, 2023 · 1b90ace · 1b90ace
1 parent 2548ec9
commit 1b90ace
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/gen/CMakeLists.txt b/gen/CMakeLists.txt
@@ -24,7 +24,7 @@ if(WRAPIT_EXECUTABLE)
   configure_file(${SOURCE_DIR}/Geant4.wit.in ${SOURCE_DIR}/Geant4.wit @ONLY)
   add_custom_command(OUTPUT ${SOURCE_DIR}/cpp/jlGeant4.cxx
     COMMAND mkdir -p ${SOURCE_DIR}/jl
-    COMMAND ${WRAPIT_EXECUTABLE} --force -v 5 ${SOURCE_DIR}/Geant4.wit
+    COMMAND ${WRAPIT_EXECUTABLE} --force -v 1 ${SOURCE_DIR}/Geant4.wit
     WORKING_DIRECTORY ${SOURCE_DIR}
     DEPENDS ${SOURCE_DIR}/Geant4.wit ${SOURCE_DIR}/Geant4-veto.h  ${SOURCE_DIR}/cpp/Geant4Wrap.h)
 else()
@@ -35,6 +35,7 @@ file(GLOB GEN_SOURCES CONFIGURE_DEPENDS  ${SOURCE_DIR}/cpp/Jl*.cxx)
 add_library(Geant4Wrap SHARED ${SOURCE_DIR}/cpp/Geant4Wrap.cxx ${SOURCE_DIR}/cpp/jlGeant4.cxx ${GEN_SOURCES})
 
 #target_compile_definitions(Geant4Wrap PUBLIC VERBOSE_IMPORT)
+list(REMOVE_ITEM Geant4_LIBRARIES Geant4::G4ToolsSG)  # dependencies to system OpenGL
 target_include_directories(Geant4Wrap PRIVATE ${SOURCE_DIR})
 target_link_libraries(Geant4Wrap JlCxx::cxxwrap_julia JlCxx::cxxwrap_julia_stl ${Geant4_LIBRARIES})
 

diff --git a/gen/Geant4-veto.h b/gen/Geant4-veto.h
@@ -1,7 +1,7 @@
 std::char_traits
 std::allocator
-ostream
-istream
+std::ostream
+std::istream
 CLHEP::HepLorentzRotation CLHEP::operator*(const CLHEP::HepRotationX &, const CLHEP::HepLorentzRotation &)
 CLHEP::HepLorentzRotation CLHEP::operator*(const CLHEP::HepRotationY &, const CLHEP::HepLorentzRotation &)
 CLHEP::HepLorentzRotation CLHEP::operator*(const CLHEP::HepRotationZ &, const CLHEP::HepLorentzRotation &)
@@ -25,18 +25,18 @@ size_t G4ProcessVector::length()
 size_t G4ProcessVector::size()
 void CLHEP::RandPoissonQ::shootArray(CLHEP::HepRandomEngine *, const int, long *, double)
 
-G4VMPLData::physicsVector
-CLHEP::HepXHat
-CLHEP::HepYHat
-CLHEP::HepZHat
-CLHEP::HepRotation::IDENTITY
-HepGeom::Transform3D::Identity
-CLHEP::HepLorentzRotation::IDENTITY
-std::istream
-std::ostream
+//G4VMPLData::physicsVector
+//CLHEP::HepXHat
+//CLHEP::HepYHat
+//CLHEP::HepZHat
+//CLHEP::HepRotation::IDENTITY
+//HepGeom::Transform3D::Identity
+//CLHEP::HepLorentzRotation::IDENTITY
+//std::istream
+//std::ostream
 std::basic_istream
 std::basic_ostream
 std::__wrap_iter
-# G4ReferenceCountedHandle
+G4ReferenceCountedHandle