[glib] Update the usage of string(TOUPPER ...) (#10856)

* [glib] Update the usage of string(TOUPPER ...)

* Add a newline to the end of the file

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
This commit is contained in:
NancyLi1013 2020-05-08 13:22:28 +08:00 committed by GitHub
parent 2e2c07338f
commit 6c0d8bdd61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions

View File

@ -73,7 +73,7 @@ else()
set(ENV{PCRE_CFLAGS} "-I${PCRE_INCLUDE_DIR}")
set(ENV{MSGFMT} "/bin/echo")
set(ENV{GMSGFMT} "/bin/echo")
string(TOUPPER UPPER_CONFIG "${CMAKE_BUILD_TYPE}")
string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_CONFIG)
set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CONFIG}} -I${PCRE_INCLUDE_DIR}")
set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${UPPER_CONFIG}} -I${PCRE_INCLUDE_DIR}")
if(BUILD_SHARED_LIBS)

View File

@ -1,5 +1,5 @@
Source: glib
Version: 2.52.3-14-5
Version: 2.52.3-14-6
Homepage: https://developer.gnome.org/glib/
Description: Portable, general-purpose utility library.
Build-Depends: zlib, pcre, libffi, gettext, libiconv

View File

@ -50,9 +50,8 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-glib TARGET_PATH share/unofficial-glib)
vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/glib)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/glib)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/glib/COPYING ${CURRENT_PACKAGES_DIR}/share/glib/copyright)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)