endif()
set(warnCXXFLAGS "${warnCFLAGS} -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing")
- if(CMAKE_COMPILER_IS_GNUCXX AND (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.0")))
+ if(CMAKE_COMPILER_IS_GNUCXX AND (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0")))
set(warnCFLAGS "${warnCFLAGS} -Wformat-signedness")
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GCC")
# the one specific to C but refused by C++
set(warnCFLAGS "${warnCFLAGS} -Wmissing-prototypes")
- if(CMAKE_Fotran_COMPILER_ID MATCHES "GCC|PGI")
+ if(CMAKE_Fortran_COMPILER_ID MATCHES "GCC|PGI")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall")
endif()
- if(CMAKE_Fotran_COMPILER_ID MATCHES "Intel")
+ if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -warn all")
endif()
set(CMAKE_JAVA_COMPILE_FLAGS "-Xlint")
set(optCFLAGS "${optCFLAGS} -finline-functions ")
endif()
+# Do not leak the current directory into the binaries
+if(CMAKE_COMPILER_IS_GNUCC)
+ 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 ".")
+ endif()
+ set(optCFLAGS "${optCFLAGS} -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}")
+endif()
+
# Configure LTO
# NOTE, cmake 3.0 has a INTERPROCEDURAL_OPTIMIZATION target
# property for this (http://www.cmake.org/cmake/help/v3.0/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.html)
endif()
endif()
if(enable_lto)
- message("-- LTO seems usable.")
+ message(STATUS "LTO seems usable.")
else()
if(NOT enable_compile_optimizations)
- message("-- LTO disabled: Compile-time optimizations turned off.")
+ message(STATUS "LTO disabled: Compile-time optimizations turned off.")
else()
if(enable_model-checking)
- message("-- LTO disabled when compiling with model-checking.")
+ message(STATUS "LTO disabled when compiling with model-checking.")
else()
- message("-- LTO does not seem usable -- try updating your build chain.")
+ message(STATUS "LTO does not seem usable -- try updating your build chain.")
endif()
endif()
endif()
else()
- message("-- LTO disabled on the command line.")
+ message(STATUS "LTO disabled on the command line.")
endif()
if(enable_lto) # User wants LTO, and it seems usable. Go for it
set(optCFLAGS "${optCFLAGS} -flto ")
set(optCFLAGS "-O0 ")
# But you can still optimize this:
foreach(s
+ src/kernel/lmm/fair_bottleneck.cpp src/kernel/lmm/lagrange.cpp src/kernel/lmm/maxmin.cpp
src/xbt/mmalloc/mm.c
src/xbt/log.c src/xbt/xbt_log_appender_file.c
src/xbt/xbt_log_layout_format.c src/xbt/xbt_log_layout_simple.c
src/xbt/dict.cpp src/xbt/dict_elm.c src/xbt/dict_cursor.c
- src/xbt/dynar.cpp src/xbt/heap.c src/xbt/swag.c
- src/xbt/str.c src src/xbt/snprintf.c
- src/xbt/queue.c
+ src/xbt/dynar.cpp
+ src/xbt/xbt_str.cpp src/xbt/snprintf.c
src/xbt/xbt_os_time.c src/xbt/xbt_os_thread.c
- src/xbt/backtrace_linux.c
+ src/xbt/backtrace_linux.cpp
${MC_SRC_BASE} ${MC_SRC})
set (mcCFLAGS "-O3 -funroll-loops -fno-strict-aliasing")
if(CMAKE_COMPILER_IS_GNUCC)
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 gcov)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -fsanitize=address")
set(TESH_OPTION --enable-sanitizers)
+ try_compile(HAVE_SANITIZE_ADDRESS ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_asan.cpp)
+ try_compile(HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_asan.cpp
+ COMPILE_DEFINITIONS -DCHECK_FIBER_SUPPORT)
+else()
+ set(HAVE_SANITIZE_ADDRESS FALSE CACHE INTERNAL "")
+ set(HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT FALSE CACHE INTERNAL "")
endif()
if(enable_thread_sanitizer)