From 1ec8d223cb8dd77f62d26c4b9f49d792d5216a53 Mon Sep 17 00:00:00 2001 From: MiguelBarro <45819833+MiguelBarro@users.noreply.github.com> Date: Tue, 18 May 2021 07:31:07 +0200 Subject: [PATCH] Upgrade installer to support cmake linking statically or dynamically to Fast-DDS (#46) * [11561] Add a FASTDDS_STATIC CMake variable to link statically to the binary deployment Signed-off-by: Miguel Barro * [11561] Addressing reviewer's comments Signed-off-by: Miguel Barro --- foonathan_memory-config.cmake | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/foonathan_memory-config.cmake b/foonathan_memory-config.cmake index fd982da..c551211 100644 --- a/foonathan_memory-config.cmake +++ b/foonathan_memory-config.cmake @@ -12,23 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -if(MSVC_VERSION EQUAL 1900) - if(CMAKE_CL_64) - include( - "${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-x64Win64VS2015/cmake/foonathan_memory-config.cmake") - else() - include( - "${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-i86Win32VS2015/cmake/foonathan_memory-config.cmake") - endif() -elseif(MSVC_VERSION LESS 1920) - if(CMAKE_CL_64) - include( - "${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-x64Win64VS2017/cmake/foonathan_memory-config.cmake") - else() - include( - "${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-i86Win32VS2017/cmake/foonathan_memory-config.cmake") - endif() -elseif(MSVC_VERSION GREATER_EQUAL 1920) +if(MSVC_VERSION LESS_EQUAL 1900) + message(FATAL_ERROR "Visual Studio version ${MSVC_VERSION} is no longer supported") +else() if(CMAKE_CL_64) include( "${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-x64Win64VS2019/cmake/foonathan_memory-config.cmake") @@ -36,6 +22,4 @@ elseif(MSVC_VERSION GREATER_EQUAL 1920) include( "${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-i86Win32VS2019/cmake/foonathan_memory-config.cmake") endif() -else() - message(FATAL_ERROR "Not supported version of Visual Studio") endif()