Skip to content

Ace Build Windows - Missing files in include package #22880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strega-nil-ms merged 8 commits into from
Feb 3, 2022
Merged

Ace Build Windows - Missing files in include package #22880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7405732
Windows build - Missing quotes around TAO_INCLUDE_FOLDERS
Jan 31, 2022
9dd37ef
Change version
Feb 1, 2022
33a7aa9
Revert "Change version"
Feb 1, 2022
4e8fd7d
Update vcpkg.json
Feb 1, 2022
2a929c3
Change Versions
Feb 1, 2022
5161b44
Revert "Change Versions"
Feb 1, 2022
f23222a
Missing quotes in call to install_includes
Feb 1, 2022
30630da
Change versions
Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/ace/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
if("zlib" IN_LIST FEATURES)
list(APPEND TAO_INCLUDE_FOLDERS "tao/Compression/zlib")
endif()
install_includes("${SOURCE_COPY_PATH}/TAO" ${TAO_INCLUDE_FOLDERS})
install_includes("${SOURCE_COPY_PATH}/TAO" "${TAO_INCLUDE_FOLDERS}")
endif()

if("xml" IN_LIST FEATURES)
Expand All @@ -306,7 +306,7 @@ if(VCPKG_TARGET_IS_WINDOWS)

set(ACEXML_INCLUDE_FOLDERS "ACEXML/common"
"ACEXML/parser/parser")
install_includes("${SOURCE_COPY_PATH}" ${ACEXML_INCLUDE_FOLDERS})
install_includes("${SOURCE_COPY_PATH}" "${ACEXML_INCLUDE_FOLDERS}")
endif()

# Remove dlls without any export
Expand Down
2 changes: 1 addition & 1 deletion ports/ace/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ace",
"version": "7.0.6",
"port-version": 1,
"port-version": 2,
"maintainers": "Johnny Willemsen <jwillemsen@remedy.nl>",
"description": "The ADAPTIVE Communication Environment",
"homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/ace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0ad9c09c1663f5264f5bf5dcbe1d402618973144",
"version": "7.0.6",
"port-version": 2
},
{
"git-tree": "cac33553b152f59e730715fcc1bae263bb037862",
"version": "7.0.6",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"ace": {
"baseline": "7.0.6",
"port-version": 1
"port-version": 2
},
"activemq-cpp": {
"baseline": "3.9.5",
Expand Down