mirror of https://github.com/microsoft/vcpkg.git
[ace] Add android support (#46272)
This commit is contained in:
parent
fb1d2ccc9f
commit
5d8a81e7e2
|
|
@ -63,6 +63,9 @@ vcpkg_find_acquire_program(PERL)
|
|||
get_filename_component(PERL_PATH ${PERL} DIRECTORY)
|
||||
vcpkg_add_to_path("${PERL_PATH}")
|
||||
|
||||
vcpkg_cmake_get_vars(cmake_vars_file)
|
||||
include("${cmake_vars_file}")
|
||||
|
||||
# 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)
|
||||
|
|
@ -87,6 +90,13 @@ elseif(VCPKG_TARGET_IS_OSX)
|
|||
set(SOLUTION_TYPE gnuace)
|
||||
set(config_h_contents "#include \"ace/config-macosx.h\"\n")
|
||||
file(WRITE "${ACE_ROOT}/include/makeinclude/platform_macros.GNU" "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU")
|
||||
elseif (VCPKG_TARGET_IS_ANDROID)
|
||||
set(SOLUTION_TYPE gnuace)
|
||||
set(config_h_contents "#include \"ace/config-android.h\"\n")
|
||||
file(WRITE "${ACE_ROOT}/include/makeinclude/platform_macros.GNU" "include $(ACE_ROOT)/include/makeinclude/platform_android.GNU")
|
||||
set(ENV{ANDROID_ABI} "${VCPKG_DETECTED_CMAKE_ANDROID_ARCH_ABI}")
|
||||
set(ENV{android_ndk} "${VCPKG_DETECTED_CMAKE_ANDROID_NDK}")
|
||||
set(ENV{android_api} "${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}")
|
||||
endif()
|
||||
|
||||
if("wchar" IN_LIST FEATURES)
|
||||
|
|
@ -274,7 +284,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
|
|||
"${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb")
|
||||
endif()
|
||||
endif()
|
||||
elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
|
||||
elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_ANDROID)
|
||||
FIND_PROGRAM(MAKE make)
|
||||
IF (NOT MAKE)
|
||||
MESSAGE(FATAL_ERROR "MAKE not found")
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
{
|
||||
"name": "ace",
|
||||
"version": "8.0.2",
|
||||
"port-version": 1,
|
||||
"maintainers": "Johnny Willemsen <jwillemsen@remedy.nl>",
|
||||
"description": "The ADAPTIVE Communication Environment",
|
||||
"homepage": "https://github.com/DOCGroup/ACE_TAO",
|
||||
"license": "DOC",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake-get-vars",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-msbuild",
|
||||
"host": true,
|
||||
|
|
|
|||
|
|
@ -40,9 +40,6 @@
|
|||
|
||||
# Add new items alphabetically
|
||||
|
||||
ace:arm-neon-android=fail
|
||||
ace:arm64-android=fail
|
||||
ace:x64-android=fail
|
||||
# ada-url requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11.
|
||||
ada-url:x64-linux=fail
|
||||
angelscript:x64-osx=fail
|
||||
|
|
|
|||
|
|
@ -51,7 +51,12 @@ halide = skip
|
|||
llvm = skip
|
||||
|
||||
# Add new items alphabetically
|
||||
ace:x64-windows-static-md=fail
|
||||
ace[tao]:arm-neon-android=feature-fails # tao requires a host tree with tao_idl compiled for the host
|
||||
ace[tao]:arm64-android=feature-fails
|
||||
ace[tao]:x64-android=feature-fails
|
||||
ace[wchar]:arm-neon-android=feature-fails # wchar seems to have a problem in ACE
|
||||
ace[wchar]:arm64-android=feature-fails
|
||||
ace[wchar]:x64-android=feature-fails
|
||||
ada-url:x64-linux=fail # ada-url requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11.
|
||||
allegro5:arm64-windows=fail # Fails with "fatal error LNK1322: cannot avoid potential ARM hazard" even with /Gy
|
||||
apr:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "97982361e15d6df0af15643dc1a94307473b2524",
|
||||
"version": "8.0.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "57c97b8e2001326c195e00a81450911cf8bea389",
|
||||
"version": "8.0.2",
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
},
|
||||
"ace": {
|
||||
"baseline": "8.0.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"acl": {
|
||||
"baseline": "2.3.2",
|
||||
|
|
|
|||
Loading…
Reference in New Issue