@@ -13,14 +13,14 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
13
13
14
14
if (WAMR_BUILD_TARGET STREQUAL "X86_32" )
15
15
# 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 )
19
19
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32" CACHE STRING "" FORCE )
20
20
21
21
# 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 )
24
24
endif ()
25
25
26
26
# Prevent overriding the parent project's compiler/linker
@@ -29,19 +29,21 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
29
29
30
30
# Fetch Google test
31
31
include (FetchContent )
32
+
32
33
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24" )
33
34
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
37
38
)
38
39
else ()
39
40
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
42
43
)
43
44
endif ()
44
- FetchContent_MakeAvailable (googletest )
45
+
46
+ FetchContent_MakeAvailable (googletest )
45
47
46
48
SET (GOOGLETEST_INCLUDED 1 )
47
49
0 commit comments