Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/ruslo/hunter into develo…
Browse files Browse the repository at this point in the history
…p_sdl2
  • Loading branch information
Cyberunner23 committed Jun 23, 2016
2 parents 6ab094e + bbd404b commit 9b34fde
Show file tree
Hide file tree
Showing 38 changed files with 1,505 additions and 2 deletions.
10 changes: 9 additions & 1 deletion cmake/configs/default.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ hunter_config(Android-SDK-Platform-tools VERSION r23.1.0)
hunter_config(Android-SDK-Tools VERSION 24.4.1)
hunter_config(Android-Support-Repository VERSION 28)
hunter_config(ArrayFire VERSION 3.3.1-p0)
hunter_config(Assimp VERSION 3.2-p1)
hunter_config(Async++ VERSION 0.0.3-hunter)
hunter_config(Avahi VERSION 0.6.31)
hunter_config(BZip2 VERSION 1.0.6-p1)
Expand Down Expand Up @@ -74,7 +75,7 @@ hunter_config(Qt VERSION 5.5.1-cvpixelbuffer-2-p7)
hunter_config(QtAndroidCMake VERSION 1.0.6)
hunter_config(QtCMakeExtra VERSION 1.0.17)
hunter_config(QtQmlManager VERSION 1.0.0)
hunter_config(RapidJSON VERSION 0.11-hunter)
hunter_config(RapidJSON VERSION 1.0.2-p2)
hunter_config(SDL2 VERSION 2.0.4-p2)
hunter_config(SQLite3 VERSION autoconf-3080803) #R-Tree enabled
hunter_config(Sober VERSION 0.1.3)
Expand All @@ -89,6 +90,7 @@ hunter_config(ZeroMQ VERSION 4.1.4-p2)
hunter_config(ccv VERSION 0.7-p6)
hunter_config(cereal VERSION 1.1.2-p5)
hunter_config(clBLAS VERSION 2.10.0-p0)
hunter_config(convertutf VERSION 1.0.1)
hunter_config(cvmatio VERSION 1.0.26)
hunter_config(damageproto VERSION 1.2.1)
hunter_config(dbus VERSION 1.10.0-hunter-4)
Expand All @@ -109,11 +111,14 @@ hunter_config(inputproto VERSION 2.2)
hunter_config(intltool VERSION 0.51.0)
hunter_config(ios_sim VERSION 3.1.1)
hunter_config(ippicv VERSION 20151201)
hunter_config(irrXML VERSION 1.2)
hunter_config(kbproto VERSION 1.0.6)
hunter_config(libdaemon VERSION 0.14)
hunter_config(libogg VERSION 1.3.2-cmake3)
hunter_config(libsodium VERSION 1.0.10)
hunter_config(libyuv VERSION 1514-p3)
hunter_config(log4cplus VERSION 1.2.0-p0)
hunter_config(minizip VERSION 1.0.1-p1)
hunter_config(msgpack VERSION 1.4.1)
hunter_config(nlohmann-json VERSION 1.0.0-rc1-hunter-3)
hunter_config(odb VERSION 2.4.0)
Expand All @@ -122,7 +127,10 @@ hunter_config(odb-compiler VERSION 2.4.0)
hunter_config(odb-mysql VERSION 2.4.0)
hunter_config(odb-pgsql VERSION 2.4.0)
hunter_config(odb-sqlite VERSION 2.4.0)
hunter_config(openddlparser VERSION 0.1.0-p2)
hunter_config(pciaccess VERSION 0.13.4)
hunter_config(poly2tri VERSION 1.0.0)
hunter_config(polyclipping VERSION 4.8.8-p0) # for Assimp
hunter_config(presentproto VERSION 1.0)
hunter_config(pthread-stubs VERSION 0.3)
hunter_config(rabbitmq-c VERSION 0.7.0-p1)
Expand Down
44 changes: 44 additions & 0 deletions cmake/modules/hunter_libsodium_install_tools.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
include(CMakePackageConfigHelpers)
include(hunter_test_string_not_empty)

function(hunter_install_libsodium_config)

