From da0549b32150d45477f514e4350c4e9e88b345cb Mon Sep 17 00:00:00 2001 From: pifopi Date: Mon, 8 Sep 2025 13:10:59 +0200 Subject: [PATCH] Simplify cmake --- SerialPrograms/CMakeLists.txt | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 950f8994ef..3870f6d30d 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -2498,9 +2498,8 @@ if (WIN32) add_library(OpenCV_lib IMPORTED UNKNOWN) target_include_directories(SerialPrograms SYSTEM PRIVATE ../3rdParty/opencv-4.11.0/) set_target_properties(OpenCV_lib PROPERTIES - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/opencv_world4110.lib - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/opencv_world4110d.lib) - set_target_properties(OpenCV_lib PROPERTIES + IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/opencv_world4110.lib + IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/opencv_world4110d.lib MAP_IMPORTED_CONFIG_DEBUG DEBUG MAP_IMPORTED_CONFIG_RELEASE RELEASE MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE @@ -2510,31 +2509,18 @@ if (WIN32) add_library(ONNX_lib IMPORTED UNKNOWN) target_include_directories(SerialPrograms SYSTEM PRIVATE ../3rdParty/ONNX/) set_target_properties(ONNX_lib PROPERTIES - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/onnxruntime.lib - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/onnxruntime.lib) - set_target_properties(ONNX_lib PROPERTIES - MAP_IMPORTED_CONFIG_DEBUG DEBUG - MAP_IMPORTED_CONFIG_RELEASE RELEASE - MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE - MAP_IMPORTED_CONFIG_MINSIZEREL RELEASE + IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/onnxruntime.lib ) add_library(ONNX_Providers_lib IMPORTED UNKNOWN) set_target_properties(ONNX_Providers_lib PROPERTIES - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/onnxruntime_providers_shared.lib - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/onnxruntime_providers_shared.lib) - set_target_properties(ONNX_Providers_lib PROPERTIES - MAP_IMPORTED_CONFIG_DEBUG DEBUG - MAP_IMPORTED_CONFIG_RELEASE RELEASE - MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE - MAP_IMPORTED_CONFIG_MINSIZEREL RELEASE + IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/onnxruntime_providers_shared.lib ) add_library(dpp_lib IMPORTED UNKNOWN) set_target_properties(dpp_lib PROPERTIES - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/dpp.lib - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/dppd.lib) - set_target_properties(dpp_lib PROPERTIES + IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/dpp.lib + IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/dppd.lib MAP_IMPORTED_CONFIG_DEBUG DEBUG MAP_IMPORTED_CONFIG_RELEASE RELEASE MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE @@ -2544,9 +2530,8 @@ if (WIN32) add_library(discord_lib IMPORTED UNKNOWN) target_include_directories(SerialPrograms SYSTEM PRIVATE ../3rdParty/discord_social_sdk_win/) set_target_properties(discord_lib PROPERTIES - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk_win/lib/release/discord_partner_sdk.lib - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk_win/lib/debug/discord_partner_sdk.lib) - set_target_properties(discord_lib PROPERTIES + IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk_win/lib/release/discord_partner_sdk.lib + IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk_win/lib/debug/discord_partner_sdk.lib MAP_IMPORTED_CONFIG_DEBUG DEBUG MAP_IMPORTED_CONFIG_RELEASE RELEASE MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE