Move ANN in separate library, ignore warnings, add to MarlinUtil libs…

… to keep MarlinReco happy
iLCSoft · May 2, 2017 · 773a4d1 · 773a4d1
1 parent c536970
commit 773a4d1
Show file tree

Hide file tree

Showing 26 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,12 +86,17 @@ INSTALL_DIRECTORY( ./source/include/ DESTINATION ./include/marlinutil FILES_MATC
 # get list of all source files
 AUX_SOURCE_DIRECTORY( ./source/src library_sources )
 AUX_SOURCE_DIRECTORY( ./source/src/mille library_sources )
-AUX_SOURCE_DIRECTORY( ./source/src/ann library_sources )
+AUX_SOURCE_DIRECTORY( ./source/ann ann_sources )
 
+ADD_SHARED_LIBRARY( MarlinUtilAnn ${ann_sources} )
+SET_TARGET_PROPERTIES( MarlinUtilAnn PROPERTIES COMPILE_FLAGS "-w" )
+INSTALL_SHARED_LIBRARY( MarlinUtilAnn DESTINATION lib )
 
 ADD_SHARED_LIBRARY( ${PROJECT_NAME} ${library_sources} )
 INSTALL_SHARED_LIBRARY( ${PROJECT_NAME} DESTINATION lib )
 
+TARGET_LINK_LIBRARIES( ${PROJECT_NAME} MarlinUtilAnn )
+
 #AUX_SOURCE_DIRECTORY( ./source/src/ann ann_library_sources )
 SET_SOURCE_FILES_PROPERTIES( "./source/src/ann/kd_pr_search.cpp" PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing" )
 

diff --git a/cmake/MarlinUtilConfig.cmake.in b/cmake/MarlinUtilConfig.cmake.in
@@ -52,7 +52,7 @@ INCLUDE( "@ILCSOFT_CMAKE_MODULES_ROOT@/MacroCheckPackageLibs.cmake" )
 # only standard libraries should be passed as arguments to CHECK_PACKAGE_LIBS
 # additional components are set by cmake in variable PKG_FIND_COMPONENTS
 # first argument should be the package name
-CHECK_PACKAGE_LIBS( MarlinUtil MarlinUtil )
+CHECK_PACKAGE_LIBS( MarlinUtil MarlinUtil MarlinUtilAnn )
 
 
 

diff --git a/source/src/ann/ANN.cpp → source/ann/ANN.cpp b/source/src/ann/ANN.cpp → source/ann/ANN.cpp
diff --git a/source/src/ann/Copyright.txt → source/ann/Copyright.txt b/source/src/ann/Copyright.txt → source/ann/Copyright.txt
diff --git a/source/src/ann/bd_fix_rad_search.cpp → source/ann/bd_fix_rad_search.cpp b/source/src/ann/bd_fix_rad_search.cpp → source/ann/bd_fix_rad_search.cpp
diff --git a/source/src/ann/bd_pr_search.cpp → source/ann/bd_pr_search.cpp b/source/src/ann/bd_pr_search.cpp → source/ann/bd_pr_search.cpp
diff --git a/source/src/ann/bd_search.cpp → source/ann/bd_search.cpp b/source/src/ann/bd_search.cpp → source/ann/bd_search.cpp
diff --git a/source/src/ann/bd_tree.cpp → source/ann/bd_tree.cpp b/source/src/ann/bd_tree.cpp → source/ann/bd_tree.cpp
diff --git a/source/src/ann/bd_tree.h → source/ann/bd_tree.h b/source/src/ann/bd_tree.h → source/ann/bd_tree.h
diff --git a/source/src/ann/brute.cpp → source/ann/brute.cpp b/source/src/ann/brute.cpp → source/ann/brute.cpp
diff --git a/source/src/ann/kd_dump.cpp → source/ann/kd_dump.cpp b/source/src/ann/kd_dump.cpp → source/ann/kd_dump.cpp
diff --git a/source/src/ann/kd_fix_rad_search.cpp → source/ann/kd_fix_rad_search.cpp b/source/src/ann/kd_fix_rad_search.cpp → source/ann/kd_fix_rad_search.cpp
diff --git a/source/src/ann/kd_fix_rad_search.h → source/ann/kd_fix_rad_search.h b/source/src/ann/kd_fix_rad_search.h → source/ann/kd_fix_rad_search.h
diff --git a/source/src/ann/kd_pr_search.cpp → source/ann/kd_pr_search.cpp b/source/src/ann/kd_pr_search.cpp → source/ann/kd_pr_search.cpp
diff --git a/source/src/ann/kd_pr_search.h → source/ann/kd_pr_search.h b/source/src/ann/kd_pr_search.h → source/ann/kd_pr_search.h
diff --git a/source/src/ann/kd_search.cpp → source/ann/kd_search.cpp b/source/src/ann/kd_search.cpp → source/ann/kd_search.cpp
diff --git a/source/src/ann/kd_search.h → source/ann/kd_search.h b/source/src/ann/kd_search.h → source/ann/kd_search.h
diff --git a/source/src/ann/kd_split.cpp → source/ann/kd_split.cpp b/source/src/ann/kd_split.cpp → source/ann/kd_split.cpp
diff --git a/source/src/ann/kd_split.h → source/ann/kd_split.h b/source/src/ann/kd_split.h → source/ann/kd_split.h
diff --git a/source/src/ann/kd_tree.cpp → source/ann/kd_tree.cpp b/source/src/ann/kd_tree.cpp → source/ann/kd_tree.cpp
diff --git a/source/src/ann/kd_tree.h → source/ann/kd_tree.h b/source/src/ann/kd_tree.h → source/ann/kd_tree.h
diff --git a/source/src/ann/kd_util.cpp → source/ann/kd_util.cpp b/source/src/ann/kd_util.cpp → source/ann/kd_util.cpp
diff --git a/source/src/ann/kd_util.h → source/ann/kd_util.h b/source/src/ann/kd_util.h → source/ann/kd_util.h
diff --git a/source/src/ann/perf.cpp → source/ann/perf.cpp b/source/src/ann/perf.cpp → source/ann/perf.cpp
diff --git a/source/src/ann/pr_queue.h → source/ann/pr_queue.h b/source/src/ann/pr_queue.h → source/ann/pr_queue.h
diff --git a/source/src/ann/pr_queue_k.h → source/ann/pr_queue_k.h b/source/src/ann/pr_queue_k.h → source/ann/pr_queue_k.h