Fix cmake problems

CMakeLists.txt

@@ -53,30 +53,8 @@ ENDIF()
 ##checks for xercesc or not and sets up the include_directories
 include(DD4hep_XML_setup)
 
-#if(DD4HEP_USE_GEANT4)
-#  set( DD4HEP_USE_BOOST ON)
-#  message( STATUS " *** finding BOOST .... " )
-#  find_package( Boost REQUIRED ) 
-#  include_directories( SYSTEM ${Boost_INCLUDE_DIRS} )
-#  add_definitions( -DDD4HEP_USE_BOOST )
-#endif()
-
-#if(DD4HEP_USE_LCIO)
-#  find_package( LCIO REQUIRED )
-#  include_directories( SYSTEM ${LCIO_INCLUDE_DIRS} )
-#endif()
-
-
 #---Packages------------------------------------------------------------------------
-
-##------ don't allow to use a pre-built DDSegmentation  ----------------------------
-#find_package( DDSegmentation QUIET )
-#if( NOT DDSegmentation_FOUND ) 
-#  add_subdirectory(DDSegmentation)
-#endif()
-
 add_subdirectory(DDSegmentation)
-
 add_subdirectory(DDCore)
 add_subdirectory(DDSurfaces)
 add_subdirectory(DDRec)
@@ -114,12 +92,12 @@ if(DD4HEP_USE_GEANT4)
   endif()
 
   set(Geant4_INCLUDE_DIRS ${Geant4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS})
-  set(Geant4_LIBRARIES ${Geant4_LIBRARIES} ${CLHEP_LIBRARIES})
-  #------- now configure DDG4 -------
-  add_subdirectory(DDG4)
-
+  set(Geant4_LIBRARIES    ${Geant4_LIBRARIES} ${CLHEP_LIBRARIES})
 endif()
 
+#------- now configure DDG4 -------
+add_subdirectory(DDG4)
+
 add_subdirectory(DDCond)
 add_subdirectory(DDAlign)
 add_subdirectory(DDEve)

cmake/DD4hep.cmake

@@ -26,12 +26,15 @@ if(DD4HEP_USE_GEANT4)
 endif()
 #---------------------------------------------------------------------------------------------------
 if(DD4HEP_USE_BOOST)
+  message(FATAL_ERROR "Boost is required   ${DD4HEP_USE_BOOST}")
   if ( "${Boost_INCLUDE_DIRS}" STREQUAL "" )
     find_package( Boost REQUIRED ) 
     ##include_directories( SYSTEM ${Boost_INCLUDE_DIRS} )
   endif()
   add_definitions( -DDD4HEP_USE_BOOST )
   add_definitions( -DBOOST_SPIRIT_USE_PHOENIX_V3 )
+else()
+  set ( DD4HEP_USE_BOOST OFF )
 endif()
 # Main functional include file
 include ( DD4hepBuild )

cmake/DD4hep_XML_setup.cmake

@@ -4,6 +4,7 @@ if(DD4HEP_USE_XERCESC)
   include_directories(SYSTEM ${XERCESC_INCLUDE_DIRS})
   set(XML_LIBRARIES ${XERCESC_LIBRARIES})
 else()
+  set ( DD4HEP_USE_XERCESC OFF )
   add_definitions(-DDD4HEP_USE_TINYXML)
   set(XML_LIBRARIES)
 endif()

doc/CompileAllOptionPermutations.sh

@@ -5,57 +5,78 @@ INSTALL_XERCESC=/home/frankm/SW/xercesc;
 export ROOTSYS=/home/frankm/SW/root_v5.34.25_dbg;
 . ${ROOTSYS}/bin/thisroot.sh;
 #
+LINE="==================================================================================================="
 #
+make_output()
+{
+    echo "${LINE}";
+    echo "${LINE}";
+    echo "=============================== `pwd` ";
+    echo "${LINE}";
+    echo "${LINE}";
+    if test -n "${1}"; then 
+        echo " +++++ ${1}";
+    fi;
+    if test -n "${2}"; then 
+        echo " +++++ ${2}";
+    fi;
+}
+
 make_opt()
 {
     if test "$1" = "ON"; then
-	echo $*;
-    else
-	echo ${1};
+        arg="${2}=${1}";shift;shift;
+	echo ${arg} $*;
+        #else
+        #	echo ${1};
     fi;
 }
