From e181a23bed49aa62856db8511de6f9b99f428922 Mon Sep 17 00:00:00 2001 From: jpark37 Date: Fri, 17 Sep 2021 22:10:49 -0700 Subject: [PATCH] UI: Remove NOMINMAX from CMake scripts If we want NOMINMAX globally, we should probably define at top level. --- UI/CMakeLists.txt | 2 -- UI/frontend-plugins/decklink-output-ui/CMakeLists.txt | 1 - UI/frontend-plugins/frontend-tools/CMakeLists.txt | 1 - 3 files changed, 4 deletions(-) diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt index 105824b60..c95d0f87b 100644 --- a/UI/CMakeLists.txt +++ b/UI/CMakeLists.txt @@ -102,8 +102,6 @@ include_directories(${LIBCURL_INCLUDE_DIRS}) add_definitions(${LIBCURL_DEFINITIONS}) if(WIN32) - add_definitions(-DNOMINMAX) - include_directories(${BLAKE2_INCLUDE_DIR}) set(obs_PLATFORM_SOURCES diff --git a/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt b/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt index 8b1cd1cda..6acd8830c 100644 --- a/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt +++ b/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt @@ -42,7 +42,6 @@ set(decklink-ouput-ui_UI ) if(WIN32) - add_definitions(-DNOMINMAX) set(MODULE_DESCRIPTION "OBS DeckLink Output UI") configure_file(${CMAKE_SOURCE_DIR}/cmake/winrc/obs-module.rc.in decklink-ouput-ui.rc) list(APPEND decklink-ouput-ui_SOURCES diff --git a/UI/frontend-plugins/frontend-tools/CMakeLists.txt b/UI/frontend-plugins/frontend-tools/CMakeLists.txt index 40e5404d1..46e628606 100644 --- a/UI/frontend-plugins/frontend-tools/CMakeLists.txt +++ b/UI/frontend-plugins/frontend-tools/CMakeLists.txt @@ -73,7 +73,6 @@ if(SCRIPTING_ENABLED) endif() if(WIN32) - add_definitions(-DNOMINMAX) set(MODULE_DESCRIPTION "OBS Frontend Tools") configure_file(${CMAKE_SOURCE_DIR}/cmake/winrc/obs-module.rc.in frontend-tools.rc) set(frontend-tools_PLATFORM_SOURCES