Skip to content

Commit 3288983

Browse files
committed
shared heap 32 bit platform unit test
1 parent 6405cc2 commit 3288983

1 file changed

Lines changed: 18 additions & 9 deletions

File tree

tests/unit/CMakeLists.txt

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
2020

2121
if(WAMR_BUILD_TARGET STREQUAL "X86_32")
2222
# 1) Force -m32
23-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "" FORCE)
24-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "" FORCE)
25-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" CACHE STRING "" FORCE)
23+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "" FORCE)
24+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "" FORCE)
25+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" CACHE STRING "" FORCE)
2626
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32" CACHE STRING "" FORCE)
2727

2828
# 2) Make CMake prefer i386 libraries
29-
set(CMAKE_SYSTEM_PROCESSOR i386 CACHE STRING "" FORCE)
30-
set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu" CACHE STRING "" FORCE)
29+
set(CMAKE_SYSTEM_PROCESSOR i386 CACHE STRING "" FORCE)
30+
set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu" CACHE STRING "" FORCE)
3131
endif()
3232

3333
# Prevent overriding the parent project's compiler/linker
@@ -36,12 +36,21 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
3636

3737
# Fetch Google test
3838
include (FetchContent)
39-
FetchContent_Declare (
39+
40+
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
41+
FetchContent_Declare (
42+
googletest
43+
URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
44+
DOWNLOAD_EXTRACT_TIMESTAMP ON
45+
)
46+
else()
47+
FetchContent_Declare (
4048
googletest
4149
URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
42-
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
43-
)
44-
FetchContent_MakeAvailable (googletest)
50+
)
51+
endif()
52+
53+
FetchContent_MakeAvailable(googletest)
4554

4655
SET(GOOGLETEST_INCLUDED 1)
4756

0 commit comments

Comments
 (0)