mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-29 00:39:00 +08:00
13156b1cf6
* Update alembic to 1.8.3, use imath dependency
* Update git-tree hash
* Various fixes and cleanups
* Update git-tree hash
* Various fixes
* Update git-tree hash
* Experimentally enable all platforms
* Update git-tree hash
* Various improvements
* Update git-tree hash
* Fix x64 Linux build
* Update git-tree hash
* Revert "Fix x64 Linux build"
This reverts commit 154d51fcca.
* Fix x64 Linux build using patch
* Update git-tree hash
* Make HDF5 support optional and disabled by default
* Update git-tree hash
* Fix abcconvert tool
* Use alternative method to fix DLL location, also fixes PDB inclusion
* Update git-tree hash
* Fix supported platforms
* Update git-tree hash
Co-authored-by: chausner <chausner@users.noreply.github.com>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -73,7 +73,7 @@ option(DOCS_PATH
|
|
|
|
# Set static/dynamic build options
|
|
SET(LIB_TYPE STATIC)
|
|
-SET(RUNTIME_INSTALL_DIR lib)
|
|
+SET(RUNTIME_INSTALL_DIR bin)
|
|
SET(LIBRARY_INSTALL_DIR lib)
|
|
SET(ARCHIVE_INSTALL_DIR lib)
|
|
IF (ALEMBIC_SHARED_LIBS)
|
|
diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
|
|
--- a/lib/Alembic/CMakeLists.txt
|
|
+++ b/lib/Alembic/CMakeLists.txt
|
|
@@ -78,12 +78,11 @@ option(DOCS_PATH
|
|
${ZLIB_LIBRARY}
|
|
)
|
|
|
|
-SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
|
|
INSTALL(TARGETS Alembic
|
|
EXPORT AlembicTargets
|
|
- LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
|
|
- ARCHIVE DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
|
|
- RUNTIME DESTINATION ${ALEMBIC_LIB_INSTALL_DIR})
|
|
+ LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}
|
|
+ ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIR}
|
|
+ RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR})
|
|
|
|
#-******************************************************************************
|
|
# PACKAGE EXPORTS
|