A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use function mergesort against qsort if possible.
[simgrid.git]
/
buildtools
/
Cmake
/
Option.cmake
diff --git
a/buildtools/Cmake/Option.cmake
b/buildtools/Cmake/Option.cmake
index
6e3cbfc
..
b4b671d
100644
(file)
--- a/
buildtools/Cmake/Option.cmake
+++ b/
buildtools/Cmake/Option.cmake
@@
-5,6
+5,7
@@
set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib and include")
set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib and include")
+set(ns3_path ${ns3_path} CACHE PATH "Path to ns3 lib and include")
set(custom_flags ${custom_flags} CACHE FORCE "Customers flags add to cmake_c_flag")
if(NOT CMAKE_INSTALL_PREFIX)
set(custom_flags ${custom_flags} CACHE FORCE "Customers flags add to cmake_c_flag")
if(NOT CMAKE_INSTALL_PREFIX)
@@
-16,11
+17,17
@@
endif(NOT CMAKE_INSTALL_PREFIX)
set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
option(enable_gtnets "Whether gtnets model is activated." on)
set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
option(enable_gtnets "Whether gtnets model is activated." on)
+option(enable_ns3 "Whether ns3 model is activated." off)
option(enable_smpi "This variable set smpi lib." on)
option(enable_smpi "This variable set smpi lib." on)
-option(enable_pcre "Whether the pcre lib is activated." on)
+option(enable_lua "Whether the lua bindings are activated." on)
+set(enable_pcre ${enable_pcre} CACHE FORCE "Whether the pcre lib is activated.")
+if(enable_pcre STREQUAL "")
+ set(enable_pcre "AUTO")
+endif(enable_pcre STREQUAL "")
if(WIN32 OR APPLE)
set(enable_smpi off CACHE TYPE INTERNAL FORCE)
if(WIN32 OR APPLE)
set(enable_smpi off CACHE TYPE INTERNAL FORCE)
+set(enable_lua off CACHE TYPE INTERNAL FORCE)
endif(WIN32 OR APPLE)
option(enable_compile_optimizations "" on)
endif(WIN32 OR APPLE)
option(enable_compile_optimizations "" on)
@@
-35,13
+42,14
@@
option(enable_print_message "Enable print message during config." off)
option(enable_model-checking "" off)
option(enable_lib_static "" off)
option(enable_jedule "Jedule output of SimDAG." off)
option(enable_model-checking "" off)
option(enable_lib_static "" off)
option(enable_jedule "Jedule output of SimDAG." off)
+option(enable_debug "Set NDEBUG flag" on)
if(enable_supernovae AND enable_model-checking)
set(enable_model-checking false CACHE TYPE INTERNAL FORCE)
message("\n\nWith supernovae mode the model checking must be disable.!!!\n\n")
endif(enable_supernovae AND enable_model-checking)
if(enable_supernovae AND enable_model-checking)
set(enable_model-checking false CACHE TYPE INTERNAL FORCE)
message("\n\nWith supernovae mode the model checking must be disable.!!!\n\n")
endif(enable_supernovae AND enable_model-checking)
-mark_as_advanced(PATH_PCRE_LIB)
+
mark_as_advanced(HAVE_SSH)
mark_as_advanced(HAVE_RSYNC)
#mark_as_advanced(enable_coverage)
mark_as_advanced(HAVE_SSH)
mark_as_advanced(HAVE_RSYNC)
#mark_as_advanced(enable_coverage)
@@
-64,11
+72,8
@@
mark_as_advanced(ICONV_PATH)
mark_as_advanced(MAKE_PATH)
mark_as_advanced(SVN)
mark_as_advanced(GIT)
mark_as_advanced(MAKE_PATH)
mark_as_advanced(SVN)
mark_as_advanced(GIT)
-mark_as_advanced(VALGRIND_PATH)
-mark_as_advanced(PATH_PCRE_H)
mark_as_advanced(CMAKE_OSX_ARCHITECTURES)
mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)
mark_as_advanced(CMAKE_OSX_SYSROOT)
mark_as_advanced(SED_EXE)
mark_as_advanced(BIBTEX2HTML)
mark_as_advanced(CMAKE_OSX_ARCHITECTURES)
mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)
mark_as_advanced(CMAKE_OSX_SYSROOT)
mark_as_advanced(SED_EXE)
mark_as_advanced(BIBTEX2HTML)
-mark_as_advanced(enable_pcre)
\ No newline at end of file