From 77f46d426b138d2f6031b74799a2dda35ce82d23 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 3 Jun 2020 07:37:10 +0200 Subject: [ace] Fix missing cpp files (#11713) * [ace] Update to 6.5.8 * Address review comments * ports/ace/portfile.cmake: * Put back copy step * ports/ace/portfile.cmake: * Fixed error * ports/ace/portfile.cmake: * ARM should work, let us try it * ports/ace/portfile.cmake: * ARM doesn't work yet, so disable it again * ports/ace/portfile.cmake: * Add support for vcpkg of ace on MacOSX * ports/ace/portfile.cmake: * [ace] Add patch to fix Visual Studio 2019 internal compiler error * ports/ace/process_manager.patch: Added. * ports/ace/CONTROL: * ports/ace/portfile.cmake: * Attempt to fix apply patches * ports/ace/portfile.cmake: * [ace] Updated baseline for ace, 4 configurations work again with the applied patch * scripts/ci.baseline.txt: * Address review comments * ports/ace/portfile.cmake: * Revised patch for ACE * ports/ace/process_manager.patch: * [ace] Add support for uwp * ports/ace/portfile.cmake: * ace now works in all configurations * scripts/ci.baseline.txt: * Removed !uwp and update version * ports/ace/CONTROL: * Simplified install of copyright file and on windows we always have a QoS library * ports/ace/portfile.cmake: * Install all cpp files, at some point we should try the MPC install support on Windows * [ace] Updated version --- ports/ace/CONTROL | 2 +- ports/ace/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 238d607a0..f08239fa5 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -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 diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index a30999e28..3ae540207 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -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() -- cgit v1.2.3