X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a97de8c98502af9f74cfceb924fa02e0fd80925..6236235ea0bc673b3c361cdb8075b6d622c0e84a:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e0141146f..d783249ebe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,9 +4,6 @@ if(WIN32)
   SET(CMAKE_RC_COMPILER "windres")
 endif()
 project(SimGrid C)
-if (enable_gtnets OR enable_ns3 OR enable_model-checking)
-  enable_language(CXX)
-endif()
 
 enable_language(CXX)
 
@@ -42,12 +39,6 @@ if (NOT DEFINED enable_smpi OR enable_smpi) # smpi is enabled by default
   enable_language(Fortran OPTIONAL)
 endif()
 
-set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
-set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
-set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
-set(CMAKE_C_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE)
-set(CMAKE_Fortran_FLAGS "" CACHE TYPE INTERNAL FORCE)
-set(CMAKE_Fortran_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE)
 ## Mapping version number -> version name
 # 3.5.99 -> alpha1 (oops)
 # 3.5.9{1,2} -> beta{1,2}
@@ -198,7 +189,9 @@ if(WIN32)
   if(NSIS_WIN_VERSION MATCHES "")
     set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITECTURE})
   endif()
-  string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION)
+  if(${NSIS_WIN_VERSION})
+    string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION)
+  endif()
 
   set(_XBT_WIN32 1)