hunter_test_string_not_empty("${HUNTER_libsodium_VERSION}")
hunter_test_string_not_empty("${HUNTER_PACKAGE_INSTALL_PREFIX}")
hunter_test_string_not_empty("${HUNTER_SELF}")

set(templates "${HUNTER_SELF}/cmake/templates")
set(configs "${HUNTER_PACKAGE_INSTALL_PREFIX}/lib/cmake/libsodium")

if(NOT BUILD_SHARED_LIBS)
set(TARGET_INTERFACE_COMPILE_DEFINITIONS "INTERFACE_COMPILE_DEFINITIONS SODIUM_STATIC")
endif()

write_basic_package_version_file("${configs}/libsodiumConfig.cmake" VERSION "${HUNTER_libsodium_VERSION}" COMPATIBILITY ExactVersion)

configure_file(
"${templates}/libsodiumConfig.cmake.in"
"${configs}/libsodiumConfig.cmake"
@ONLY
)

endfunction()


function(hunter_install_libsodium_targets)

hunter_test_string_not_empty("${HUNTER_PACKAGE_INSTALL_PREFIX}")
hunter_test_string_not_empty("${HUNTER_SELF}")
hunter_test_string_not_empty("${TARGET_CONFIGURATION}")
hunter_test_string_not_empty("${TARGET_LIB_FILE}")

set(templates "${HUNTER_SELF}/cmake/templates")
set(configs "${HUNTER_PACKAGE_INSTALL_PREFIX}/lib/cmake/libsodium")

configure_file(
"${templates}/libsodiumTargets.cmake.in"
"${configs}/libsodiumTargets-${TARGET_CONFIGURATION}.cmake"
@ONLY
)

endfunction()
45 changes: 45 additions & 0 deletions cmake/projects/Assimp/hunter.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

# !!! DO NOT PLACE HEADER GUARDS HERE !!!

include(hunter_add_version)
include(hunter_cacheable)
include(hunter_cmake_args)
include(hunter_download)
include(hunter_pick_scheme)

hunter_add_version(
PACKAGE_NAME
Assimp
VERSION
3.2-p1
URL
"https://github.com/hunter-packages/assimp/archive/v3.2-p1.tar.gz"
SHA1
018ce1cc19f0cf89dd5157cfbfa1c2925eab6926
)

hunter_add_version(
PACKAGE_NAME
Assimp
VERSION
3.2-p0
URL
"https://github.com/hunter-packages/assimp/archive/v3.2-p0.tar.gz"
SHA1
a3f46eb24bc48cacee9f21b1ea4f4a0e3122b847
)

hunter_cmake_args(
Assimp
CMAKE_ARGS
ASSIMP_BUILD_ASSIMP_TOOLS=OFF
ASSIMP_BUILD_SAMPLES=OFF
ASSIMP_BUILD_TESTS=OFF
ASSIMP_ENABLE_BOOST_WORKAROUND=OFF
)

hunter_pick_scheme(DEFAULT url_sha1_cmake)
hunter_cacheable(Assimp)
hunter_download(PACKAGE_NAME Assimp)
57 changes: 56 additions & 1 deletion cmake/projects/RapidJSON/hunter.cmake
Original file line number Diff line number Diff line change
@@ -1,12 +1,58 @@
# Copyright (c) 2013, Ruslan Baratov
# Copyright (c) 2013-2016, Ruslan Baratov
# All rights reserved.

# !!! DO NOT PLACE HEADER GUARDS HERE !!!

include(hunter_add_version)
include(hunter_cacheable)
include(hunter_cmake_args)
include(hunter_download)
include(hunter_pick_scheme)

hunter_add_version(
PACKAGE_NAME
RapidJSON
VERSION
"1.0.2-p2"
URL
"https://github.com/hunter-packages/rapidjson/archive/v1.0.2-p2.tar.gz"
SHA1
d7effe11a8af6c1a01abf3f9ac6ef1be84dc2c84
)

