Fix CMake config

* Do not expose ZLIB_INCLUDE_DIR to all targets * Fix build with VS 17.10
beutlich · Aug 1, 2024 · c592152 · c592152
1 parent 4bf008d
commit c592152
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Modelica/Resources/BuildProjects/CMake/Modelica_platform.cmake b/Modelica/Resources/BuildProjects/CMake/Modelica_platform.cmake
@@ -74,7 +74,7 @@ function(get_modelica_platform_name_with_compiler_version var)
       set(PLATFORM_PATH_SUFFIX "${PLATFORM_PATH_SUFFIX}/vs2017")
     elseif(MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1930)
       set(PLATFORM_PATH_SUFFIX "${PLATFORM_PATH_SUFFIX}/vs2019")
-    elseif(MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1940)
+    elseif(MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1950)
       set(PLATFORM_PATH_SUFFIX "${PLATFORM_PATH_SUFFIX}/vs2022")
     endif()
   endif()

diff --git a/Modelica/Resources/BuildProjects/CMake/src.cmake b/Modelica/Resources/BuildProjects/CMake/src.cmake
@@ -46,19 +46,16 @@ set(MODELICA_SOURCE_DIR "${MODELICA_RESOURCES_DIR}/C-Sources")
 if(MODELICA_BUILD_ZLIB)
   set(ZLIB_INCLUDE_DIR "${MODELICA_SOURCE_DIR}/zlib")
   file(TO_CMAKE_PATH ${ZLIB_INCLUDE_DIR} ZLIB_INCLUDE_DIR)
-  include_directories(${ZLIB_INCLUDE_DIR})
 elseif(DEFINED ZLIB_INCLUDE_DIR)
   if(NOT ZLIB_INCLUDE_DIR STREQUAL "")
     file(TO_CMAKE_PATH ${ZLIB_INCLUDE_DIR} ZLIB_INCLUDE_DIR)
-    include_directories(${ZLIB_INCLUDE_DIR})
   else()
     message(FATAL_ERROR "ZLIB_INCLUDE_DIR is an empty string.")
   endif()
 else()
   set(ZLIB_INCLUDE_DIR "" CACHE PATH "Include directory of the zlib.h header file")
   if(NOT ZLIB_INCLUDE_DIR STREQUAL "")
     file(TO_CMAKE_PATH ${ZLIB_INCLUDE_DIR} ZLIB_INCLUDE_DIR)
-    include_directories(${ZLIB_INCLUDE_DIR})
   else()
     message(FATAL_ERROR "ZLIB_INCLUDE_DIR is an empty string.")
   endif()
@@ -144,6 +141,7 @@ 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)
+target_include_directories(ModelicaMatIO PRIVATE ${ZLIB_INCLUDE_DIR})
 if(MSVC)
   target_compile_options(ModelicaMatIO PRIVATE /wd4267)
 endif()