iox-#1311 Remove CMake warning for cyclonedds

Signed-off-by: Dietrich Krönke <[email protected]>

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) 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,10 +28,6 @@ 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})
@@ -44,9 +40,15 @@ function(fetch_and_install name)
     set(BUILD_DIR ${CMAKE_BINARY_DIR}/dependencies/${name}/build)
     set(INSTALL_DIR ${CMAKE_BINARY_DIR}/dependencies/install)
 
+    set(CYCLONE_DOWNLOAD_ARGS ${ENABLE_STATIC_DEBUG} -G "${CMAKE_GENERATOR}" "${DOWNLOAD_CONFIG_DIR}")
+
+    if(DEFINED CMAKE_TOOLCHAIN_FILE)
+        list(APPEND CYCLONE_DOWNLOAD_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+    endif()
+
     # 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} ${CYCLONE_DOWNLOAD_ARGS}
         RESULT_VARIABLE result
         WORKING_DIRECTORY ${DOWNLOAD_CONFIG_DIR} )
     if(result)
@@ -70,7 +72,17 @@ 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 "${CMAKE_GENERATOR}" "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}" "${ADDITIONAL_CMAKE_FLAGS}" "${SOURCE_DIR}")
+
+    if(ADDITIONAL_CMAKE_FLAGS STREQUAL "")
+        list(APPEND CYCLONE_BUILD_ARGS ${ADDITIONAL_CMAKE_FLAGS})
+    endif()
+
+    if(DEFINED CMAKE_TOOLCHAIN_FILE)
+        list(APPEND EXTRA_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+    endif()
+
+    execute_process(COMMAND ${CMAKE_COMMAND} -G ${CYCLONE_BUILD_ARGS}
         RESULT_VARIABLE result
         WORKING_DIRECTORY ${BUILD_DIR} )
     if(result)