diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-08-22 01:29:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 01:29:59 -0700 |
| commit | de0501f18704cbafea7f82a641d96e93deafcfa3 (patch) | |
| tree | ec78c2d3c89798977fe6cea3971dc5256b882147 | |
| parent | 5d331ed5538b36d040e90fdd96a70fa606fe597a (diff) | |
| download | vcpkg-de0501f18704cbafea7f82a641d96e93deafcfa3.tar.gz vcpkg-de0501f18704cbafea7f82a641d96e93deafcfa3.zip | |
[sfml][imgui-sfml] Push SFML_STATIC_LIBRARIES setting into `sfml` (#11800)
| -rw-r--r-- | ports/imgui-sfml/CONTROL | 4 | ||||
| -rw-r--r-- | ports/imgui-sfml/portfile.cmake | 14 | ||||
| -rw-r--r-- | ports/sfml/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sfml/portfile.cmake | 4 |
4 files changed, 6 insertions, 18 deletions
diff --git a/ports/imgui-sfml/CONTROL b/ports/imgui-sfml/CONTROL index ee43509de..a792691ad 100644 --- a/ports/imgui-sfml/CONTROL +++ b/ports/imgui-sfml/CONTROL @@ -1,5 +1,5 @@ Source: imgui-sfml -Version: 2.1-1 +Version: 2.1-2 Homepage: https://github.com/eliasdaler/imgui-sfml Description: ImGui binding for use with SFML -Build-Depends: sfml, imgui +Build-Depends: sfml, imgui, opengl diff --git a/ports/imgui-sfml/portfile.cmake b/ports/imgui-sfml/portfile.cmake index d283a2624..aedb31ced 100644 --- a/ports/imgui-sfml/portfile.cmake +++ b/ports/imgui-sfml/portfile.cmake @@ -13,23 +13,9 @@ vcpkg_from_github( 004-fix-find-sfml.patch ) -if (VCPKG_TARGET_IS_WINDOWS) - file(GLOB SFML_DYNAMIC_LIBS "${CURRENT_INSTALLED_DIR}/bin/sfml-*") -else() - file(GLOB SFML_DYNAMIC_LIBS "${CURRENT_INSTALLED_DIR}/bin/libsfml-*") -endif() - -if (SFML_DYNAMIC_LIBS) - set(SFML_STATIC OFF) -else() - set(SFML_STATIC ON) -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DSFML_STATIC_LIBRARIES=${SFML_STATIC} ) vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index 836280f8b..d126e395e 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -1,6 +1,6 @@ Source: sfml Version: 2.5.1 -Port-Version: 8 +Port-Version: 9 Homepage: https://github.com/sfml/sfml Description: Simple and fast multimedia library Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index 82f6e11d1..0a028db19 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -33,9 +33,11 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SFML) vcpkg_copy_pdbs() +FILE(READ ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake SFML_CONFIG) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - FILE(READ ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake SFML_CONFIG) FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake "set(SFML_STATIC_LIBRARIES true)\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Freetype)\n${SFML_CONFIG}") +else() + FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake "set(SFML_STATIC_LIBRARIES false)\n${SFML_CONFIG}") endif() # move sfml-main to manual link dir |