From 1e8e640903983d32e50be2b56be4e68ddc248184 Mon Sep 17 00:00:00 2001 From: degomme Date: Tue, 28 Jun 2016 17:06:05 +0200 Subject: [PATCH 1/1] Options should be set up at the beginning, before being used .. --- CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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) -- 2.20.1