hunter_add_version(
PACKAGE_NAME
RapidJSON
VERSION
"1.0.2-p1"
URL
"https://github.com/hunter-packages/rapidjson/archive/v1.0.2-p1.tar.gz"
SHA1
0e2263566d45dcd4fc0419692a48010e27ffaee8
)

hunter_add_version(
PACKAGE_NAME
RapidJSON
VERSION
"1.0.2-p0"
URL
"https://github.com/hunter-packages/rapidjson/archive/v1.0.2-p0.tar.gz"
SHA1
587ef53d1b82b246f27967fa67eefc1f4c3d1719
)

hunter_add_version(
PACKAGE_NAME
RapidJSON
VERSION
"0.11-p1"
URL
"https://github.com/hunter-packages/rapidjson/archive/v0.11-p1.tar.gz"
SHA1
1d027e4d1e9cf03b4dcdeaf8459e2e10607d5913
)

hunter_add_version(
PACKAGE_NAME
RapidJSON
Expand All @@ -18,5 +64,14 @@ hunter_add_version(
3cae7f5043e2bfbeb83c033b90a1a9fb69fd2371
)

hunter_cmake_args(
RapidJSON
CMAKE_ARGS
RAPIDJSON_BUILD_DOC=OFF
RAPIDJSON_BUILD_EXAMPLES=OFF
RAPIDJSON_BUILD_TESTS=OFF
)

hunter_pick_scheme(DEFAULT url_sha1_cmake)
hunter_cacheable(RapidJSON)
hunter_download(PACKAGE_NAME RapidJSON)
35 changes: 35 additions & 0 deletions cmake/projects/convertutf/hunter.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

# !!! DO NOT PLACE HEADER GUARDS HERE !!!

include(hunter_add_version)
include(hunter_cacheable)
include(hunter_download)
include(hunter_pick_scheme)

hunter_add_version(
PACKAGE_NAME
convertutf
VERSION
"1.0.1"
URL
"https://github.com/hunter-packages/convertutf/archive/v1.0.1.tar.gz"
SHA1
83c1f454b3d6789d5048e1198577092f1a77c7a2
)

hunter_add_version(
PACKAGE_NAME
convertutf
VERSION
"1.0.0"
URL
"https://github.com/hunter-packages/convertutf/archive/v1.0.0.tar.gz"
SHA1
757b75fff721260620050bc54096150ffd335672
)

hunter_pick_scheme(DEFAULT url_sha1_cmake)
hunter_cacheable(convertutf)
hunter_download(PACKAGE_NAME convertutf)
24 changes: 24 additions & 0 deletions cmake/projects/irrXML/hunter.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

# !!! DO NOT PLACE HEADER GUARDS HERE !!!

include(hunter_add_version)
include(hunter_cacheable)
include(hunter_download)
include(hunter_pick_scheme)

hunter_add_version(
PACKAGE_NAME
irrXML
VERSION
"1.2"
URL
"https://github.com/hunter-packages/irrXML/archive/1.2.tar.gz"
SHA1
726c1461d51fda1908b4050603682de680925b44
)

hunter_pick_scheme(DEFAULT url_sha1_cmake)
hunter_cacheable(irrXML)
hunter_download(PACKAGE_NAME irrXML)
26 changes: 26 additions & 0 deletions cmake/projects/libsodium/hunter.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# !!! DO NOT PLACE HEADER GUARDS HERE !!!

# Load used modules
include(hunter_add_version)
include(hunter_download)
include(hunter_pick_scheme)
include(hunter_cacheable)

hunter_add_version(
PACKAGE_NAME
libsodium
VERSION
"1.0.10"
URL
"https://github.com/jedisct1/libsodium/archive/1.0.10.tar.gz"
SHA1
00a999629f1f8f500cef29818135f8f889f44e41
)

if(MSVC)
hunter_pick_scheme(DEFAULT url_sha1_libsodium_msbuild)
else()
hunter_pick_scheme(DEFAULT url_sha1_libsodium_autogen_autotools)
endif()
hunter_cacheable(libsodium)
hunter_download(PACKAGE_NAME libsodium)
Loading

0 comments on commit 9b34fde

Please sign in to comment.