Skip to content

[ace] Fix missing cpp files #11713

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
dan-shaw merged 31 commits into from
Jun 3, 2020
Merged

[ace] Fix missing cpp files #11713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
974ae7b
[ace] Update to 6.5.8
jwillemsen Feb 10, 2020
0f88c1a
Address review comments
jwillemsen Feb 11, 2020
411981f
Put back copy step
jwillemsen Feb 11, 2020
0c31b88
Fixed error
jwillemsen Feb 11, 2020
aeec218
ARM should work, let us try it
jwillemsen Feb 11, 2020
d3d5f66
ARM doesn't work yet, so disable it again
jwillemsen Feb 11, 2020
6b22b90
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 2, 2020
4bc796b
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 23, 2020
1162f9a
Add support for vcpkg of ace on MacOSX
jwillemsen Apr 23, 2020
42ed50c
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 24, 2020
751fb81
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Apr 24, 2020
0b96ccf
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 1, 2020
158f002
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 6, 2020
77ab4e6
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 15, 2020
642a4e1
[ace] Add patch to fix Visual Studio 2019 internal compiler error
jwillemsen May 15, 2020
0bcf649
Attempt to fix apply patches
jwillemsen May 15, 2020
73985a0
[ace] Updated baseline for ace, 4 configurations work again with the …
jwillemsen May 15, 2020
5f8ad22
Address review comments
jwillemsen May 18, 2020
0ea23d3
Revised patch for ACE
jwillemsen May 18, 2020
a22f3e1
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 19, 2020
506ebd5
Merge branch 'master' into jwi-ace-659patch
jwillemsen May 19, 2020
e870128
[ace] Add support for uwp
jwillemsen May 19, 2020
b264978
Merge branch 'jwi-ace-659patch'
jwillemsen May 19, 2020
77d7c93
ace now works in all configurations
jwillemsen May 19, 2020
d583340
Removed !uwp and update version
jwillemsen May 19, 2020
6f46b29
Simplified install of copyright file and on windows we always have a …
jwillemsen May 19, 2020
9712200
[ace] resolve merge conflicts
jwillemsen May 27, 2020
ad64f9f
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen May 27, 2020
c406a36
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jwillemsen Jun 2, 2020
1ef8dd1
Install all cpp files, at some point we should try the MPC install su…
jwillemsen Jun 2, 2020
2ff49b3
[ace] Updated version
jwillemsen Jun 2, 2020
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
2 changes: 1 addition & 1 deletion ports/ace/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: ace
Version: 6.5.9-3
Version: 6.5.9-4
Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
Description: The ADAPTIVE Communication Environment

Expand Down
2 changes: 1 addition & 1 deletion ports/ace/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
# that is in the source path and ends in .h, .inl
function(install_includes SOURCE_PATH SUBDIRECTORIES INCLUDE_DIR)
foreach(SUB_DIR ${SUBDIRECTORIES})
file(GLOB HEADER_FILES ${SOURCE_PATH}/${SUB_DIR}/*.h ${SOURCE_PATH}/${SUB_DIR}/*.inl ${SOURCE_PATH}/${SUB_DIR}/*_T.cpp)
file(GLOB HEADER_FILES ${SOURCE_PATH}/${SUB_DIR}/*.h ${SOURCE_PATH}/${SUB_DIR}/*.inl ${SOURCE_PATH}/${SUB_DIR}/*.cpp)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${INCLUDE_DIR}/${SUB_DIR})
endforeach()
endfunction()
Expand Down