@@ -13,14 +13,14 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
1313
1414if (WAMR_BUILD_TARGET STREQUAL "X86_32" )
1515 # 1) Force -m32
16- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "" FORCE )
17- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "" FORCE )
18- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" CACHE STRING "" FORCE )
16+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "" FORCE )
17+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "" FORCE )
18+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" CACHE STRING "" FORCE )
1919 set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32" CACHE STRING "" FORCE )
2020
2121 # 2) Make CMake prefer i386 libraries
22- set (CMAKE_SYSTEM_PROCESSOR i386 CACHE STRING "" FORCE )
23- set (CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu" CACHE STRING "" FORCE )
22+ set (CMAKE_SYSTEM_PROCESSOR i386 CACHE STRING "" FORCE )
23+ set (CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu" CACHE STRING "" FORCE )
2424endif ()
2525
2626# Prevent overriding the parent project's compiler/linker
@@ -29,19 +29,21 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
2929
3030# Fetch Google test
3131include (FetchContent )
32+
3233if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24" )
3334 FetchContent_Declare (
34- googletest
35- URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
36- DOWNLOAD_EXTRACT_TIMESTAMP ON
35+ googletest
36+ URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
37+ DOWNLOAD_EXTRACT_TIMESTAMP ON
3738 )
3839else ()
3940 FetchContent_Declare (
40- googletest
41- URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
41+ googletest
42+ URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
4243 )
4344endif ()
44- FetchContent_MakeAvailable (googletest)
45+
46+ FetchContent_MakeAvailable (googletest)
4547
4648SET (GOOGLETEST_INCLUDED 1)
4749
0 commit comments