Skip to content

Commit

Permalink
minor updates
Browse files Browse the repository at this point in the history
  • Loading branch information
strega-nil committed Apr 12, 2022
1 parent daab983 commit a4a58ae
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
8 changes: 2 additions & 6 deletions ports/zeroc-ice/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
endif()
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin")

else(NOT VCPKG_TARGET_IS_WINDOWS)
else() # VCPKG_TARGET_IS_WINDOWS

# Fix project files to prevent nuget restore of dependencies and
# remove hard coded runtime linkage
Expand Down Expand Up @@ -275,7 +275,7 @@ else(NOT VCPKG_TARGET_IS_WINDOWS)

vcpkg_clean_msbuild()

endif(NOT VCPKG_TARGET_IS_WINDOWS)
endif()

# Remove unnecessary static libraries.
file(GLOB PDLIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*")
Expand All @@ -284,9 +284,5 @@ list(FILTER PDLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$")
list(FILTER PRLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$")
file(REMOVE ${PDLIBS} ${PRLIBS})

if(VCPKG_TARGET_IS_OSX AND EXISTS "${CURRENT_PACKAGES_DIR}/.DS_Store")
file(REMOVE "${CURRENT_PACKAGES_DIR}/.DS_Store")
endif()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zeroc-ice RENAME copyright)
6 changes: 3 additions & 3 deletions ports/zeroc-ice/prepare_for_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function(prepare_for_build ICE_SOURCE_DIR)

set(ICE_CPP_MSBUILD_PACKAGES_DIR "${ICE_SOURCE_DIR}/cpp/msbuild/packages")
set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.5.0.7")
if(NOT EXISTS ${ICE_BUILDER_DEST_DIRECTORY})
if(NOT EXISTS "${ICE_BUILDER_DEST_DIRECTORY}")
message("-- Making Ice Builder for MSBuild available")
vcpkg_download_distfile(
ICE_BUILDER_MSBUILD_ARCHIVE
Expand All @@ -54,7 +54,7 @@ function(prepare_for_build ICE_SOURCE_DIR)
)

file(MAKE_DIRECTORY "${ICE_SOURCE_DIR}/cpp/msbuild/packages")
file(RENAME ${ICE_BUILDER_MSBUILD_DIRECTORY} ${ICE_BUILDER_DEST_DIRECTORY})
file(RENAME "${ICE_BUILDER_MSBUILD_DIRECTORY}" "${ICE_BUILDER_DEST_DIRECTORY}")
endif()

endfunction()
endfunction()
2 changes: 1 addition & 1 deletion ports/zeroc-ice/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.",
"homepage": "https://github.com/zeroc-ice/ice",
"license": null,
"supports": "!uwp & !(windows & (arm | arm64)) & !wasm32",
"supports": "!uwp & !(windows & arm) & !wasm32",
"dependencies": [
"bzip2",
"expat",
Expand Down
2 changes: 1 addition & 1 deletion versions/z-/zeroc-ice.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "7b7a2836ffa07e08a43a7aa58b8de996d3902751",
"git-tree": "bdb180069d461c04c1eee1a7937afa63d0ea752b",
"version": "3.7.7",
"port-version": 0
}
Expand Down

0 comments on commit a4a58ae

Please sign in to comment.