diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-22 00:40:31 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-22 00:40:31 -0800 |
| commit | 3c4a4560c6c04b4011a3e3148183359d79ee717b (patch) | |
| tree | e783cb157fc29841b3595f47597b3dbed4d1c40b | |
| parent | 3e36c7bc7f3929c0a5ddbc4de91ed660461a4532 (diff) | |
| download | vcpkg-3c4a4560c6c04b4011a3e3148183359d79ee717b.tar.gz vcpkg-3c4a4560c6c04b4011a3e3148183359d79ee717b.zip | |
[ogre] Fix static builds
| -rw-r--r-- | ports/ogre/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ogre/portfile.cmake | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index 1716ac116..879d78e39 100644 --- a/ports/ogre/CONTROL +++ b/ports/ogre/CONTROL @@ -1,5 +1,5 @@ Source: ogre -Version: 1.10.9 +Version: 1.10.9-1 Build-Depends: freeimage, freetype, zlib, zziplib Description: 3D Object-Oriented Graphics Rendering Engine diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 9ee84f82c..2e604ee58 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -62,6 +62,7 @@ vcpkg_configure_cmake( -DOGRE_STATIC=${OGRE_STATIC} -DOGRE_UNITY_BUILD=OFF -DOGRE_USE_STD11=ON + -DOGRE_CONFIG_THREAD_PROVIDER=std -DOGRE_NODE_STORAGE_LEGACY=OFF -DOGRE_BUILD_RENDERSYSTEM_D3D11=ON -DOGRE_BUILD_RENDERSYSTEM_GL=ON @@ -80,8 +81,22 @@ vcpkg_install_cmake() # Remove unwanted files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/ogre) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(GLOB REL_CFGS ${CURRENT_PACKAGES_DIR}/bin/*.cfg) +file(COPY ${REL_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + +file(GLOB DBG_CFGS ${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg) +file(COPY ${DBG_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + +file(REMOVE ${REL_CFGS} ${DBG_CFGS}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ogre RENAME copyright) |