Merge pull request #1316 from ApexAI/iox-#1311-fix-cmake-3.23.0-warni…

…ngs-master Iox #1311 fix cmake 3.23.0 warnings master
eclipse-iceoryx · Apr 14, 2022 · d0876ac · d0876ac
2 parents ddac5ce + e645f22
commit d0876ac
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 24 deletions.
diff --git a/cmake/cyclonedds/CMakeLists.txt b/cmake/cyclonedds/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
-# Copyright (c) 2021 by Apex.AI Inc. All rights reserved.
+# Copyright (c) 2021 - 2022 by Apex.AI Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,15 +28,15 @@ if(NOT N EQUAL 0)
     endif()
 endif()
 
-if(DEFINED CMAKE_TOOLCHAIN_FILE)
-    set(TOOLCHAIN_FILE "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
-endif()
-
 set(EXTRA_CMAKE_ARGS)
 if(DEFINED CMAKE_CXX_FLAGS)
     list(APPEND EXTRA_CMAKE_ARGS -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS})
 endif()
 
+if(DEFINED CMAKE_TOOLCHAIN_FILE)
+    list(APPEND EXTRA_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+endif()
+
 # ===== Helpers
 function(fetch_and_install name)
     set(DOWNLOAD_CONFIG_DIR ${CMAKE_BINARY_DIR}/dependencies/${name}/download)
@@ -46,7 +46,7 @@ function(fetch_and_install name)
 
     # Fetch source
     configure_file(${name}.cmake.in ${DOWNLOAD_CONFIG_DIR}/CMakeLists.txt)
-    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${TOOLCHAIN_FILE}" "${DOWNLOAD_CONFIG_DIR}"
+    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${DOWNLOAD_CONFIG_DIR}" "${EXTRA_CMAKE_ARGS}"
         RESULT_VARIABLE result
         WORKING_DIRECTORY ${DOWNLOAD_CONFIG_DIR} )
     if(result)
@@ -70,7 +70,13 @@ function(fetch_and_install name)
     endforeach()
     string( REPLACE ";" " " ADDITIONAL_CMAKE_FLAGS "${ADDITIONAL_CMAKE_FLAGS}")
 
-    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}" "${ADDITIONAL_CMAKE_FLAGS}" "${TOOLCHAIN_FILE}" "${EXTRA_CMAKE_ARGS}"  "${SOURCE_DIR}"
+    set(CYCLONE_BUILD_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}" "${EXTRA_CMAKE_ARGS}" "${SOURCE_DIR}")
+
+    if(NOT ADDITIONAL_CMAKE_FLAGS STREQUAL "")
+        list(APPEND CYCLONE_BUILD_ARGS ${ADDITIONAL_CMAKE_FLAGS})
+    endif()
+
+    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${CYCLONE_BUILD_ARGS}
         RESULT_VARIABLE result
         WORKING_DIRECTORY ${BUILD_DIR} )
     if(result)

diff --git a/cmake/googletest/CMakeLists.txt b/cmake/googletest/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
-# Copyright (c) 2021 by Apex.AI Inc. All rights reserved.
+# Copyright (c) 2021 - 2022 by Apex.AI Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,12 @@ project(googletest-build CXX)
 
 if(BUILD_TEST)
 
+    # set download config, source and build paths
+    set(DOWNLOAD_CONFIG_DIR ${CMAKE_BINARY_DIR}/dependencies/googletest/download)
+    set(SOURCE_DIR ${CMAKE_BINARY_DIR}/dependencies/googletest/src)
+    set(BUILD_DIR ${CMAKE_BINARY_DIR}/dependencies/googletest/build)
+    set(INSTALL_DIR ${CMAKE_BINARY_DIR}/dependencies/install)
+
     include(ProcessorCount)
     ProcessorCount(N)
 
@@ -30,31 +36,31 @@ if(BUILD_TEST)
         endif()
     endif()
 
