mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 07:47:50 +08:00
93 lines
2.8 KiB
Diff
93 lines
2.8 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
index d3e3365..a20580e 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)
|
||
|
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
|
||
|
OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}"
|
||
|
)
|
||
|
-
|
||
|
-##########################
|
||
|
-# Example Code
|
||
|
-##########################
|
||
|
-ADD_SUBDIRECTORY ( IlmImfExamples )
|
||
|
-
|
||
|
-
|
||
|
-##########################
|
||
|
-# Tests
|
||
|
-##########################
|
||
|
-ADD_SUBDIRECTORY ( IlmImfTest )
|
||
|
-ADD_SUBDIRECTORY ( IlmImfUtilTest )
|
||
|
-ADD_SUBDIRECTORY ( IlmImfFuzzTest )
|
||
|
-
|
||
|
-
|
||
|
-##########################
|
||
|
-# Binaries / Utilities
|
||
|
-##########################
|
||
|
-ADD_SUBDIRECTORY ( exrheader )
|
||
|
-ADD_SUBDIRECTORY ( exrmaketiled )
|
||
|
-ADD_SUBDIRECTORY ( exrstdattr )
|
||
|
-ADD_SUBDIRECTORY ( exrmakepreview )
|
||
|
-ADD_SUBDIRECTORY ( exrenvmap )
|
||
|
-ADD_SUBDIRECTORY ( exrmultiview )
|
||
|
-ADD_SUBDIRECTORY ( exrmultipart )
|
||
|
-
|
||
|
|
||
|
##########################
|
||
|
# Installation
|
||
|
@@ -225,36 +199,3 @@ INSTALL ( FILES
|
||
|
${CMAKE_INSTALL_PREFIX}/include/OpenEXR
|
||
|
)
|
||
|
|
||
|
-# Documentation
|
||
|
-INSTALL ( FILES
|
||
|
- doc/TechnicalIntroduction.pdf
|
||
|
- doc/ReadingAndWritingImageFiles.pdf
|
||
|
- doc/OpenEXRFileLayout.pdf
|
||
|
- doc/MultiViewOpenEXR.pdf
|
||
|
- doc/InterpretingDeepPixels.pdf
|
||
|
- doc/TheoryDeepPixels.pdf
|
||
|
- DESTINATION
|
||
|
- ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${OPENEXR_VERSION}
|
||
|
- )
|
||
|
-
|
||
|
-# Examples
|
||
|
-INSTALL ( FILES
|
||
|
- IlmImfExamples/main.cpp
|
||
|
- IlmImfExamples/drawImage.cpp
|
||
|
- IlmImfExamples/rgbaInterfaceExamples.cpp
|
||
|
- IlmImfExamples/rgbaInterfaceTiledExamples.cpp
|
||
|
- IlmImfExamples/generalInterfaceExamples.cpp
|
||
|
- IlmImfExamples/lowLevelIoExamples.cpp
|
||
|
- IlmImfExamples/previewImageExamples.cpp
|
||
|
- IlmImfExamples/generalInterfaceTiledExamples.cpp
|
||
|
- IlmImfExamples/generalInterfaceTiledExamples.h
|
||
|
- IlmImfExamples/drawImage.h
|
||
|
- IlmImfExamples/rgbaInterfaceExamples.h
|
||
|
- IlmImfExamples/generalInterfaceExamples.h
|
||
|
- IlmImfExamples/rgbaInterfaceTiledExamples.h
|
||
|
- IlmImfExamples/lowLevelIoExamples.h
|
||
|
- IlmImfExamples/previewImageExamples.h
|
||
|
- IlmImfExamples/namespaceAlias.h
|
||
|
- DESTINATION
|
||
|
- ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${OPENEXR_VERSION}/examples
|
||
|
- )
|