From: degomme <augustin.degomme@unibas.ch>
Date: Tue, 28 Jun 2016 15:06:05 +0000 (+0200)
Subject: Options should be set up at the beginning, before being used ..
X-Git-Tag: v3_14~842
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1e8e640903983d32e50be2b56be4e68ddc248184?ds=sidebyside

Options should be set up at the beginning, before being used ..
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1093c6826..e60e45a1eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,8 +60,12 @@ if(APPLE AND (CMAKE_C_COMPILER_VERSION VERSION_LESS "4.6"))
   set(HAVE_UCONTEXT_H 0)
 endif()
 
+
+### Setup Options
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake)
+
 ### SMPI vs. Fortran
-if (NOT DEFINED enable_smpi OR enable_smpi) 
+if ((NOT DEFINED enable_smpi) OR enable_smpi) 
   if(enable_fortran)
     include(FindGFortran)
   else()
@@ -173,8 +177,7 @@ endif()
 
 include_directories(${INCLUDES})
 
-### Setup Options
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake)
+
 
 ### Determine the assembly flavor that we need today
 set(HAVE_RAW_CONTEXTS 0)