diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/imgui-sfml | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-c828f3634723996e6031fb2e3c3d1ac3f4de0cad.tar.gz vcpkg-c828f3634723996e6031fb2e3c3d1ac3f4de0cad.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'ports/imgui-sfml')
| -rw-r--r-- | ports/imgui-sfml/CONTROL | 4 | ||||
| -rw-r--r-- | ports/imgui-sfml/portfile.cmake | 14 |
2 files changed, 2 insertions, 16 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() |