From 4cff06f32c2d2e46e50fa5ca250cbda120ec7a60 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Mon, 18 Aug 2014 17:00:48 +0200
Subject: [PATCH] GeneticMinimizer is moved into ThirdParty.
---
Fit/CMakeLists.txt | 4 ++--
Fit/FitKernel/inc/ROOTGeneticMinimizer.h | 2 +-
ThirdParty/RootMinimizers/CMakeLists.txt | 17 +++++++++++++----
.../RootMinimizers/inc/Math}/GeneticMinimizer.h | 0
.../src/Math}/GeneticMinimizer.cxx | 0
5 files changed, 16 insertions(+), 7 deletions(-)
rename {Fit/FitKernel/inc => ThirdParty/RootMinimizers/inc/Math}/GeneticMinimizer.h (100%)
rename {Fit/FitKernel/src => ThirdParty/RootMinimizers/src/Math}/GeneticMinimizer.cxx (100%)
diff --git a/Fit/CMakeLists.txt b/Fit/CMakeLists.txt
index 6dfee7aea0d..3f93982f305 100644
--- a/Fit/CMakeLists.txt
+++ b/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)
diff --git a/Fit/FitKernel/inc/ROOTGeneticMinimizer.h b/Fit/FitKernel/inc/ROOTGeneticMinimizer.h
index caf6f9b6b81..4709dbabfd2 100644
--- a/Fit/FitKernel/inc/ROOTGeneticMinimizer.h
+++ b/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
diff --git a/ThirdParty/RootMinimizers/CMakeLists.txt b/ThirdParty/RootMinimizers/CMakeLists.txt
index 51e4c009647..8431b802c3e 100644
--- a/ThirdParty/RootMinimizers/CMakeLists.txt
+++ b/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)
diff --git a/Fit/FitKernel/inc/GeneticMinimizer.h b/ThirdParty/RootMinimizers/inc/Math/GeneticMinimizer.h
similarity index 100%
rename from Fit/FitKernel/inc/GeneticMinimizer.h
rename to ThirdParty/RootMinimizers/inc/Math/GeneticMinimizer.h
diff --git a/Fit/FitKernel/src/GeneticMinimizer.cxx b/ThirdParty/RootMinimizers/src/Math/GeneticMinimizer.cxx
similarity index 100%
rename from Fit/FitKernel/src/GeneticMinimizer.cxx
rename to ThirdParty/RootMinimizers/src/Math/GeneticMinimizer.cxx
--
GitLab