From 5578cdb2a6c8647818303e3ee7503762a5e54d58 Mon Sep 17 00:00:00 2001 From: Mark Reid Date: Thu, 15 Dec 2022 18:27:40 -0800 Subject: [PATCH] Fix MSVC Debug build with internal zlib zlib sets CMAKE_DEBUG_POSTFIX to "d" with msvc in debug Signed-off-by: Mark Reid --- cmake/OpenEXRSetup.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmake/OpenEXRSetup.cmake b/cmake/OpenEXRSetup.cmake index b8d9df8e75..975e572f57 100644 --- a/cmake/OpenEXRSetup.cmake +++ b/cmake/OpenEXRSetup.cmake @@ -220,12 +220,19 @@ if(OPENEXR_FORCE_INTERNAL_ZLIB OR NOT TARGET ZLIB::ZLIB) set(zlibstaticlibname "z") endif() + if(MSVC) + set(zlibpostfix "d") + endif() + if(NOT (APPLE OR WIN32) AND BUILD_SHARED_LIBS AND NOT OPENEXR_FORCE_INTERNAL_ZLIB) add_library(zlib_shared SHARED IMPORTED GLOBAL) add_dependencies(zlib_shared zlib_external) set_property(TARGET zlib_shared PROPERTY IMPORTED_LOCATION "${zlib_INTERNAL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${zliblibname}${CMAKE_SHARED_LIBRARY_SUFFIX}" ) + set_property(TARGET zlib_static PROPERTY + IMPORTED_LOCATION_DEBUG "${zlib_INTERNAL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${zliblibname}${zlibpostfix}${CMAKE_SHARED_LIBRARY_SUFFIX}" + ) target_include_directories(zlib_shared INTERFACE "${zlib_INTERNAL_DIR}/include") endif() @@ -234,6 +241,9 @@ if(OPENEXR_FORCE_INTERNAL_ZLIB OR NOT TARGET ZLIB::ZLIB) set_property(TARGET zlib_static PROPERTY IMPORTED_LOCATION "${zlib_INTERNAL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${zlibstaticlibname}${CMAKE_STATIC_LIBRARY_SUFFIX}" ) + set_property(TARGET zlib_static PROPERTY + IMPORTED_LOCATION_DEBUG "${zlib_INTERNAL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${zlibstaticlibname}${zlibpostfix}${CMAKE_STATIC_LIBRARY_SUFFIX}" + ) target_include_directories(zlib_static INTERFACE "${zlib_INTERNAL_DIR}/include") if(NOT (APPLE OR WIN32) AND BUILD_SHARED_LIBS AND NOT OPENEXR_FORCE_INTERNAL_ZLIB)