+
+    set(EXTRA_CMAKE_ARGS)
+    if(DEFINED CMAKE_CXX_FLAGS)
+        list(APPEND EXTRA_CMAKE_ARGS -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS})
+    endif()
+
+    set(GTEST_BUILD_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}" "${EXTRA_CMAKE_ARGS}")
+    set(GTEST_DOWNLOAD_ARGS "${DOWNLOAD_CONFIG_DIR}")
+
     if(WIN32)
-        set(ENABLE_STATIC_DEBUG "-Dgtest_force_shared_crt=ON")
-    endif(WIN32)
+        list(APPEND GTEST_BUILD_ARGS "-Dgtest_force_shared_crt=ON")
+    endif()
 
     if(DEFINED CMAKE_TOOLCHAIN_FILE)
-        set(TOOLCHAIN_FILE "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+        list(APPEND EXTRA_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+        list(APPEND GTEST_DOWNLOAD_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
         set(GTest_DIR ${CMAKE_BINARY_DIR}/dependencies/install/lib/cmake/GTest)
         set(GTest_DIR ${GTest_DIR} CACHE PATH "" FORCE)
     endif()
 
-    set(EXTRA_CMAKE_ARGS)
-    if(DEFINED CMAKE_CXX_FLAGS)
-        list(APPEND EXTRA_CMAKE_ARGS -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS})
-    endif()
-
-    # set download confi, source and build paths
-    set(DOWNLOAD_CONFIG_DIR ${CMAKE_BINARY_DIR}/dependencies/googletest/download)
-    set(SOURCE_DIR ${CMAKE_BINARY_DIR}/dependencies/googletest/src)
-    set(BUILD_DIR ${CMAKE_BINARY_DIR}/dependencies/googletest/build)
-    set(INSTALL_DIR ${CMAKE_BINARY_DIR}/dependencies/install)
 
     # Download and unpack googletest at configure time
     configure_file(googletest.cmake.in ${DOWNLOAD_CONFIG_DIR}/CMakeLists.txt)
 
-    execute_process(COMMAND ${CMAKE_COMMAND} ${ENABLE_STATIC_DEBUG} -G "${CMAKE_GENERATOR}" "${COMPILER_FLAGS}" "${TOOLCHAIN_FILE}" "${DOWNLOAD_CONFIG_DIR}"
+    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${GTEST_DOWNLOAD_ARGS}
         RESULT_VARIABLE result
         WORKING_DIRECTORY ${DOWNLOAD_CONFIG_DIR} )
     if(result)
@@ -81,7 +87,7 @@ if(BUILD_TEST)
         endif()
     endif()
 
-    execute_process(COMMAND ${CMAKE_COMMAND} ${ENABLE_STATIC_DEBUG} -G "${CMAKE_GENERATOR}" "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}" "${TOOLCHAIN_FILE}" "${EXTRA_CMAKE_ARGS}" "${SOURCE_DIR}"
+    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${GTEST_BUILD_ARGS} "${SOURCE_DIR}"
         RESULT_VARIABLE result
         WORKING_DIRECTORY ${BUILD_DIR} )
     if(result)

diff --git a/tools/iceoryx_build_test.sh b/tools/iceoryx_build_test.sh
@@ -293,7 +293,7 @@ if [ "$NO_BUILD" == false ]; then
           -DONE_TO_MANY_ONLY=$ONE_TO_MANY_ONLY_FLAG \
           -DBUILD_SHARED_LIBS=$BUILD_SHARED \
           -DSANITIZE=$SANITIZE_FLAG \
-          -DTEST_WITH_ADDITIONAL_USER=$TEST_ADD_USER "$TOOLCHAIN_FILE" \
+          -DTEST_WITH_ADDITIONAL_USER=$TEST_ADD_USER $TOOLCHAIN_FILE \
           -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS \
           "$WORKSPACE"/iceoryx_meta