Skip to content

Commit 4b92d31

Browse files
committed
use hunter to manage dependencies
1 parent 16d314f commit 4b92d31

File tree

3 files changed

+557
-12
lines changed

3 files changed

+557
-12
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ language: cpp
22
sudo: required
33
dist: trusty
44

5+
cache:
6+
directories:
7+
- /home/travis/.hunter/
8+
59
addons:
610
apt:
711
sources:

CMakeLists.txt

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,23 @@ SET( CMAKE_EXPORT_COMPILE_COMMANDS ON )
66
set (CMAKE_CXX_STANDARD 14)
77

88
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
9+
include("cmake/HunterGate.cmake")
910
include("cmake/ParseAndAddCatchTests.cmake")
1011
include("cmake/DownloadProject.CMake")
1112

13+
HunterGate(
14+
URL "https://github.com/ruslo/hunter/archive/v0.19.227.tar.gz"
15+
SHA1 "808b778a443fcdf19c2d18fea8fa4bb59d16596a"
16+
)
17+
1218
project(SqliteModernCpp)
1319

14-
find_package(sqlite3 REQUIRED)
20+
hunter_add_package(Catch)
21+
hunter_add_package(sqlite3)
1522

16-
download_project(
17-
PROJ catch
18-
GIT_REPOSITORY [email protected]:catchorg/Catch2.git
19-
GIT_TAG v2.1.0
20-
UPDATE_DISCONNECTED 1
21-
)
23+
find_package(Catch CONFIG REQUIRED)
24+
find_package(sqlite3 CONFIG REQUIRED)
2225

23-
set(CATCH_INCLUDE_DIR ${CMAKE_BINARY_DIR}/catch-src/single_include/)
2426
set(TEST_SOURCE_DIR ${CMAKE_SOURCE_DIR}/tests)
2527
file(GLOB TEST_SOURCES ${TEST_SOURCE_DIR}/*.cc)
2628

@@ -36,12 +38,9 @@ enable_testing()
3638
add_library (sqlite_modern_cpp INTERFACE)
3739
target_include_directories(sqlite_modern_cpp INTERFACE hdr/)
3840

39-
add_library (Catch INTERFACE)
40-
target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR})
41-
4241
add_executable(tests ${TEST_SOURCES})
4342
target_include_directories(tests INTERFACE ${SQLITE3_INCLUDE_DIRS})
44-
target_link_libraries(tests Catch sqlite_modern_cpp sqlite3)
43+
target_link_libraries(tests Catch::Catch sqlite_modern_cpp sqlite3::sqlite3)
4544
IF(ENABLE_SQLCIPHER_TESTS)
4645
set_target_properties(tests PROPERTIES COMPILE_FLAGS '-lsqlcipher')
4746
ENDIF(ENABLE_SQLCIPHER_TESTS)

0 commit comments

Comments
 (0)