Fix 32bit builds on 64bit platforms

christoph2 · Mar 31, 2022 · c498209 · c498209
1 parent 872be36
commit c498209
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/examples/xcpsim/CMakeLists.txt b/examples/xcpsim/CMakeLists.txt
@@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.10)
 project(xcpsim LANGUAGES C)
 
 
-MESSAGE("CMAKE_HOST_SYSTEM_NAME ${CMAKE_HOST_SYSTEM_NAME}")
-MESSAGE("CMAKE_HOST_SYSTEM_VERSION ${CMAKE_HOST_SYSTEM_VERSION}")
+# MESSAGE("CMAKE_HOST_SYSTEM_NAME ${CMAKE_HOST_SYSTEM_NAME}")
+# MESSAGE("CMAKE_HOST_SYSTEM_VERSION ${CMAKE_HOST_SYSTEM_VERSION}")
+# MESSAGE("CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P}")
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
@@ -101,8 +102,8 @@ if (CMAKE_HOST_WIN32)
 elseif(CMAKE_HOST_UNIX)
     add_executable(xcp_sim_eth ${SOURCES} "../../src/tl/eth/linuxeth.c" "../../src/tl/eth/common.c")
     if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-	add_compile_options("-m32")
-	link_libraries("-m32")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
     endif()
     target_compile_definitions(xcp_sim_eth PUBLIC TP_ETHER)
     target_include_directories(xcp_sim_eth PUBLIC ${INCLUDES})
@@ -111,10 +112,6 @@ elseif(CMAKE_HOST_UNIX)
 
     if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "CYGWIN")
 	    add_executable(xcp_sim_can ${SOURCES} "../../src/tl/can/linux_socket_can.c")
-	    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-		add_compile_options("-m32")
-		link_libraries("-m32")
-	    endif()
 	    target_compile_definitions(xcp_sim_can PUBLIC TP_CAN)
 	    target_include_directories(xcp_sim_can PUBLIC ${INCLUDES})
 	    target_link_libraries(xcp_sim_can ${ADD_LIBS})

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -81,9 +81,8 @@ if (WIN32)
 elseif(UNIX)
     add_library(xcp_test SHARED ${SOURCES})
     if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-	#set_target_properties(xcp_test PROPERTIES_COMPILE_FLAGS "-m32" PROPERTIES_LINK_FLAGS "-m32")
-	add_compile_options("-m32")
-	set(STATIC_LIBRARY_OPTIONS "-m32")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
     endif()
     target_compile_definitions(xcp_test PUBLIC TP_ETHER)
     target_include_directories(xcp_test PUBLIC ${INCLUDES})