From 28cb6ae290613e9067f83f023d154e591e42d6da Mon Sep 17 00:00:00 2001
From: navarro <navarro@caraja.(none)>
Date: Wed, 30 May 2012 11:38:26 +0200
Subject: [PATCH] Remove custom_flags and use CFLAGS LDFLAGS

---
 ChangeLog                     | 4 ++++
 buildtools/Cmake/Flags.cmake  | 1 -
 buildtools/Cmake/Option.cmake | 2 +-
 buildtools/Cmake/Pipol.cmake  | 4 ----
 doc/install.doc               | 4 ----
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31f8f51792..b40ea021fc 100644
--- 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.
+ 
+ CMAKE:
+ * Remove option custom_flags. Now use environment variables CFLAGS 
+   and LDFLAGS.
   
  MSG:
  * Add an experimental interface to manipulate VMs. They are mainly
diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 6b5483391d..a17b01581e 100644
--- 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 "${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
diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 6e64b98a02..3e180e389e 100644
--- 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(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")
@@ -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_C_LINK_FLAGS)
diff --git a/buildtools/Cmake/Pipol.cmake b/buildtools/Cmake/Pipol.cmake
index b01c5748d8..75b4e9ceae 100644
--- a/buildtools/Cmake/Pipol.cmake
+++ b/buildtools/Cmake/Pipol.cmake
@@ -8,10 +8,6 @@ IF(pipol_user)
 
 	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)
diff --git a/doc/install.doc b/doc/install.doc
index ce35441cd4..935fc528ef 100644
--- 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 
-	custom_flags 			<flags>
 	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 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)
@@ -135,7 +132,6 @@ enable_jedule 	 		off
 enable_latency_bound_tracking 	off 
 enable_lib_static		off
 CMAKE_INSTALL_PREFIX		/usr/local
-custom_flags			null
 gtnets_path			null
 pipol_user			null
 \endverbatim
-- 
2.20.1