GeneticMinimizer is moved into ThirdParty.

Fit/CMakeLists.txt

@@ -23,8 +23,8 @@ file(GLOB include_files
 if(NOT ROOT_FOUND)
     list(REMOVE_ITEM source_files "${CMAKE_CURRENT_SOURCE_DIR}/FitKernel/src/ROOTGeneticMinimizer.cpp")
     list(REMOVE_ITEM include_files "${CMAKE_CURRENT_SOURCE_DIR}/FitKernel/inc/ROOTGeneticMinimizer.h")
-    list(REMOVE_ITEM source_files "${CMAKE_CURRENT_SOURCE_DIR}/FitKernel/src/GeneticMinimizer.cxx")
-    list(REMOVE_ITEM include_files "${CMAKE_CURRENT_SOURCE_DIR}/FitKernel/inc/GeneticMinimizer.h")
+#    list(REMOVE_ITEM source_files "${CMAKE_CURRENT_SOURCE_DIR}/FitKernel/src/GeneticMinimizer.cxx")
+#    list(REMOVE_ITEM include_files "${CMAKE_CURRENT_SOURCE_DIR}/FitKernel/inc/GeneticMinimizer.h")
 endif()
 
 if(BORNAGAIN_PYTHON)

Fit/FitKernel/inc/ROOTGeneticMinimizer.h

@@ -17,7 +17,7 @@
 #define ROOTGENETICMINIMIZER_H
 
 #include "ROOTMinimizer.h"
-#include "GeneticMinimizer.h"
+#include "Math/GeneticMinimizer.h"
 
 //! @class ROOTGeneticMinimizer
 //! @ingroup fitting_internal

ThirdParty/RootMinimizers/CMakeLists.txt

@@ -23,10 +23,12 @@ file(GLOB include_files
     "src/Math/*.h"
 )
 
-#if(NOT ROOT_FOUND)
-#    list(REMOVE_ITEM include_files GeneticMinimizer.h)
-#    list(REMOVE_ITEM source_files GeneticMinimizer.cxx)
-#endif()
+
+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()
+
 
 add_definitions(-DWARNINGMSG)
 
@@ -48,5 +50,12 @@ set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
 include_directories(${GSL_INCLUDE_DIR})
 target_link_libraries(${library_name} ${GSL_LIBRARIES})
 
+if(ROOT_FOUND)
+    include_directories(
+        ${ROOT_INCLUDE_DIR}
+    )
+endif()
+
+
 # --- installation ---
 #install (TARGETS ${library_name} DESTINATION ${destination_lib} COMPONENT Libraries)