diff options
| author | Kim Christensen <kimworking@gmail.com> | 2018-03-10 12:36:22 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-10 03:36:22 -0800 |
| commit | b7daa881f5941f7b4aaf7d8ad667b5a761c9b4cc (patch) | |
| tree | 23178ed2884e855425b35a1943470e23f497e987 /ports/openexr/CMakeLists.txt.patch | |
| parent | 667f34314f8a6edcb01c1bba72a9dc07ccd6a21c (diff) | |
| download | vcpkg-b7daa881f5941f7b4aaf7d8ad667b5a761c9b4cc.tar.gz vcpkg-b7daa881f5941f7b4aaf7d8ad667b5a761c9b4cc.zip | |
Update OpenExr to 2.2.1 (#2931)
Diffstat (limited to 'ports/openexr/CMakeLists.txt.patch')
| -rw-r--r-- | ports/openexr/CMakeLists.txt.patch | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/ports/openexr/CMakeLists.txt.patch b/ports/openexr/CMakeLists.txt.patch index bb0d003ef..0ee0110d5 100644 --- a/ports/openexr/CMakeLists.txt.patch +++ b/ports/openexr/CMakeLists.txt.patch @@ -1,27 +1,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d3e3365..a20580e 100644 +index 8c0a385..887ddf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -152,13 +152,13 @@ FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h " - IF (HAVE_GCC_INLINE_ASM_AVX) - FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 1\n" ) - ENDIF() -- -+ - IF (HAVE_SYSCONF_NPROCESSORS_ONLN) +@@ -157,8 +157,8 @@ IF (HAVE_SYSCONF_NPROCESSORS_ONLN) FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1\n" ) ENDIF() -- + -SET (OPENEXR_LIBSUFFIX "") -SET (ILMBASE_LIBSUFFIX "") -+ +SET (OPENEXR_LIBSUFFIX "" CACHE STRING "Default suffix for OpenEXR") +SET (ILMBASE_LIBSUFFIX "" CACHE STRING "Default suffix for ILMBase") IF (NAMESPACE_VERSIONING) SET ( OPENEXR_LIBSUFFIX "-${OPENEXR_VERSION_API}" ) # assume same NAMESPACE_VERSION setting for IlmBase for now @@ -188,32 +188,6 @@ SET_TARGET_PROPERTIES ( IlmImfUtil - SOVERSION 22 + SOVERSION 23 OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}" ) - @@ -53,10 +46,11 @@ index d3e3365..a20580e 100644 ########################## # Installation -@@ -225,36 +199,3 @@ INSTALL ( FILES +@@ -224,37 +198,3 @@ INSTALL ( FILES + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenEXR ) - +- -# Documentation -INSTALL ( FILES - doc/TechnicalIntroduction.pdf |