diff options
| author | Scott <smasherprog@gmail.com> | 2017-01-29 15:38:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-29 15:38:44 -0800 |
| commit | d1595aca30c03c7bfa13eb433cae6a35e7d87de4 (patch) | |
| tree | 8b32faad57dffc3874ac4f27593a557938a4b6c0 | |
| parent | d776322d2a99aebff6147081e98fac434e6f6dc6 (diff) | |
| download | vcpkg-d1595aca30c03c7bfa13eb433cae6a35e7d87de4.tar.gz vcpkg-d1595aca30c03c7bfa13eb433cae6a35e7d87de4.zip | |
Fixed incorrect naming of files
Reverting the naming to stick with how the FLTK library naturally decided to name their files.
There was an error in the renaming where the incorrect libraries were being renamed. Reverting this fixes build linking issues
| -rw-r--r-- | ports/fltk/portfile.cmake | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index 848096dce..261a03c7f 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -48,25 +48,7 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config) vcpkg_copy_pdbs()
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk_formsd.lib)
- file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk_gld.lib)
- file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk_imagesd.lib)
- file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltkd.lib)
-
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_forms_SHAREDd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_formsd.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_gl_SHAREDd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_gld.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_images_SHAREDd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_imagesd.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_SHAREDd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltkd.lib)
-
- file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/fltk_forms.lib)
- file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/fltk_gl.lib)
- file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/fltk_images.lib)
- file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/fltk.lib)
-
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fltk_forms_SHARED.lib ${CURRENT_PACKAGES_DIR}/lib/fltk_forms.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fltk_gl_SHARED.lib ${CURRENT_PACKAGES_DIR}/lib/fltk_gl.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fltk_images_SHARED.lib ${CURRENT_PACKAGES_DIR}/lib/fltk_images.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fltk_SHARED.lib ${CURRENT_PACKAGES_DIR}/lib/fltk.lib)
+
else()
file(REMOVE_RECURSE
@@ -77,11 +59,6 @@ else() endif()
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_formsd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_forms.lib)
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_gld.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_gl.lib)
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_imagesd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk_images.lib)
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fltkd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fltk.lib)
-
file(INSTALL
|