Removed ltk and Detectors from build

CMake/cmt-ulib.spec.in

@@ -13,7 +13,6 @@ BuildRequires: eigen3-devel
 BuildRequires: vtk-devel
 BuildRequires: readline-devel
 BuildRequires: pcl-devel
-BuildRequires: geant4-devel
 BuildRequires: root-geom
 BuildRequires: root-genvector
 BuildRequires: root-smatrix
@@ -35,8 +34,8 @@ mkdir -p %{buildroot}
 mkdir %{_builddir}/%{name}-%{version}/build
 cd %{_builddir}/%{name}-%{version}/build
 cmake3 -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \
-       -DULIB_USE_QT5=OFF \
        -DPACKAGE_INSTALL_LIB_DIR=%{buildroot}/usr/lib64 \
+       -DNODOXYGEN=ON \
        %{_builddir}/%{name}-%{version}
 make
 
@@ -68,7 +67,6 @@ Requires: eigen3-devel
 Requires: vtk-devel
 Requires: readline-devel
 Requires: pcl-devel
-Requires: geant4-devel
 Requires: root-geom
 Requires: root-genvector
 Requires: root-smatrix
@@ -86,18 +84,14 @@ analysis and imaging software Developed by University of Padova and INFN Sezione
 /usr/lib64/libmutom*.so
 /usr/lib64/cmake/mutom-0.2/*.cmake
 %dir /usr/include/mutom-0.2
-%dir /usr/include/mutom-0.2/ltk
 %dir /usr/include/mutom-0.2/Core
 %dir /usr/include/mutom-0.2/Math
-%dir /usr/include/mutom-0.2/Detectors
 %dir /usr/include/mutom-0.2/Root
 %dir /usr/include/mutom-0.2/Vtk
 /usr/include/mutom-0.2/*.h
-/usr/include/mutom-0.2/ltk/*h
 /usr/include/mutom-0.2/Core/*.h
 /usr/include/mutom-0.2/Math/*.h
 /usr/include/mutom-0.2/Math/*.hpp
-/usr/include/mutom-0.2/Detectors/*.h
 /usr/include/mutom-0.2/Root/*.h
 /usr/include/mutom-0.2/Vtk/*.h
 

CMake/uLibFindDependencies.cmake

@@ -75,36 +75,36 @@ endif(ULIB_USE_VTK)
 
 
 ## GEANT ##
-option(ULIB_USE_GEANT4 "Activate use of GEANT Integration" ON)
+#option(ULIB_USE_GEANT4 "Activate use of GEANT Integration" ON)
-message(STATUS "## GEANT 4 ##")
+#message(STATUS "## GEANT 4 ##")
-#include(FindGEANT4) # disabled using system finder
+##include(FindGEANT4) # disabled using system finder
-find_package(Geant4)
+#find_package(Geant4)
-set(GEANT4_FOUND Geant4_DIR)
+#set(GEANT4_FOUND Geant4_DIR)
-if(GEANT4_FOUND AND ULIB_USE_GEANT4)
+#if(GEANT4_FOUND AND ULIB_USE_GEANT4)
- message(STATUS "Looking for Geant4... - Geant4 found in ${Geant4_DIR}")
+# message(STATUS "Looking for Geant4... - Geant4 found in ${Geant4_DIR}")
- set(HAVE_GEANT4 true)
+# set(HAVE_GEANT4 true)
- include_directories(${Geant4_INCLUDE_DIRS})         # Add -I type paths
+# include_directories(${Geant4_INCLUDE_DIRS})         # Add -I type paths
- add_definitions(${Geant4_DEFINITIONS})              # Add -D type defs
+# add_definitions(${Geant4_DEFINITIONS})              # Add -D type defs
- debug_package(Geant4)
+# debug_package(Geant4)
-endif(GEANT4_FOUND AND ULIB_USE_GEANT4)
+#endif(GEANT4_FOUND AND ULIB_USE_GEANT4)
 
 ## QT4 ##
-option(ULIB_USE_QT4 "Activate use of Qt Framework" ON)
+#option(ULIB_USE_QT4 "Activate use of Qt Framework" ON)
-if(ULIB_USE_QT4)
+#if(ULIB_USE_QT4)
- message(STATUS "## QT4 ##")
+# message(STATUS "## QT4 ##")
- find_package(Qt4)
+# find_package(Qt4)
-# include_directories(${Qt4_INCLUDE_DIRS})
+## include_directories(${Qt4_INCLUDE_DIRS})
-# debug(Qt4_INCLUDE_DIRS)
+## debug(Qt4_INCLUDE_DIRS)
-endif(ULIB_USE_QT4)
+#endif(ULIB_USE_QT4)
 
 ## QT5 ##
-option(ULIB_USE_QT5 "Activate use of Qt Framework" ON)
+#option(ULIB_USE_QT5 "Activate use of Qt Framework" ON)
-if(ULIB_USE_QT5)
+#if(ULIB_USE_QT5)
- message(STATUS "## QT5 ##")
+# message(STATUS "## QT5 ##")
- find_package(Qt5Widgets)
+# find_package(Qt5Widgets)
-# include_directories(${Qt5_INCLUDE_DIRS})
+## include_directories(${Qt5_INCLUDE_DIRS})
-# debug(Qt5_INCLUDE_DIRS)
+## debug(Qt5_INCLUDE_DIRS)
-endif(ULIB_USE_QT5)
+#endif(ULIB_USE_QT5)
 
 ## READLINE ##
 message(STATUS "## READLINE ##")

CMakeLists.txt

@@ -5,11 +5,6 @@
 
 cmake_minimum_required (VERSION 2.6)
 
-execute_process(COMMAND "clear")
-message("//////////////////////////////////////////////////////////////////////")
-message("/////////////////// CMAKE PJOJECT CONFIGURATION //////////////////////")
-message("//////////////////////////////////////////////////////////////////////")
-
 ## -------------------------------------------------------------------------- ##
 
 project(uLib)
@@ -59,10 +54,8 @@ include(uLibConfigHeader)
 
 ## select modules ##
 set(ULIB_SELECTED_MODULES
-      ltk
       Core
       Math
-      Detectors
       Root
 )
 
@@ -189,13 +182,27 @@ configure_file(uLibConfig.cmake.in
   "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/uLibConfig.cmake" @ONLY)
 # ... for both
 configure_file(uLibConfigVersion.cmake.in
-  "${PROJECT_BINARY_DIR}/uLibConfigVersion.cmake" @ONLY)
+               "${PROJECT_BINARY_DIR}/uLibConfigVersion.cmake" @ONLY)
 
-# Install the FooBarConfig.cmake and FooBarConfigVersion.cmake
+install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/uLibConfig.cmake"
-install(FILES
+              "${PROJECT_BINARY_DIR}/uLibConfigVersion.cmake"
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/uLibConfig.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/FindEigen3.cmake"
-  "${PROJECT_BINARY_DIR}/uLibConfigVersion.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/FindReadLine.cmake"
-  DESTINATION "${PACKAGE_INSTALL_CMAKE_DIR}" COMPONENT dev)
+              "${PROJECT_SOURCE_DIR}/CMake/FindROOT.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/FindROOTv6.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/FinduLib.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/FindVTK.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/uLibCommon.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/uLibConfigHeader.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/uLibDebugMacro.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/uLibFindDependencies.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/uLibGenerateDoc.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/uLibGenerateRMake.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/uLibGenerateRPMS.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/uLibMacros.cmake"
+              "${PROJECT_SOURCE_DIR}/CMake/uLibTargetMacros.cmake"
+        DESTINATION "${PACKAGE_INSTALL_CMAKE_DIR}"
+        COMPONENT dev)
 
 # Install the export set for use with the install-tree
 install(EXPORT "${PROJECT_NAME}Targets" DESTINATION

src/Vtk/CMakeLists.txt

@@ -30,7 +30,6 @@ set(LIBRARIES
        ${VTK_LIBRARIES}
        ${PACKAGE_LIBPREFIX}Core
        ${PACKAGE_LIBPREFIX}Math
-       ${PACKAGE_LIBPREFIX}Detectors
 )
 
 uLib_add_shared_library(${uLib-module})