From d4cc9eac8de46cdf825151cba23a3d44cd346a6e Mon Sep 17 00:00:00 2001 From: jhumeau Date: Fri, 15 Jan 2010 13:13:42 +0000 Subject: [PATCH] ajout d'une variable pour le pass de paradiseo git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1642 331e1502-861f-0410-8da2-ba01fb791d7f --- branches/newMo/CMakeLists.txt | 6 ++++++ branches/newMo/install.cmake | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/branches/newMo/CMakeLists.txt b/branches/newMo/CMakeLists.txt index 9d16f1fa8..868b0a8cd 100644 --- a/branches/newMo/CMakeLists.txt +++ b/branches/newMo/CMakeLists.txt @@ -25,6 +25,12 @@ ENABLE_LANGUAGE(C) ### 1) Include the install configuration file where are defined the main variables ###################################################################################### +IF(NOT DEFINED paradis OR NOT paradis) + MESSAGE(FATAL_ERROR "The \"paradis\" variable must be set on the command line to + give the path of the install configuration file. ") +ENDIF(NOT DEFINED paradis OR NOT paradis) + + INCLUDE(${CMAKE_SOURCE_DIR}/install.cmake) ###################################################################################### diff --git a/branches/newMo/install.cmake b/branches/newMo/install.cmake index 759e3ab95..261b85645 100644 --- a/branches/newMo/install.cmake +++ b/branches/newMo/install.cmake @@ -2,10 +2,6 @@ # 1) ParadisEO install: SIMPLE Configuration ######################################################################################################### -IF(NOT DEFINED paradis OR NOT paradis) - MESSAGE(FATAL_ERROR "The \"paradis\" variable must be set on the command line to - give the path of the install configuration file. ") -ENDIF(NOT DEFINED config OR NOT config) # Here, just specify PARADISEO_DIR : the directory where ParadisEO has been installed SET(PARADISEO_DIR "${paradis}" CACHE PATH "ParadisEO directory" FORCE)