From c480f36dd4bf349592a8aca13b0856b1f7e20cfc Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Thu, 28 Mar 2019 10:58:58 +0100
Subject: [PATCH] Finally managed to switch to all static for OpenEXR
---
cmake/macros/TargetOpenEXR.cmake | 11 ++++-------
cmake/ports/openexr/portfile.cmake | 6 +++---
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/cmake/macros/TargetOpenEXR.cmake b/cmake/macros/TargetOpenEXR.cmake
index 6a8690db58..6d01ef9bda 100644
--- a/cmake/macros/TargetOpenEXR.cmake
+++ b/cmake/macros/TargetOpenEXR.cmake
@@ -41,8 +41,8 @@ macro(TARGET_OPENEXR)
# using both versioned and unversioned names.
find_library(OPENEXR_${OPENEXR_LIB}_LIBRARY_RELEASE
NAMES
- ${OPENEXR_LIB}-${OPENEXR_MAJOR_VERSION}_${OPENEXR_MINOR_VERSION}
- ${OPENEXR_LIB}
+ ${OPENEXR_LIB}-${OPENEXR_MAJOR_VERSION}_${OPENEXR_MINOR_VERSION}_s
+ ${OPENEXR_LIB}_s
PATHS ${VCPKG_INSTALL_ROOT}/lib NO_DEFAULT_PATH
)
@@ -56,8 +56,8 @@ macro(TARGET_OPENEXR)
# using both versioned and unversioned names.
find_library(OPENEXR_${OPENEXR_LIB}_LIBRARY_DEBUG
NAMES
- ${OPENEXR_LIB}-${OPENEXR_MAJOR_VERSION}_${OPENEXR_MINOR_VERSION}_d
- ${OPENEXR_LIB}_d
+ ${OPENEXR_LIB}-${OPENEXR_MAJOR_VERSION}_${OPENEXR_MINOR_VERSION}_s_d
+ ${OPENEXR_LIB}_s_d
PATHS ${VCPKG_INSTALL_ROOT}/debug/lib NO_DEFAULT_PATH
)
@@ -68,8 +68,5 @@ macro(TARGET_OPENEXR)
endforeach(OPENEXR_LIB)
target_link_libraries(${TARGET_NAME} ${OPENEXR_LIBRARIES})
- if (WIN32)
- target_compile_definitions(${TARGET_NAME} PUBLIC OPENEXR_DLL)
- endif(WIN32)
endif()
endmacro()
diff --git a/cmake/ports/openexr/portfile.cmake b/cmake/ports/openexr/portfile.cmake
index c0a162ab30..72e1edb3e7 100644
--- a/cmake/ports/openexr/portfile.cmake
+++ b/cmake/ports/openexr/portfile.cmake
@@ -12,8 +12,8 @@ vcpkg_from_github(
PATCHES "fix_install_ilmimf.patch"
)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OPENEXR_STATIC)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPENEXR_SHARED)
+set(OPENEXR_STATIC ON)
+set(OPENEXR_SHARED OFF)
vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -58,7 +58,7 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${EXECUTABLE_SUFFIX})
vcpkg_copy_pdbs()
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if (OPENEXR_STATIC)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()