set(warnCFLAGS "")
set(optCFLAGS "")
+include(CheckCXXCompilerFlag)
+
if(NOT __VISUALC__ AND NOT __BORLANDC__)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-std=gnu99 -g3")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-g3")
+ CHECK_CXX_COMPILER_FLAG("-std=gnu++11" HAVE_CXX11)
+ CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" HAVE_CXX0X)
+ if(HAVE_CXX11)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+ elseif(HAVE_CXX0X)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+ else()
+ message(STATUS "Missing support for C++11.")
+ endif()
+endif()
+
+if(NOT __VISUALC__ AND NOT __BORLANDC__)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -g3")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
if(enable_compile_warnings)
set(warnCFLAGS "-fno-common -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
- if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+ if(CMAKE_COMPILER_IS_GNUCC)
set(warnCFLAGS "${warnCFLAGS}-Wclobbered -Wno-error=clobbered ")
if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
set(warnCFLAGS "${warnCFLAGS}-Wno-error=unused-but-set-variable ")
endif()
+ if(COMPILER_C_VERSION_MAJOR_MINOR STREQUAL "4.6")
+ #some old compilers emit bogus warnings here, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=45978 . Avoid failing the build in this case
+ set(warnCFLAGS "${warnCFLAGS}-Wno-error=array-bounds")
+ endif()
endif()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wunused -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror")
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wclobbered -Wno-error=clobbered")
+ endif()
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall") # FIXME: Q&D hack
endif()
if(enable_compile_optimizations)
- set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
+ set(optCFLAGS "-O3 -funroll-loops -fno-strict-aliasing ")
if(CMAKE_COMPILER_IS_GNUCC AND (NOT enable_model-checking))
+ set(optCFLAGS "${optCFLAGS} -finline-functions ")
if(WIN32)
if (COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.7")
# On windows, we need 4.8 or higher to enable lto because of http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50293
set(optCFLAGS "-O0 ")
endif()
+if(enable_sdt)
+ add_definitions(-DUSE_SDT)
+endif()
+
+if(enable_ust)
+ add_definitions(-DUSE_UST)
+endif()
+
if(enable_model-checking AND enable_compile_optimizations)
# Forget it, do not optimize the code (because it confuses the MC):
set(optCFLAGS "-O0 ")
# But you can still optimize this:
foreach(s
src/xbt/mmalloc/mm.c
- src/xbt/snprintf.c src/xbt/log.c
- src/xbt/dynar.c src/xbt/set.c src/xbt/setset.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.c src/xbt/dict_elm.c src/xbt/dict_multi.c src/xbt/dict_cursor.c
+ src/xbt/set.c src/xbt/setset.c
+ src/xbt/dynar.c src/xbt/fifo.c src/xbt/heap.c src/xbt/swag.c
+ src/xbt/str.c src/xbt/strbuff.c src/xbt/snprintf.c
+ src/xbt/queue.c
+ src/xbt/xbt_os_time.c src/xbt/xbt_os_thread.c
+ src/xbt/sha.c
+ src/xbt/matrix.c
src/xbt/backtrace_linux.c
- src/mc/mc_dwarf_expression.c src/mc/mc_dwarf.c src/mc/mc_member.c
- src/mc/mc_compare.c src/mc/mc_diff.c
- src/mc/mc_snapshot.c src/mc/mc_page_store.cpp src/mc/mc_page_snapshot.cpp
- src/mc/mc_compare.c src/mc/mc_diff.c
- src/mc/mc_dwarf.c src/mc/mc_dwarf_attrnames.h src/mc/mc_dwarf_expression.c src/mc/mc_dwarf_tagnames.h
- src/mc/mc_set.cpp)
- set_source_files_properties(${s} PROPERTIES COMPILE_FLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing")
+ ${MC_SRC_BASE} ${MC_SRC})
+ set (mcCFLAGS "-O3 -funroll-loops -fno-strict-aliasing")
+ if(CMAKE_COMPILER_IS_GNUCC)
+ set (mcCFLAGS "${mcCFLAGS} -finline-functions")
+ endif()
+ set_source_files_properties(${s} PROPERTIES COMPILE_FLAGS ${mcCFLAGS})
endforeach()
endif()
+if(enable_mc_content_adressable_pages)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMC_PAGE_STORE_MD4")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMC_PAGE_STORE_MD4")
+endif()
+
if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
set(optCFLAGS "-O0 ")
if(NOT enable_debug)
set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
+ set(CMAKE_CXX_FLAGS "-DNDEBUG ${CMAKE_CXX_FLAGS}")
endif()
if(enable_msg_deprecated)
set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
endif()
-set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
+set(CMAKE_C_FLAGS "${optCFLAGS} ${warnCFLAGS} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
# Try to make Mac a bit more complient to open source standards
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
endif()
set(TESH_OPTION "")