-LINE="==================================================================================================="
+
+make_build()
+{
+    echo ${CMD};
+    eval ${CMD};
+    if [ $? -ne  0 ]; then
+        make_output "DANGER WILL ROBINSON DANGER!" "++++ Failed CMAKE command:"
+        echo ${CMD};
+	exit 1
+    fi
+    make -j 5 install;
+    if [ $? -ne  0 ]; then
+        make_output "DANGER WILL ROBINSON DANGER!" "++++ Failed BUILD:"
+        echo ${CMD};
+	exit 1
+    fi;
+    make test;
+    if [ $? -ne  0 ]; then
+        make_output "DANGER WILL ROBINSON DANGER!" "++++ Failed TESTS:"
+        echo ${CMD};
+	#exit 1
+    fi;
+}
+
 for DOGEANT4 in OFF ON; do
     for DOXERCESC in OFF ON; do
 	for DOGEAR in OFF; do
 	    for DOLCIO in OFF ON; do
 		folder=build_Xer${DOXERCESC}_Geant${DOGEANT4}_Gear${DOGEAR}_Lcio${DOLCIO}
-		mkdir ${dir_name}/$folder
-		cd ${dir_name}/$folder
-		echo "${LINE}";
-		echo "${LINE}";
-		echo "=============================== ${folder} ";
-		echo "${LINE}";
-		echo "${LINE}";
+                WORK_DIR=${dir_name}/${folder};
+		mkdir -p ${WORK_DIR}/EX;
+		cd ${WORK_DIR};
+                make_output;
                 #-DDD4HEP_DEBUG_CMAKE=ON \
-		CMD="cd ${dir_name}/$folder ; cmake -D DD4HEP_USE_XERCESC=${DOXERCESC} \
-		    -DDD4HEP_USE_GEANT4=`make_opt ${DOGEANT4} -DGeant4_DIR=${INSTALL_G4}`\
-		    -DDD4HEP_USE_LCIO=`make_opt ${DOLCIO} -DLCIO_DIR=${INSTALL_LCIO}` \
-		    -DBoost_NO_BOOST_CMAKE=ON \
-		    -DDD4HEP_USE_XERCESC=`make_opt ${DOXERCESC} -DXERCESC_ROOT_DIR=${INSTALL_XERCESC}` \
-		    ../../../DD4hep.trunk/checkout;";
-                echo ${CMD};
-                eval ${CMD};
-		if [ $? -ne  0 ]; then
-		    echo "DANGER WILL ROBINSON DANGER!"
-		    echo "${LINE}";
-		    echo "=============================== ${folder} ";
-		    echo "${LINE}";
-                    echo "++++ Failed CMAKE command:"
-                    echo ${CMD};
-		    exit 1
-		fi
-		make -j5
-		if [ $? -ne  0 ]; then
-		    echo "DANGER WILL ROBINSON DANGER!"
-		    echo "${LINE}";
-		    echo "=============================== ${folder} ";
-		    echo "${LINE}";
-                    echo "++++ Failed BUILD:"
-                    echo ${CMD};
-		    exit 1
-		fi
-		cd ..
+                DD4hep_DIR=`pwd`/DD4hep;
+                OPTS="`make_opt ${DOGEANT4} -DDD4HEP_USE_GEANT4 -DGeant4_DIR=${INSTALL_G4}`\
+		    `make_opt ${DOLCIO}     -DDD4HEP_USE_LCIO -DLCIO_DIR=${INSTALL_LCIO}` \
+		    `make_opt ${DOXERCESC}  -DDD4HEP_USE_XERCESC -DXERCESC_ROOT_DIR=${INSTALL_XERCESC}` \
+                    -DCMAKE_INSTALL_PREFIX=${DD4hep_DIR}";
+		CMD="cd ${dir_name}/$folder ; cmake ${OPTS} ../../../DD4hep.trunk/checkout;";
+                make_build;
+   		CMD="cd ${WORK_DIR}/EX; cmake ${OPTS} -DDD4hep_DIR=${DD4hep_DIR} \
+		    ../../../../DD4hep.trunk/checkout/examples;";
+                make_build;
+                #
+		cd ../..;
 	    done
 	done
     done

examples/CMakeLists.txt

@@ -29,6 +29,5 @@ include ( ${DD4hep_DIR}/cmake/DD4hep.cmake )
 dd4hep_package ( DD4hepExample MAJOR 0 MINOR 0 PATCH 1 )
 #
 dd4hep_enable_tests (
-  AlignDet  CLICSiD  ClientTests 
+  AlignDet CLICSiD ClientTests SimpleDetector
 )
-#SimpleDetector

examples/ClientTests/CMakeLists.txt

@@ -41,6 +41,7 @@ foreach(script MiniTel LheD_tracker )
   dd4hep_add_test_reg( ClientTests_sim_${script}
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
       EXEC_ARGS  python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/${script}.py batch
+      REQUIRES   DDG4 Geant4
       REGEX_PASS NONE
       REGEX_FAIL "Exception;EXCEPTION;ERROR;Error" )
 endforeach(script)