Propagate user's cmake generator setting (#9442)

This commit propagates user's (or default) cmake generator setting to
external build setting.

External build project identifiers also changed for CI maintenance.

Signed-off-by: Cheongyo Bahk <ch.bahk@samsung.com>

diff --git a/infra/cmake/modules/ExternalBuildTools.cmake b/infra/cmake/modules/ExternalBuildTools.cmake
index 8e54e2d..e76cd6b 100644 (file)
--- a/infra/cmake/modules/ExternalBuildTools.cmake
+++ b/infra/cmake/modules/ExternalBuildTools.cmake
@@ -48,6 +48,7 @@ function(ExternalBuild_CMake)
   file(WRITE "${BUILD_STAMP_PATH}" "${PKG_IDENTIFIER}")
 
   execute_process(COMMAND ${CMAKE_COMMAND}
+                            -G "${CMAKE_GENERATOR}"
                             -DCMAKE_INSTALL_PREFIX=${ARG_INSTALL_DIR}
                             -DCMAKE_BUILD_TYPE=Release
                             -DCMAKE_CXX_FLAGS=${ARG_BUILD_FLAGS}

diff --git a/infra/cmake/packages/FlatBuffersConfig.cmake b/infra/cmake/packages/FlatBuffersConfig.cmake
index 4eb957c..ab0b770 100644 (file)
--- a/infra/cmake/packages/FlatBuffersConfig.cmake
+++ b/infra/cmake/packages/FlatBuffersConfig.cmake
@@ -25,7 +25,7 @@ function(_FlatBuffers_build)
                       BUILD_DIR   ${CMAKE_BINARY_DIR}/externals/FLATBUFFERS/build
                       INSTALL_DIR ${EXT_OVERLAY_DIR}
                       BUILD_FLAGS ${ADDITIONAL_CXX_FLAGS}
-                      IDENTIFIER  "1.10"
+                      IDENTIFIER  "1.10-fix1"
                       PKG_NAME    "FLATBUFFERS")
 
 endfunction(_FlatBuffers_build)

diff --git a/infra/cmake/packages/GTestConfig.cmake b/infra/cmake/packages/GTestConfig.cmake
index 87eb8d5..62a15e0 100644 (file)
--- a/infra/cmake/packages/GTestConfig.cmake
+++ b/infra/cmake/packages/GTestConfig.cmake
@@ -13,7 +13,7 @@ function(_GTest_build)
   ExternalBuild_CMake(CMAKE_DIR   ${GTestSource_DIR}
                       BUILD_DIR   ${CMAKE_BINARY_DIR}/externals/GTEST/build
                       INSTALL_DIR ${EXT_OVERLAY_DIR}
-                      IDENTIFIER  "1.8.0"
+                      IDENTIFIER  "1.8.0-fix1"
                       PKG_NAME    "GTEST")
 
 endfunction(_GTest_build)

diff --git a/infra/cmake/packages/ProtobufConfig.cmake b/infra/cmake/packages/ProtobufConfig.cmake
index dee0c33..349caab 100644 (file)
--- a/infra/cmake/packages/ProtobufConfig.cmake
+++ b/infra/cmake/packages/ProtobufConfig.cmake
@@ -58,7 +58,7 @@ function(_Protobuf_build)
                       INSTALL_DIR ${EXT_OVERLAY_DIR}
                       BUILD_FLAGS -fPIC
                       EXTRA_OPTS  -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_WITH_ZLIB=OFF
-                      IDENTIFIER  "3.5.2"
+                      IDENTIFIER  "3.5.2-fix1"
                       PKG_NAME    "PROTOBUF")
 
 endfunction(_Protobuf_build)