Skip to content

Commit c72133d

Browse files
committed
Forward COMPILER_LAUNCHER into ExternalProject_Add
1 parent 13cf515 commit c72133d

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

cmake/external/expat.cmake

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ foreach(lib IN LISTS EXPAT_LIBRARIES)
3030
add_dependencies(${lib} ${EXPAT_TARGET})
3131
endforeach(lib)
3232

33+
set(EXPAT_C_COMPILER "${CMAKE_C_COMPILER}")
34+
set(EXPAT_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
35+
if(DEFINED CMAKE_C_COMPILER_LAUNCHER AND DEFINED CMAKE_CXX_COMPILER_LAUNCHER)
36+
set(EXPAT_C_COMPILER "${CMAKE_C_COMPILER_LAUNCHER} ${EXPAT_C_COMPILER}")
37+
set(EXPAT_CXX_COMPILER "${CMAKE_CXX_COMPILER_LAUNCHER} ${EXPAT_CXX_COMPILER}")
38+
endif()
39+
3340
include (ExternalProject)
3441
ExternalProject_Add(${EXPAT_TARGET}
3542
PREFIX ${EXPAT_TARGET}
@@ -39,8 +46,8 @@ ExternalProject_Add(${EXPAT_TARGET}
3946
CONFIGURE_COMMAND cd ${EXPAT_SRC_DIR} && ./buildconf.sh && ./configure
4047
--prefix=${EXPAT_INSTALL_DIR}
4148
--without-xmlwf
42-
CC=${CMAKE_C_COMPILER}
43-
CXX=${CMAKE_CXX_COMPILER}
49+
"CC=${EXPAT_C_COMPILER}"
50+
"CXX=${EXPAT_CXX_COMPILER}"
4451
"CFLAGS=${EXPAT_CFLAGS} -w -DXML_POOR_ENTROPY"
4552
"CXXFLAGS=${EXPAT_CXXFLAGS} -w -DXML_POOR_ENTROPY"
4653
BUILD_COMMAND cd ${EXPAT_SRC_DIR} && make -j ${CPU_COUNT}

cmake/external/googletest.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ ExternalProject_Add(${GTEST_TARGET}
4848
UPDATE_COMMAND ""
4949
CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
5050
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
51+
-DCMAKE_C_COMPILER_LAUNCHER:FILEPATH=${CMAKE_C_COMPILER_LAUNCHER}
52+
-DCMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=${CMAKE_CXX_COMPILER_LAUNCHER}
5153
CMAKE_ARGS ${CMAKE_ARGS}
5254
-DCMAKE_INSTALL_PREFIX=${GTEST_INSTALL_DIR}
5355
-DCMAKE_INSTALL_LIBDIR=lib

cmake/external/libxml2.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ ExternalProject_Add(${LIBXML2_TARGET}
3838
UPDATE_COMMAND ""
3939
CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
4040
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
41+
-DCMAKE_C_COMPILER_LAUNCHER:FILEPATH=${CMAKE_C_COMPILER_LAUNCHER}
42+
-DCMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=${CMAKE_CXX_COMPILER_LAUNCHER}
4143
CMAKE_ARGS -DCMAKE_C_FLAGS=${LIBXML2_CFLAGS} -DCMAKE_CXX_FLAGS=${LIBXML2_CXXFLAGS}
4244
-DCMAKE_INSTALL_PREFIX=${LIBXML2_INSTALL_DIR}
4345
-DCMAKE_INSTALL_LIBDIR=lib

cmake/external/protobuf.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ ExternalProject_Add(${PROTOBUF_TARGET}
7373
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
7474
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
7575
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
76+
-DCMAKE_C_COMPILER_LAUNCHER:FILEPATH=${CMAKE_C_COMPILER_LAUNCHER}
77+
-DCMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=${CMAKE_CXX_COMPILER_LAUNCHER}
7678
-DCMAKE_C_FLAGS=${PROTOBUF_CFLAGS}
7779
-DCMAKE_CXX_FLAGS=${PROTOBUF_CXXFLAGS}
7880
-Dprotobuf_BUILD_TESTS=OFF

0 commit comments

Comments
 (0)