Fixed build issues

jlblancoc · Aug 14, 2017 · fb48194 · fb48194
1 parent a63b82a
commit fb48194
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,6 +55,11 @@ target_include_directories(nanoflann
 OPTION(BUILD_EXAMPLES "Build examples" ON)
 IF(BUILD_EXAMPLES)
 	add_subdirectory(examples)
+ENDIF()
+
+# Benchmarks
+OPTION(BUILD_BENCHMARKS "Build benchmarks" ON)
+IF(BUILD_BENCHMARKS)
 	add_subdirectory(benchmarkTool/realTests)
 ENDIF()
 

diff --git a/benchmarkTool/realTests/CMakeLists.txt b/benchmarkTool/realTests/CMakeLists.txt
@@ -1,9 +1,11 @@
-set(flann_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/3rdparty/flann/src/cpp/")
+set(flann_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/3rdparty/flann/src/cpp")
 include_directories(${flann_INCLUDE_DIRS})
 
-# examples:
+set(flann_LIBRARIES "${CMAKE_SOURCE_DIR}/build/flann-prefix/src/flann-build/lib/libflann.so")
+
+# benchmark files:
 ADD_EXECUTABLE(nanoflann_test nanoflann_test.cpp)
 TARGET_LINK_LIBRARIES(nanoflann_test nanoflann)
 
 ADD_EXECUTABLE(flann_test flann_test.cpp)
-TARGET_LINK_LIBRARIES(flann_test nanoflann)
+TARGET_LINK_LIBRARIES(flann_test nanoflann ${flann_LIBRARIES})
diff --git a/benchmarkTool/realTests/flann_test.cpp b/benchmarkTool/realTests/flann_test.cpp
@@ -31,6 +31,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <fstream>
+#include <string>
 
 using namespace std;
 using namespace flann;

diff --git a/benchmarkTool/realTests/nanoflann_test.cpp b/benchmarkTool/realTests/nanoflann_test.cpp
@@ -31,6 +31,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <fstream>
+#include <string>
 
 using namespace std;
 using namespace nanoflann;