X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48296e83ce3ba1fa3658a3a74d10a536e33b3849..a86b6aced59864feeb60cd52458eb9c843536763:/tools/cmake/Flags.cmake diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake index ba2e37fe70..ea131cf6b6 100644 --- a/tools/cmake/Flags.cmake +++ b/tools/cmake/Flags.cmake @@ -14,10 +14,8 @@ set(optCFLAGS "") set(warnCXXFLAGS "") if(enable_compile_warnings) - set(warnCFLAGS "-fno-common -Wall -Wunused -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing") - if(CMAKE_COMPILER_IS_GNUCC) - set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wformat-signedness -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized") - endif() + set(warnCFLAGS "-fno-common -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wno-unused-function -Wno-unused-local-typedefs -Wno-unused-parameter -Wno-strict-aliasing") + if (CMAKE_CXX_COMPILER_ID MATCHES "Intel") # ignore remarks: # 191: type qualifier is meaningless on cast type @@ -31,15 +29,20 @@ if(enable_compile_warnings) # 11003: no IR in object file xxxx; was the source file compiled with xxxx set(warnCFLAGS "${warnCFLAGS} -diag-disable=191,1418,2196,2651,3179 -diag-warning=597,2330,11003") endif() + set(warnCXXFLAGS "${warnCFLAGS}") + + if(CMAKE_COMPILER_IS_GNUCC) + set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wformat-signedness -Wno-error=clobbered -Wno-error=attributes -Wno-error=maybe-uninitialized") + endif() - set(warnCXXFLAGS "${warnCFLAGS} -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing") if(CMAKE_COMPILER_IS_GNUCXX) set(warnCXXFLAGS "${warnCXXFLAGS} -Wclobbered -Wformat-signedness -Wno-error=clobbered -Wno-free-nonheap-object -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0") + # workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81767 + set(warnCXXFLAGS "${warnCXXFLAGS} -Wno-error=unused-variable") + endif() endif() - if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0") - # workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81767 - set(warnCXXFLAGS "${warnCXXFLAGS} -Wno-error=unused-variable") - endif() + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # don't care about class that become struct, avoid issue of empty C structs # size (coming from libunwind.h) @@ -62,7 +65,6 @@ if(enable_compile_warnings) elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -warn all") endif() - set(CMAKE_JAVA_COMPILE_FLAGS "-Xlint") endif() # NDEBUG gives a lot of "initialized but unused variables" errors. Don't die anyway. @@ -102,14 +104,12 @@ endif() # Do not leak the current directory into the binaries if(CMAKE_COMPILER_IS_GNUCC AND NOT enable_coverage) - execute_process(COMMAND realpath --relative-to=${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} - RESULT_VARIABLE RESULT OUTPUT_VARIABLE RELATIVE_SOURCE_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - if(RESULT EQUAL 0) - message(STATUS "Relative source directory is \"${RELATIVE_SOURCE_DIR}\".") - else() - message(WARNING "Failed to find relative source directory. Using \".\".") - set(RELATIVE_SOURCE_DIR ".") + if (CMAKE_VERSION VERSION_LESS "3.20") + file(RELATIVE_PATH RELATIVE_SOURCE_DIR ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}) + else() # cmake >= 3.20 + cmake_path(RELATIVE_PATH CMAKE_SOURCE_DIR BASE_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE RELATIVE_SOURCE_DIR) endif() + message(STATUS "Relative source directory is \"${RELATIVE_SOURCE_DIR}\".") if (CMAKE_C_COMPILER_VERSION VERSION_LESS "8.0") set(optCFLAGS "${optCFLAGS} -fdebug-prefix-map=\"${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}\"") else() @@ -186,7 +186,7 @@ if(enable_model-checking AND enable_compile_optimizations) # But you can still optimize this: set(src_list ${simgrid_sources}) # except... - list(REMOVE_ITEM src_list ${SIMIX_SRC} ${S4U_SRC}) + list(REMOVE_ITEM src_list ${KERNEL_SRC} ${S4U_SRC}) # but... list(APPEND src_list src/kernel/actor/Simcall.cpp) @@ -218,11 +218,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE") endif() -# Avoid a failure seen with gcc 7.2.0 and ns3 3.27 -if(enable_ns3) - set_source_files_properties(src/surf/network_ns3.cpp PROPERTIES COMPILE_FLAGS " -Wno-unused-local-typedef") -endif() - set(TESH_OPTION "") if(enable_coverage) find_program(GCOV_PATH NAMES ENV{GCOV} gcov) @@ -285,27 +280,3 @@ if(NOT $ENV{LDFLAGS} STREQUAL "") message(STATUS "Add LDFLAGS: \"$ENV{LDFLAGS}\" to CMAKE_C_LINK_FLAGS") set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} $ENV{LDFLAGS}") endif() - -if(MINGW) - # http://stackoverflow.com/questions/10452262/create-64-bit-jni-under-windows - # We don't want to ship libgcc_s_seh-1.dll nor libstdc++-6.dll - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") - set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -static-libgcc") - set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS} -static-libgcc -static-libstdc++") - - # 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") - set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -Wl,--add-stdcall-alias") - set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS} -Wl,--add-stdcall-alias") - - # Specify the data model that we are using (yeah it may help Java) - if(CMAKE_SIZEOF_VOID_P EQUAL 4) # 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()