Skip to content

Ace build windows #22832

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
ras0219-msft merged 4 commits into from
Jan 28, 2022
Merged

Ace build windows #22832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1323583
Fix Build Windows - include files not copied correctly to target
Jan 27, 2022
ca39588
Update versions
Jan 27, 2022
c373a04
install_includes requires quotes on windows
Jan 28, 2022
47a1dac
Update ace.json
Jan 28, 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
12 changes: 6 additions & 6 deletions ports/ace/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
# headers are public and which not. For the moment we install everything
# that is in the source path and ends in .h, .inl
function(install_includes ORIGINAL_PATH RELATIVE_PATHS)
foreach(RELATIVE_PATH "${RELATIVE_PATHS}")
foreach(RELATIVE_PATH ${RELATIVE_PATHS})
file(
GLOB
HEADER_FILES
Expand Down Expand Up @@ -196,7 +196,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
"ace/os_include/net"
"ace/os_include/netinet"
"ace/os_include/sys")
install_includes("${SOURCE_COPY_PATH}" ${ACE_INCLUDE_FOLDERS})
install_includes("${SOURCE_COPY_PATH}" "${ACE_INCLUDE_FOLDERS}")

if("ssl" IN_LIST FEATURES)
install_includes("${SOURCE_COPY_PATH}" "ace/SSL")
Expand All @@ -205,11 +205,11 @@ if(VCPKG_TARGET_IS_WINDOWS)
if("tao" IN_LIST FEATURES)
set(ACEXML_INCLUDE_FOLDERS "ACEXML/apps/svcconf" "ACEXML/common"
"ACEXML/parser/parser")
install_includes("${SOURCE_COPY_PATH}" ${ACEXML_INCLUDE_FOLDERS})
install_includes("${SOURCE_COPY_PATH}" "${ACEXML_INCLUDE_FOLDERS}")

set(ACE_PROTOCOLS_INCLUDE_FOLDERS "ace/HTBP" "ace/INet" "ace/RMCast"
"ace/TMCast")
install_includes("${SOURCE_COPY_PATH}/protocols" ${ACE_PROTOCOLS_INCLUDE_FOLDERS})
install_includes("${SOURCE_COPY_PATH}/protocols" "${ACE_PROTOCOLS_INCLUDE_FOLDERS}")

install_includes("${SOURCE_COPY_PATH}" "Kokyu")

Expand Down Expand Up @@ -245,11 +245,11 @@ if(VCPKG_TARGET_IS_WINDOWS)
if("ssl" IN_LIST FEATURES)
list(APPEND TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/SSLIOP")
endif()
install_includes("${SOURCE_COPY_PATH}/TAO/orbsvcs" ${TAO_ORBSVCS_INCLUDE_FOLDERS})
install_includes("${SOURCE_COPY_PATH}/TAO/orbsvcs" "${TAO_ORBSVCS_INCLUDE_FOLDERS}")

set(TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/FT_ReplicationManager"
"orbsvcs/Notify_Service")
install_includes("${SOURCE_COPY_PATH}/TAO" ${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS})
install_includes("${SOURCE_COPY_PATH}/TAO" "${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS}")

set(TAO_INCLUDE_FOLDERS
"tao"
Expand Down
1 change: 1 addition & 0 deletions ports/ace/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "ace",
"version": "7.0.6",
"port-version": 1,
"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": "cac33553b152f59e730715fcc1bae263bb037862",
"version": "7.0.6",
"port-version": 1
},
{
"git-tree": "c851425112d4af710db29d482e43a15ade7ee463",
"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": 0
"port-version": 1
},
"activemq-cpp": {
"baseline": "3.9.5",
Expand Down