mirror of
https://github.com/mhx/dwarfs.git
synced 2025-08-04 10:16:34 -04:00
CMakeLists.txt.* tweaks
This commit is contained in:
parent
499dca4551
commit
ec07d03305
@ -9,7 +9,8 @@ ExternalProject_Add(
|
|||||||
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/fmtlib
|
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/fmtlib
|
||||||
GIT_REPOSITORY ${LIBFMT_GIT_REPO}
|
GIT_REPOSITORY ${LIBFMT_GIT_REPO}
|
||||||
GIT_TAG 10.0.0
|
GIT_TAG 10.0.0
|
||||||
CMAKE_ARGS -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
|
CMAKE_ARGS -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
|
||||||
|
-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
|
||||||
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/fmtlib-install
|
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/fmtlib-install
|
||||||
-DCMAKE_BUILD_TYPE=Release
|
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
|
||||||
)
|
)
|
||||||
|
@ -3,7 +3,9 @@ cmake_minimum_required(VERSION 2.8.11)
|
|||||||
project(googletest-download NONE)
|
project(googletest-download NONE)
|
||||||
|
|
||||||
include(ExternalProject)
|
include(ExternalProject)
|
||||||
ExternalProject_Add(googletest
|
|
||||||
|
ExternalProject_Add(
|
||||||
|
googletest
|
||||||
GIT_REPOSITORY ${GOOGLETEST_GIT_REPO}
|
GIT_REPOSITORY ${GOOGLETEST_GIT_REPO}
|
||||||
GIT_TAG main
|
GIT_TAG main
|
||||||
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
|
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
|
||||||
|
@ -8,10 +8,11 @@ ExternalProject_Add(
|
|||||||
libarchive
|
libarchive
|
||||||
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libarchive
|
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libarchive
|
||||||
GIT_REPOSITORY ${LIBARCHIVE_GIT_REPO}
|
GIT_REPOSITORY ${LIBARCHIVE_GIT_REPO}
|
||||||
GIT_TAG "v3.6.1"
|
GIT_TAG "v3.6.2"
|
||||||
CMAKE_ARGS -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
|
CMAKE_ARGS -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
|
||||||
|
-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
|
||||||
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/libarchive-install
|
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/libarchive-install
|
||||||
-DCMAKE_BUILD_TYPE=Release
|
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
|
||||||
-DENABLE_ICONV:BOOL=OFF
|
-DENABLE_ICONV:BOOL=OFF
|
||||||
-DENABLE_LIBXML2:BOOL=OFF
|
-DENABLE_LIBXML2:BOOL=OFF
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user