diff --git a/.travis.sh b/.travis.sh index 58b1341..778a186 100644 --- a/.travis.sh +++ b/.travis.sh @@ -10,7 +10,7 @@ CMAKE_CXX_FLAGS="-Wall -Wextra -Wabi -O2" function build () { mkdir $BUILD_DIR && cd $BUILD_DIR - cmake $SRC_DIR + cmake -DBUILD_BENCHMARKS=OFF $SRC_DIR sudo make -j2 } diff --git a/CMakeLists.txt b/CMakeLists.txt index eb7eac5..efab6e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,10 @@ ENDIF() # Benchmarks OPTION(BUILD_BENCHMARKS "Build benchmarks" ON) IF(BUILD_BENCHMARKS) + # 3rdparty Libraries + include(3rdparty/CMakeLists-flann.txt) + include(3rdparty/CMakeLists-fastann.txt) + include(3rdparty/CMakeLists-libkdtree.txt) add_subdirectory(benchmarkTool/realTests) add_subdirectory(benchmarkTool/randomTests) ENDIF() @@ -116,10 +120,6 @@ set(INSTALL_PKGCONFIG_DIR "lib${LIB_SUFFIX}/pkgconfig") set(INSTALL_CMAKE_DIR "lib${LIB_SUFFIX}/cmake/nanoflann") set(INSTALL_COPYRIGHT_DIR "share/doc/libnanoflann-dev") -# 3rdparty Libraries -include(3rdparty/CMakeLists-flann.txt) -include(3rdparty/CMakeLists-fastann.txt) -include(3rdparty/CMakeLists-libkdtree.txt) # Generate the cmake config and cmake config-version file: SET(RELATIVE_INCLUDE_DIR "../../../include")