From 7b35a1283bf5dcba4a5367f3989b7ec6e4540763 Mon Sep 17 00:00:00 2001 From: Eleni Vlachopoulou Date: Fri, 16 Jun 2023 22:04:09 +0530 Subject: [PATCH] Updating CMake to select the correct Windows runtime libraries. - Upgrated to 3.15 as minimum version of CMake. - Used CMAKE_MSVC_RUNTIME_LIBRARY instead of CMAKE_C_FLAGS to set MT and MD flags correctly. AMD-Internal: [CPUPL-3559] Change-Id: Ib82821d245b6acaa1399166219168ad2535d8d92 --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1f89a668..4051c79c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ ##Copyright (C) 2022-2023, Advanced Micro Devices, Inc. All rights reserved.## -cmake_minimum_required(VERSION 3.0.0) +cmake_minimum_required(VERSION 3.15.0) project(AOCL-LibBlis-Win C CXX) @@ -260,11 +260,13 @@ endif () include_directories(${PROJECT_SOURCE_DIR}/external/msvc) add_definitions(-D_CRT_SECURE_NO_WARNINGS) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MD ") -#add_definitions(-DBLIS_IS_BUILDING_LIBRARY) -if(NOT BUILD_SHARED_LIBS) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MT ") -add_definitions(-DBLIS_IS_BUILDING_LIBRARY) + +cmake_policy(SET CMP0091 NEW) +if(BUILD_SHARED_LIBS) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") +else() + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + add_definitions(-DBLIS_IS_BUILDING_LIBRARY) endif() if(ENABLE_MULTITHREADING)