From 9d7262107a92d24724918e52b10594535a70d4a0 Mon Sep 17 00:00:00 2001 From: Thomas Beutlich Date: Sat, 27 Jan 2024 11:13:04 +0100 Subject: [PATCH] Fix cygwin build --- Modelica/Resources/BuildProjects/CMake/src.cmake | 5 +++-- Modelica/Resources/BuildProjects/CMake/test.cmake | 13 +++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Modelica/Resources/BuildProjects/CMake/src.cmake b/Modelica/Resources/BuildProjects/CMake/src.cmake index d2a999b0d6..6df47a0b5c 100644 --- a/Modelica/Resources/BuildProjects/CMake/src.cmake +++ b/Modelica/Resources/BuildProjects/CMake/src.cmake @@ -36,7 +36,8 @@ if(HAVE_FTELLO64) endif() if(UNIX) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-attributes -fno-delete-null-pointer-checks") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -Wno-attributes -fno-delete-null-pointer-checks") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3 -Wno-attributes -fno-delete-null-pointer-checks") elseif(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS /W3) endif() @@ -138,7 +139,7 @@ endif() if(MODELICA_DUMMY_FUNCTION_USERTAB OR BUILD_TESTING) target_compile_definitions(ModelicaStandardTables PRIVATE -DDUMMY_FUNCTION_USERTAB=1) endif() -if(MODELICA_BUILD_ZLIB AND (HAVE_WINAPIFAMILY_H OR HAVE_IO_H)) +if(MODELICA_BUILD_ZLIB AND (HAVE_WINAPIFAMILY_H OR HAVE_IO_H) AND NOT CYGWIN) target_compile_definitions(zlib PRIVATE -DWINAPI_FAMILY=100) endif() target_compile_definitions(ModelicaMatIO PRIVATE -DHAVE_ZLIB=1) diff --git a/Modelica/Resources/BuildProjects/CMake/test.cmake b/Modelica/Resources/BuildProjects/CMake/test.cmake index b323b62fa8..0e7c61019e 100644 --- a/Modelica/Resources/BuildProjects/CMake/test.cmake +++ b/Modelica/Resources/BuildProjects/CMake/test.cmake @@ -16,13 +16,18 @@ if(BUILD_TESTING) ) foreach(TEST ${MODELICA_TESTS}) add_executable(Test${TEST} "${ABSOLUTE_MODELICA_TEST_SOURCE_DIR}/${TEST}.c") - target_link_libraries(Test${TEST} ModelicaExternalC ModelicaStandardTables ModelicaIO ModelicaMatIO zlib) + target_link_libraries(Test${TEST} ModelicaExternalC ModelicaStandardTables ModelicaIO ModelicaMatIO) + if(MODELICA_BUILD_ZLIB) + target_link_libraries(Test${TEST} zlib) + else() + target_link_libraries(Test${TEST} z) + endif() add_test(NAME Test${TEST} COMMAND Test${TEST} WORKING_DIRECTORY "${ABSOLUTE_MODELICA_TEST_SOURCE_DIR}") endforeach() else() message(WARNING - " Testsuite not found in \"${ABSOLUTE_MODELICA_TEST_SOURCE_DIR}\"." - " Set BUILD_TESTING to OFF to silence this warning." - ) + " Testsuite not found in \"${ABSOLUTE_MODELICA_TEST_SOURCE_DIR}\"." + " Set BUILD_TESTING to OFF to silence this warning." + ) endif() endif()