From 9573107aa45efb630217d7cca020b40eef58595f Mon Sep 17 00:00:00 2001 From: fatene Date: Mon, 2 Feb 2009 10:23:52 +0000 Subject: [PATCH] Assure compatibility with cmake 2.4 Avoid using STRING(STRIP ) if the current version is cmake 2.4 git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1380 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-peo/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/trunk/paradiseo-peo/CMakeLists.txt b/trunk/paradiseo-peo/CMakeLists.txt index 60dce0a36..03c830cc7 100644 --- a/trunk/paradiseo-peo/CMakeLists.txt +++ b/trunk/paradiseo-peo/CMakeLists.txt @@ -26,7 +26,13 @@ EXECUTE_PROCESS(COMMAND ${XML2_CONFIG_PROGRAM} --cflags OUTPUT_VARIABLE XML2_CF # set libxml2 libs in XML2_LIBSINCLUDE(FindLibXml2) EXECUTE_PROCESS(COMMAND ${XML2_CONFIG_PROGRAM} --libs OUTPUT_VARIABLE XML2_LIBS) -STRING(STRIP ${XML2_LIBS} XML2_LIBS) +IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) + STRING(STRIP ${XML2_LIBS} XML2_LIBS) +ELSEIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + STRING(REGEX REPLACE "^ " "" XML2_LIBS ${XML2_LIBS}) + STRING(REGEX REPLACE "( +)$" "" XML2_LIBS ${XML2_LIBS}) +ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) + ######################################################################################