diff options
| author | eao197 <eao197@gmail.com> | 2018-05-30 19:25:16 +0300 |
|---|---|---|
| committer | eao197 <eao197@gmail.com> | 2018-05-30 19:25:16 +0300 |
| commit | 99eb78cf2dd8b000ac195dd9ebba4fb344dc5baa (patch) | |
| tree | 18072db815a8f417c4d63a00ae95286642f0dff3 /ports/openexr | |
| parent | 34257a50ceda0bfa05e59b532f71223b70f39d52 (diff) | |
| parent | 842252373992a9c7b74f041607b47754d61cc0c8 (diff) | |
| download | vcpkg-99eb78cf2dd8b000ac195dd9ebba4fb344dc5baa.tar.gz vcpkg-99eb78cf2dd8b000ac195dd9ebba4fb344dc5baa.zip | |
Merge https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports/openexr')
| -rw-r--r-- | ports/openexr/fix-static-linking.patch | 14 | ||||
| -rw-r--r-- | ports/openexr/portfile.cmake | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ports/openexr/fix-static-linking.patch b/ports/openexr/fix-static-linking.patch new file mode 100644 index 000000000..af2f067f1 --- /dev/null +++ b/ports/openexr/fix-static-linking.patch @@ -0,0 +1,14 @@ +diff --git a/IlmImf/CMakeLists.txt b/IlmImf/CMakeLists.txt +index 18d90edc..21bbaa27 100644 +--- a/IlmImf/CMakeLists.txt ++++ b/IlmImf/CMakeLists.txt +@@ -25,8 +25,8 @@ ADD_EXECUTABLE ( dwaLookups + + TARGET_LINK_LIBRARIES ( dwaLookups + Half +- Iex${ILMBASE_LIBSUFFIX} + IlmThread${ILMBASE_LIBSUFFIX} ++ Iex${ILMBASE_LIBSUFFIX} + ${PTHREAD_LIB} + ) + diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index 7e3b6603f..b02a487a9 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/add-missing-export.patch" "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-static-linking.patch" ) # Ensure helper executables can run during build @@ -20,7 +21,7 @@ set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin") # In debug build buildsystem cannot locate IlmBase headers set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG}") -set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -I\"${CURRENT_INSTALLED_DIR}/include/OpenExr\"") +set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -I\"${CURRENT_INSTALLED_DIR}/include/OpenEXR\"") vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA |