From acd99fef229fa1fa16b20cbf83d288430623cbb2 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 4 Feb 2020 14:08:09 +0100 Subject: [PATCH] get my crude hack in MSG to compile on both gcc and clang --- tools/cmake/MakeLib.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake index 38890f4d1c..134366727a 100644 --- a/tools/cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -26,8 +26,13 @@ set_property(TARGET simgrid # Don't complain when we cast (int (*)(int,char**)) into (void(*)(int,char**)) # This will stop when MSG goes away -set_property(SOURCE ${CMAKE_HOME_DIRECTORY}/src/msg/msg_legacy.cpp PROPERTY COMPILE_FLAGS -Wno-error=cast-function-type) -set_property(SOURCE ${CMAKE_HOME_DIRECTORY}/src/msg/msg_process.cpp PROPERTY COMPILE_FLAGS -Wno-error=cast-function-type) +if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set_property(SOURCE ${CMAKE_HOME_DIRECTORY}/src/msg/msg_legacy.cpp PROPERTY COMPILE_FLAGS -Wno-error=bad-function-cast) + set_property(SOURCE ${CMAKE_HOME_DIRECTORY}/src/msg/msg_process.cpp PROPERTY COMPILE_FLAGS -Wno-error=bad-function-cast) +elseif(CMAKE_COMPILER_IS_GNUCXX) + set_property(SOURCE ${CMAKE_HOME_DIRECTORY}/src/msg/msg_legacy.cpp PROPERTY COMPILE_FLAGS -Wno-error=cast-function-type) + set_property(SOURCE ${CMAKE_HOME_DIRECTORY}/src/msg/msg_process.cpp PROPERTY COMPILE_FLAGS -Wno-error=cast-function-type) +endif() add_dependencies(simgrid maintainer_files) -- 2.20.1