diff options
| -rw-r--r-- | ports/ace/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ace/portfile.cmake | 24 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
3 files changed, 18 insertions, 9 deletions
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 7bbba7358..f3e7edc82 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,5 +1,5 @@ Source: ace -Version: 6.5.8 +Version: 6.5.8-1 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment Supports: !uwp diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index ee0a0e082..53dfc37e4 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -65,6 +65,8 @@ endif() # Add ace/config.h file # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html if(VCPKG_TARGET_IS_WINDOWS) + set(DLL_RELEASE_SUFFIX .dll) + set(DLL_DEBUG_SUFFIX d.dll) set(LIB_RELEASE_SUFFIX .lib) set(LIB_DEBUG_SUFFIX d.lib) if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") @@ -75,16 +77,25 @@ if(VCPKG_TARGET_IS_WINDOWS) set(SOLUTION_TYPE vc14) endif() file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"") -endif() - -if(VCPKG_TARGET_IS_LINUX) +elseif(VCPKG_TARGET_IS_LINUX) set(DLL_DECORATOR) + set(DLL_RELEASE_SUFFIX .so) + set(DLL_DEBUG_SUFFIX .so) set(LIB_RELEASE_SUFFIX .a) set(LIB_DEBUG_SUFFIX .a) set(LIB_PREFIX lib) set(SOLUTION_TYPE gnuace) file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"") file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU") +elseif(VCPKG_TARGET_IS_OSX) + set(DLL_DECORATOR) + set(DLL_RELEASE_SUFFIX .dylib) + set(DLL_DEBUG_SUFFIX .dylib) + set(LIB_RELEASE_SUFFIX .a) + set(LIB_DEBUG_SUFFIX .a) + set(SOLUTION_TYPE gnuace) + file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"") + file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") endif() # Invoke mwc.pl to generate the necessary solution and project files @@ -135,11 +146,11 @@ if(VCPKG_TARGET_IS_WINDOWS) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) # Install the DLL files file(INSTALL - ${LIB_PATH}/${ACE_LIBRARY}d.dll + ${LIB_PATH}/${ACE_LIBRARY}${DLL_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin ) file(INSTALL - ${LIB_PATH}/${ACE_LIBRARY}.dll + ${LIB_PATH}/${ACE_LIBRARY}${DLL_RELEASE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) endif() @@ -174,8 +185,7 @@ if(VCPKG_TARGET_IS_WINDOWS) # Handle copyright file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace) file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) -else(VCPKG_TARGET_IS_WINDOWS) - # VCPKG_TARGTE_IS_LINUX +elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) FIND_PROGRAM(MAKE make) IF (NOT MAKE) MESSAGE(FATAL_ERROR "MAKE not found") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d8b6fe9f9..66292e4df 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -48,7 +48,6 @@ abseil:arm-uwp=fail # ace is failing because the port's attempt to make yasm available is not succeeding
ace:arm-uwp=fail
ace:arm64-windows=fail
-ace:x64-osx=fail
ace:x64-uwp=fail
ace:x64-windows-static=fail
ace:x64-windows=fail
|