From 0a3fbc715568e6f29ea11f93e54e7e9cd8587340 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 16 Oct 2024 17:58:49 +0200 Subject: [PATCH] cmake: fixup --- patches/highs-v1.7.2.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/patches/highs-v1.7.2.patch b/patches/highs-v1.7.2.patch index ce5b83111a..3914d9c455 100644 --- a/patches/highs-v1.7.2.patch +++ b/patches/highs-v1.7.2.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index aa593028..01f04d6f 100644 +index aa593028..8103fef8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,19 +100,19 @@ if (BUILD_CXX) @@ -33,14 +33,15 @@ index aa593028..01f04d6f 100644 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) # for multi-config builds (e.g. msvc) - foreach(OUTPUTCONFIG IN LISTS CMAKE_CONFIGURATION_TYPES) -+ foreach(OutputConfig IN LISTS CMAKE_CONFIGURATION_TYPES) - string(TOLOWER ${OUTPUTCONFIG} OUTPUTCONFIG) +- string(TOLOWER ${OUTPUTCONFIG} OUTPUTCONFIG) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/${OUTPUTCONFIG}) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/${OUTPUTCONFIG}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/${OUTPUTCONFIG}) - # set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR}) - # set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR}) - # set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_BINDIR}) ++ foreach(OutputConfig IN LISTS CMAKE_CONFIGURATION_TYPES) ++ string(TOUPPER ${OutputConfig} OUTPUTCONFIG) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_BINDIR})