From 31e75ba16517bf4a2e91da689ce46d36536b7699 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 6 Oct 2015 00:34:13 +0200 Subject: [PATCH] [windows] pass -m64 when needed --- tools/cmake/GCCFlags.cmake | 9 +++++++++ tools/cmake/Java.cmake | 9 +-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/cmake/GCCFlags.cmake b/tools/cmake/GCCFlags.cmake index 936283ae57..76e5322e2a 100644 --- a/tools/cmake/GCCFlags.cmake +++ b/tools/cmake/GCCFlags.cmake @@ -177,4 +177,13 @@ if(MINGW) # JNI searches for stdcalls set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--add-stdcall-alias") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--add-stdcall-alias") + + # Specify the data model that we are using (yeah it helps. eg Java) + if(ARCH_32_BITS) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") + else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") + endif() endif() diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 4b8f501f17..46a32270c0 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -35,18 +35,11 @@ target_link_libraries(simgrid-java simgrid) if(WIN32) - exec_program("java -d32 -version" - OUTPUT_VARIABLE IS_32_BITS_JVM) + exec_program("java -d32 -version" OUTPUT_VARIABLE IS_32_BITS_JVM) STRING( FIND ${IS_32_BITS_JVM} "Error" POSITION ) if(NOT ${POSITION} GREATER -1) message(fatal_error "SimGrid can only use Java 64 bits") endif() - -# Already passed to all targets in GCCFlags.cmake -# set_target_properties(simgrid-java PROPERTIES -# LINK_FLAGS "-Wl,--subsystem,windows,--kill-at") -# set_target_properties(surf-java PROPERTIES -# LINK_FLAGS "-Wl,--subsystem,windows,--kill-at") endif() # Rules to build simgrid.jar -- 2.20.1