Skip to content

Commit

Permalink
Fix travis
Browse files Browse the repository at this point in the history
  • Loading branch information
gabyx committed Sep 27, 2020
1 parent e047560 commit 4ded2e0
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.1.2-4-g37a8
v2.1.3-1-ge047
3 changes: 3 additions & 0 deletions benchmarks/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ set(INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}/include/
${ApproxMVBB_ROOT_DIR}/tests/include/)

include(SetTargetCompileOptions)

set(EXEC_NAME1 ApproxMVBB-BenhmarkMVBB)
add_executable(${EXEC_NAME1} ${CMAKE_CURRENT_SOURCE_DIR}/src/main_mvbbBenchmarks.cpp ${SOURCE_FILES} ${INCLUDE_FILES})
target_include_directories(${EXEC_NAME1} PRIVATE ${INCLUDE_DIRS})
target_link_libraries(${EXEC_NAME1} ApproxMVBB benchmark)
setTargetCompileOptions(${EXEC_NAME1})
2 changes: 2 additions & 0 deletions example/approxMVBB/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
project("ApproxMVBBExample-MVBB")

include(SetTargetCompileOptions)

add_executable(${PROJECT_NAME} src/main.cpp )
setTargetCompileOptions(ApproxMVBBExample-MVBB)

Expand Down
1 change: 1 addition & 0 deletions example/kdTreeFiltering/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set(INCLUDE_FILES )
set(INCLUDE_DIRS
${ApproxMVBB_ROOT_DIR}/tests/include)

include(SetTargetCompileOptions)

add_executable(ApproxMVBBExample-KdTree ${SOURCE_FILES} ${INCLUDE_FILES} )
setTargetCompileOptions(ApproxMVBBExample-KdTree)
Expand Down
13 changes: 10 additions & 3 deletions example/libraryUsage/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,23 @@ cmake_minimum_required(VERSION 3.10)

project(libraryUsage)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

# This include only set compile options: Use it as a reference!
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}../../cmake")
include(SetTargetCompileOptions)

# only set this variable if ApproxMVBB is not installed system-wide
# set(ApproxMVBB_DIR "path/to/ApproxMVBB/Build/Directory/install/lib/cmake/ApproxMVBB-1.0.8")
get_filename_component( ApproxMVBB_DIR ${ApproxMVBB_DIR} ABSOLUTE )
message(STATUS "ApproxMVBB_DIR:" ${ApproxMVBB_DIR})

# add ApproxMVBB

# Add ApproxMVBB
find_package(ApproxMVBB REQUIRED COMPONENTS XML_SUPPORT KDTREE_SUPPORT)

# add simple executable
# Add simple executable
add_executable(libraryUsage ./main.cpp)
setTargetCompileOptions(libraryUsage)
target_link_libraries(libraryUsage ApproxMVBB::Core)
4 changes: 2 additions & 2 deletions tests/src/main_diameterTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ namespace ApproxMVBB
ASSERT_TRUE(false) << "Exception in checking inside test!: " << e.what() << std::endl;
}
}
}; // namespace DiameterTest
}; // namespace ApproxMVBB
} // namespace DiameterTest
} // namespace ApproxMVBB

using namespace ApproxMVBB;
using namespace ApproxMVBB::DiameterTest;
Expand Down

0 comments on commit 4ded2e0

Please sign in to comment.