| ... | @@ -705,9 +705,20 @@ target_link_libraries(zigcpp LINK_PUBLIC | ... | @@ -705,9 +705,20 @@ target_link_libraries(zigcpp LINK_PUBLIC |
| 705 | ${CMAKE_THREAD_LIBS_INIT} | 705 | ${CMAKE_THREAD_LIBS_INIT} |
| 706 | ) | 706 | ) |
| 707 | | 707 | |
| | 708 | string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS) |
| | 709 | if(ZIG_HOST_TARGET_OS STREQUAL "darwin") |
| | 710 | set(ZIG_HOST_TARGET_OS "macos") |
| | 711 | elseif(ZIG_HOST_TARGET_OS STREQUAL "sunos") |
| | 712 | set(ZIG_HOST_TARGET_OS "solaris") |
| | 713 | endif() |
| | 714 | |
| 708 | string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" ZIG_HOST_TARGET_ARCH) | 715 | string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" ZIG_HOST_TARGET_ARCH) |
| 709 | if(ZIG_HOST_TARGET_ARCH MATCHES "^i[3-9]86$") | 716 | if(ZIG_HOST_TARGET_ARCH MATCHES "^i[3-9]86$") |
| 710 | set(ZIG_HOST_TARGET_ARCH "x86") | 717 | if (ZIG_HOST_TARGET_OS STREQUAL "solaris") |
| | 718 | set(ZIG_HOST_TARGET_ARCH "x86_64") |
| | 719 | else() |
| | 720 | set(ZIG_HOST_TARGET_ARCH "x86") |
| | 721 | endif() |
| 711 | elseif(ZIG_HOST_TARGET_ARCH STREQUAL "amd64") | 722 | elseif(ZIG_HOST_TARGET_ARCH STREQUAL "amd64") |
| 712 | set(ZIG_HOST_TARGET_ARCH "x86_64") | 723 | set(ZIG_HOST_TARGET_ARCH "x86_64") |
| 713 | elseif(ZIG_HOST_TARGET_ARCH STREQUAL "arm64") | 724 | elseif(ZIG_HOST_TARGET_ARCH STREQUAL "arm64") |
| ... | @@ -727,11 +738,6 @@ if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(hf?)?(eb)?$") | ... | @@ -727,11 +738,6 @@ if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(hf?)?(eb)?$") |
| 727 | endif() | 738 | endif() |
| 728 | string(REGEX REPLACE "^ppc((64)?(le)?)$" "powerpc\\1" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}") | 739 | string(REGEX REPLACE "^ppc((64)?(le)?)$" "powerpc\\1" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}") |
| 729 | | 740 | |
| 730 | string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS) | | |
| 731 | if(ZIG_HOST_TARGET_OS STREQUAL "darwin") | | |
| 732 | set(ZIG_HOST_TARGET_OS "macos") | | |
| 733 | endif() | | |
| 734 | | | |
| 735 | if(MSVC) | 741 | if(MSVC) |
| 736 | set(ZIG_HOST_TARGET_ABI "-msvc") | 742 | set(ZIG_HOST_TARGET_ABI "-msvc") |
| 737 | elseif(MINGW) | 743 | elseif(MINGW) |