Skip to content

Commit 10fbd37

Browse files
committed
fix dev/repease cache
1 parent d53c054 commit 10fbd37

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,17 @@ endif ()
3535

3636
if (EXTERNAL_LIB)
3737
set ( USE_AVX2 ON )
38-
set ( PACK ON )
3938
set ( BUILD_TESTING OFF )
4039
endif()
4140

41+
if (EXTERNAL_PACK)
42+
set ( USE_AVX2 ON )
43+
set ( PACK ON )
44+
set ( BUILD_TESTING OFF )
45+
endif ()
46+
47+
set (EXTERNAL_OPTION "EXTERNAL_LIB")
48+
4249
# check what we're build. api just packs headers and build nothing
4350
if (NOT API_ONLY)
4451
set ( API_ONLY OFF)
@@ -162,6 +169,7 @@ endif ()
162169
# simpler packages: provide -DPACK=1, and DISTR_BUILD will be set from env $DISTR, easier in dockers
163170
if (PACK)
164171
set ( DISTR_BUILD "$ENV{DISTR}" )
172+
set ( EXTERNAL_OPTION "EXTERNAL_PACK" )
165173
endif ()
166174

167175
if (DISTR_BUILD)
@@ -240,7 +248,7 @@ if (ADD_AVX_BUILDS)
240248
ExternalProject_Add ( columnar_avx2
241249
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
242250
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/avx2"
243-
CMAKE_ARGS -DEXTERNAL_LIB=1 -DCMAKE_INSTALL_PREFIX=${EXTERNAL_PREFIX}
251+
CMAKE_ARGS -D${EXTERNAL_OPTION}=1 -DCMAKE_INSTALL_PREFIX=${EXTERNAL_PREFIX}
244252
CONFIGURE_HANDLED_BY_BUILD TRUE
245253
TEST_COMMAND ""
246254
)

0 commit comments

Comments
 (0)