diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-05-08 13:22:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 22:22:28 -0700 |
| commit | 6c0d8bdd61ba386f10a2f769ad5c933e8eff85be (patch) | |
| tree | 13ed0233e1ede4c372a04023a1259d3a6beec05e | |
| parent | 2e2c07338f13ca358e6cdf1f589f23a1f8df91ae (diff) | |
| download | vcpkg-6c0d8bdd61ba386f10a2f769ad5c933e8eff85be.tar.gz vcpkg-6c0d8bdd61ba386f10a2f769ad5c933e8eff85be.zip | |
[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>
| -rw-r--r-- | ports/glib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glib/portfile.cmake | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 4da1a80a1..b49adf704 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -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) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 871f98d86..e93f07ccb 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -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 diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 7823debc9..80c3c9a1c 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -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) |