From aca78b998a81a05c39fcec3790a3a284cd0cce25 Mon Sep 17 00:00:00 2001 From: quemy Date: Mon, 27 Aug 2012 09:55:46 +0000 Subject: [PATCH] Fix a minor bug in cmake files git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2725 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/cmake/Config.cmake | 2 +- trunk/eo/CMakeLists.txt | 8 ++++---- trunk/smp/doc/index.h | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/trunk/cmake/Config.cmake b/trunk/cmake/Config.cmake index c98f742e2..9f390e24b 100644 --- a/trunk/cmake/Config.cmake +++ b/trunk/cmake/Config.cmake @@ -53,7 +53,7 @@ endif(SMP) if(INSTALL_TYPE STREQUAL full) set(ENABLE_CMAKE_EXAMPLE "true" CACHE PATH "ParadisEO examples") set(ENABLE_CMAKE_TESTING "true" CACHE PATH "ParadisEO tests") -elseif(INSTALL_TYPE STREQUAL min OR "INSTALL_TYPE" STREQUAL "") +elseif(INSTALL_TYPE STREQUAL min OR NOT DEFINED INSTALL_TYPE) set(ENABLE_CMAKE_EXAMPLE "false" CACHE PATH "ParadisEO examples") set(ENABLE_CMAKE_TESTING "false" CACHE PATH "ParadisEO tests") endif() diff --git a/trunk/eo/CMakeLists.txt b/trunk/eo/CMakeLists.txt index 71005c9d7..9b0050e27 100644 --- a/trunk/eo/CMakeLists.txt +++ b/trunk/eo/CMakeLists.txt @@ -88,7 +88,7 @@ ENDIF (WIN32) ### compilation of examples? ###################################################################################### -SET(ENABLE_CMAKE_EXAMPLE TRUE CACHE BOOL "Enable copy of benchs and parameters file?") +#SET(ENABLE_CMAKE_EXAMPLE TRUE CACHE BOOL "Enable copy of benchs and parameters file?") ###################################################################################### @@ -97,9 +97,9 @@ SET(ENABLE_CMAKE_EXAMPLE TRUE CACHE BOOL "Enable copy of benchs and parameters f ### 4) Test config ###################################################################################### -IF (ENABLE_CMAKE_TESTING) - ENABLE_TESTING() -ENDIF (ENABLE_CMAKE_TESTING) +#IF (ENABLE_CMAKE_TESTING) +# ENABLE_TESTING() +#ENDIF (ENABLE_CMAKE_TESTING) ###################################################################################### diff --git a/trunk/smp/doc/index.h b/trunk/smp/doc/index.h index 96eaba3fc..6e6ae3464 100644 --- a/trunk/smp/doc/index.h +++ b/trunk/smp/doc/index.h @@ -2,7 +2,9 @@ @section Introduction -ParadisEO-SMP for Symmetric MultiProcessing is a module for multicores computations on several algorithms proposed by ParadiseEO. By simply wrapping the algorithms, it allows you to refer only to the API of your algorithm instead of learning a new one. +ParadisEO-SMP for Symmetric MultiProcessing or Shared Memory Parallelism is a module for multicores computations on several algorithms proposed by ParadiseEO. By simply wrapping the algorithms, it allows you to refer only to the API of your algorithm instead of learning a new one. + +Different parallelism models are avaiable such as the Master / Slaves model or the Island Model. @section tutorials Tutorials