Browse Source

hmm github actions cmake complains where my didn't

Alec Jacobson 2 years ago
parent
commit
74f2f0e1e7
2 changed files with 6 additions and 4 deletions
  1. 4 2
      cmake/recipes/external/gmp.cmake
  2. 2 2
      cmake/recipes/external/mpfr.cmake

+ 4 - 2
cmake/recipes/external/gmp.cmake

@@ -20,16 +20,18 @@ else()
   # https://gitlab.kitware.com/cmake/cmake/-/issues/20989
   # https://gitlab.kitware.com/cmake/cmake/-/issues/20989
   if(APPLE)
   if(APPLE)
     # https://gmplib.org/list-archives/gmp-discuss/2020-November/006607.html
     # https://gmplib.org/list-archives/gmp-discuss/2020-November/006607.html
-    if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" AND ${CMAKE_OSX_ARCHITECTURES} STREQUAL "arm64")
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
       set(gmp_BUILD "x86_64-apple-darwin")
       set(gmp_BUILD "x86_64-apple-darwin")
       set(gmp_HOST "arm64-apple-darwin")
       set(gmp_HOST "arm64-apple-darwin")
       set(gmp_CFLAGS "--target=arm64-apple-darwin")
       set(gmp_CFLAGS "--target=arm64-apple-darwin")
       set(gmp_LDFLAGS "-arch arm64")
       set(gmp_LDFLAGS "-arch arm64")
-    elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64" AND ${CMAKE_OSX_ARCHITECTURES} STREQUAL "x86_64")
+      message(STATUS "GMP Recipe notices building on ${gmp_BUILD} for ${gmp_HOST}")
+    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" AND CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
       set(gmp_HOST "x86_64-apple-darwin")
       set(gmp_HOST "x86_64-apple-darwin")
       set(gmp_BUILD "arm64-apple-darwin")
       set(gmp_BUILD "arm64-apple-darwin")
       set(gmp_CFLAGS "--target=x86_64-apple-darwin13.0.0")
       set(gmp_CFLAGS "--target=x86_64-apple-darwin13.0.0")
       set(gmp_LDFLAGS "")
       set(gmp_LDFLAGS "")
+      message(STATUS "GMP Recipe notices building on ${gmp_HOST} for ${gmp_BUILD}")
     endif()
     endif()
   endif()
   endif()
 
 

+ 2 - 2
cmake/recipes/external/mpfr.cmake

@@ -17,12 +17,12 @@ else()
   # Praying this will work the same as gmp
   # Praying this will work the same as gmp
   if(APPLE)
   if(APPLE)
     # https://gmplib.org/list-archives/gmp-discuss/2020-November/006607.html
     # https://gmplib.org/list-archives/gmp-discuss/2020-November/006607.html
-    if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" AND ${CMAKE_OSX_ARCHITECTURES} STREQUAL "arm64")
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
       set(mpfr_BUILD "x86_64-apple-darwin")
       set(mpfr_BUILD "x86_64-apple-darwin")
       set(mpfr_HOST "arm64-apple-darwin")
       set(mpfr_HOST "arm64-apple-darwin")
       set(mpfr_CFLAGS "--target=arm64-apple-darwin")
       set(mpfr_CFLAGS "--target=arm64-apple-darwin")
       set(mpfr_LDFLAGS "-arch arm64")
       set(mpfr_LDFLAGS "-arch arm64")
-    elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64" AND ${CMAKE_OSX_ARCHITECTURES} STREQUAL "x86_64")
+    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" AND CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
       set(mpfr_HOST "x86_64-apple-darwin")
       set(mpfr_HOST "x86_64-apple-darwin")
       set(mpfr_BUILD "arm64-apple-darwin")
       set(mpfr_BUILD "arm64-apple-darwin")
       set(mpfr_CFLAGS "--target=x86_64-apple-darwin13.0.0")
       set(mpfr_CFLAGS "--target=x86_64-apple-darwin13.0.0")