Cleanup in cmake fit machinery

Core/CMakeLists.txt

@@ -201,7 +201,7 @@ else()
 endif()
 
 if(NOT BORNAGAIN_APPLE_BUNDLE)
-    # installing bornagain/__init.py
+    # installing bornagain/__init__.py
     install (DIRECTORY ${CMAKE_SOURCE_DIR}/dev-tools/python-setup/bornagain DESTINATION ${destination_lib} COMPONENT Libraries)
 endif()
 

Fit/CMakeLists.txt

@@ -25,12 +25,6 @@ file(GLOB fitkernel_include_files
     "StandardFits/*.h"
 )
 
-# genetic minimizer only available if ROOT present
-#if(NOT ROOT_FOUND)
-#    list(REMOVE_ITEM fitkernel_source_files "${CMAKE_CURRENT_SOURCE_DIR}/FitKernel/src/ROOTGeneticMinimizer.cpp")
-#    list(REMOVE_ITEM fitkernel_include_files "${CMAKE_CURRENT_SOURCE_DIR}/FitKernel/inc/ROOTGeneticMinimizer.h")
-#endif()
-
 set(source_files ${fitkernel_source_files})
 set(include_files ${fitkernel_include_files})
 
@@ -82,16 +76,6 @@ target_link_libraries(
     ${GSL_LIBRARIES}
 )
 
-#if(ROOT_FOUND)
-#    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_GENETIC_MINIMIZER")
-#    include_directories(
-#        ${ROOT_INCLUDE_DIR}
-#    )
-#    target_link_libraries(${library_name}
-#        ${ROOT_LIBRARIES} -lTMVA
-#    )
-#endif()
-
 if(BORNAGAIN_PYTHON)
     include_directories(${PYTHON_INCLUDE_DIRS})
     target_link_libraries(${library_name} ${PYTHON_LIBRARIES})

Fit/FitKernel/src/MinimizerFactory.cpp

@@ -20,9 +20,7 @@
 #include "ROOTMultiMinMinimizer.h"
 #include "ROOTSimAnMinimizer.h"
 #include "ROOTLMAMinimizer.h"
-//#ifdef HAS_GENETIC_MINIMIZER
 #include "ROOTGeneticMinimizer.h"
-//#endif
 #include <boost/assign/list_of.hpp>
 #include <iomanip>
 
@@ -105,14 +103,8 @@ IMinimizer *MinimizerFactory::createMinimizer(const std::string& minimizer, cons
     } else if( minimizer == "GSLSimAn" ) {
         result = new ROOTSimAnMinimizer(minimizer, algorithm);
 
-//#ifdef HAS_GENETIC_MINIMIZER
     } else if( minimizer == "Genetic" ) {
         result = new ROOTGeneticMinimizer(minimizer, algorithm);
-//#else
-//    } else if( minimizer == "Genetic" ) {
-//        std::cout << "MinimizerFactory::createMinimizer() -> Error! Genetic minimizer doesn't exists (project was compiled without ROOT support)." << std::endl;
-//        result = 0;
-//#endif
 
     }
 
@@ -144,7 +136,3 @@ IMinimizer *MinimizerFactory::createMinimizer(const IMinimizer *minimizer)
     return result;
 }
 
-
-
-
-

ThirdParty/RootMinimizers/CMakeLists.txt

@@ -24,17 +24,10 @@ file(GLOB include_files
     "inc/TMVA/*.h"
 )
 
-#if(NOT ROOT_FOUND)
-#    list(REMOVE_ITEM source_files "${CMAKE_CURRENT_SOURCE_DIR}/src/Math/GeneticMinimizer.cxx")
-#    list(REMOVE_ITEM include_files "${CMAKE_CURRENT_SOURCE_DIR}/inc/Math/GeneticMinimizer.h")
-#endif()
-
-
 # --- definitions ---------
 add_definitions(-DWARNINGMSG)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE")
 
-
 # --- making library ------------
 add_library(
     ${library_name}
@@ -44,15 +37,10 @@ add_library(
 set(${library_name}_INCLUDE_DIRS ${include_dirs} PARENT_SCOPE)
 set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
 
-
 # --- external dependencies ---
 include_directories(${GSL_INCLUDE_DIR})
 target_link_libraries(${library_name} ${GSL_LIBRARIES})
 
-#if(ROOT_FOUND)
-#    include_directories(${ROOT_INCLUDE_DIR})
-#endif()
-
 include_directories(
     ${Boost_INCLUDE_DIRS}
 )