Skip to content

Commit 9b8e7f0

Browse files
committed
Hunter 0.2.4
1 parent 26487db commit 9b8e7f0

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

HunterGate.cmake

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
cmake_minimum_required(VERSION 2.8.10)
1616

17-
set(HUNTER_MINIMUM_VERSION "0.2.2")
18-
set(HUNTER_MINIMUM_VERSION_HASH 2d538ede36c2cf24c526a5d4c452209faa89d536)
17+
set(HUNTER_MINIMUM_VERSION "0.2.4")
18+
set(HUNTER_MINIMUM_VERSION_HASH 251a7747fa0a9ad0299cdce0408bcc1c35b9c8d6)
1919

2020
# Set HUNTER_ROOT cmake variable to suitable value.
2121
# Info about variable can be found in HUNTER_ROOT_INFO.
@@ -92,10 +92,13 @@ function(hunter_gate_do_download)
9292
)
9393
endif()
9494

95+
set(TEMP_DIR "${PROJECT_BINARY_DIR}/Hunter-activity/gate")
96+
set(TEMP_BUILD "${TEMP_DIR}/_builds")
97+
9598
set(URL_BASE "https://github.com/ruslo/hunter/archive")
9699
file(
97100
WRITE
98-
"${PROJECT_BINARY_DIR}/Hunter-prefix/CMakeLists.txt"
101+
"${TEMP_DIR}/CMakeLists.txt"
99102
"cmake_minimum_required(VERSION 2.8.10)\n"
100103
"include(ExternalProject)\n"
101104
"ExternalProject_Add(\n"
@@ -119,9 +122,9 @@ function(hunter_gate_do_download)
119122

120123
execute_process(
121124
COMMAND
122-
"${CMAKE_COMMAND}" .
125+
"${CMAKE_COMMAND}" "-H${TEMP_DIR}" "-B${TEMP_BUILD}"
123126
WORKING_DIRECTORY
124-
"${PROJECT_BINARY_DIR}/Hunter-prefix"
127+
"${TEMP_DIR}"
125128
RESULT_VARIABLE
126129
HUNTER_DOWNLOAD_RESULT
127130
)
@@ -132,9 +135,9 @@ function(hunter_gate_do_download)
132135

133136
execute_process(
134137
COMMAND
135-
"${CMAKE_COMMAND}" --build .
138+
"${CMAKE_COMMAND}" --build "${TEMP_BUILD}"
136139
WORKING_DIRECTORY
137-
"${PROJECT_BINARY_DIR}/Hunter-prefix"
140+
"${TEMP_DIR}"
138141
RESULT_VARIABLE
139142
HUNTER_DOWNLOAD_RESULT
140143
)

0 commit comments

Comments
 (0)