A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f403d7b
)
Remove custom_flags and use CFLAGS LDFLAGS
author
navarro
<navarro@caraja.(none)>
Wed, 30 May 2012 09:38:26 +0000
(11:38 +0200)
committer
navarro
<navarro@caraja.(none)>
Wed, 30 May 2012 09:38:53 +0000
(11:38 +0200)
ChangeLog
patch
|
blob
|
history
buildtools/Cmake/Flags.cmake
patch
|
blob
|
history
buildtools/Cmake/Option.cmake
patch
|
blob
|
history
buildtools/Cmake/Pipol.cmake
patch
|
blob
|
history
doc/install.doc
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
31f8f51
..
b40ea02
100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,6
+1,10
@@
SimGrid (3.8) NOT RELEASED; urgency=low
The "SimGrid makes psssshiiiit and jumps into the cloud" release.
SimGrid (3.8) NOT RELEASED; urgency=low
The "SimGrid makes psssshiiiit and jumps into the cloud" release.
+
+ CMAKE:
+ * Remove option custom_flags. Now use environment variables CFLAGS
+ and LDFLAGS.
MSG:
* Add an experimental interface to manipulate VMs. They are mainly
MSG:
* Add an experimental interface to manipulate VMs. They are mainly
diff --git
a/buildtools/Cmake/Flags.cmake
b/buildtools/Cmake/Flags.cmake
index
6b54833
..
a17b015
100644
(file)
--- a/
buildtools/Cmake/Flags.cmake
+++ b/
buildtools/Cmake/Flags.cmake
@@
-42,7
+42,6
@@
endif(enable_msg_deprecated)
set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
# Try to make Mac a bit more complient to open source standards
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
# Try to make Mac a bit more complient to open source standards
diff --git
a/buildtools/Cmake/Option.cmake
b/buildtools/Cmake/Option.cmake
index
6e64b98
..
3e180e3
100644
(file)
--- a/
buildtools/Cmake/Option.cmake
+++ b/
buildtools/Cmake/Option.cmake
@@
-4,7
+4,6
@@
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(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(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
if(NOT CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
@@
-73,3
+72,4
@@
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_SYSROOT)
mark_as_advanced(SED_EXE)
mark_as_advanced(BIBTEX2HTML)
+mark_as_advanced(CMAKE_C_LINK_FLAGS)
diff --git
a/buildtools/Cmake/Pipol.cmake
b/buildtools/Cmake/Pipol.cmake
index
b01c574
..
75b4e9c
100644
(file)
--- a/
buildtools/Cmake/Pipol.cmake
+++ b/
buildtools/Cmake/Pipol.cmake
@@
-8,10
+8,6
@@
IF(pipol_user)
set(CMAKE_OPTIONS " -Wno-dev")
set(CMAKE_OPTIONS " -Wno-dev")
- if(custom_flags)
- set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Dcustom_flags=${custom_flags}")
- endif(custom_flags)
-
if(with_context)
set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Dwith_context=${with_context}")
endif(with_context)
if(with_context)
set(CMAKE_OPTIONS "${CMAKE_OPTIONS} -Dwith_context=${with_context}")
endif(with_context)
diff --git
a/doc/install.doc
b/doc/install.doc
index
ce35441
..
935fc52
100644
(file)
--- a/
doc/install.doc
+++ b/
doc/install.doc
@@
-54,7
+54,6
@@
For Windows :
enable_supernovae ON/OFF or TRUE/FALSE or 1/0
enable_msg_deprecated ON/OFF or TRUE/FALSE or 1/0
enable_print_message ON/OFF or TRUE/FALSE or 1/0
enable_supernovae ON/OFF or TRUE/FALSE or 1/0
enable_msg_deprecated ON/OFF or TRUE/FALSE or 1/0
enable_print_message ON/OFF or TRUE/FALSE or 1/0
- custom_flags <flags>
gtnets_path <path_to_gtnets_directory>
ns3_path <path_to_ns3_directory>
CMAKE_INSTALL_PREFIX <path_to_install_directory>
gtnets_path <path_to_gtnets_directory>
ns3_path <path_to_ns3_directory>
CMAKE_INSTALL_PREFIX <path_to_install_directory>
@@
-101,8
+100,6
@@
For Windows :
\li enable_print_message : When set to true configuration print more debug output.
\li enable_print_message : When set to true configuration print more debug output.
- \li custom_flags : If user wants to use a specific flag during compilation, give here.
-
\li gtnets_path : Path to gtnets install directory (ex /usr)
\li ns3_path : Path to ns3 install directory (ex /usr)
\li gtnets_path : Path to gtnets install directory (ex /usr)
\li ns3_path : Path to ns3 install directory (ex /usr)
@@
-135,7
+132,6
@@
enable_jedule off
enable_latency_bound_tracking off
enable_lib_static off
CMAKE_INSTALL_PREFIX /usr/local
enable_latency_bound_tracking off
enable_lib_static off
CMAKE_INSTALL_PREFIX /usr/local
-custom_flags null
gtnets_path null
pipol_user null
\endverbatim
gtnets_path null
pipol_user null
\endverbatim