From d4c8ec334d02aea22b90114034f2b8b02e976c5d Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 18 Feb 2010 17:13:14 +0000 Subject: [PATCH] Don't remove file if we can't make them. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7114 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/CPACK/src/CMakeFLEXml.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildtools/CPACK/src/CMakeFLEXml.txt b/buildtools/CPACK/src/CMakeFLEXml.txt index a850309243..80740d50a4 100644 --- a/buildtools/CPACK/src/CMakeFLEXml.txt +++ b/buildtools/CPACK/src/CMakeFLEXml.txt @@ -11,12 +11,10 @@ IF(FLEXML_EXE) set(HAVE_FLEXML 1) ENDIF(FLEXML_EXE) -message("HAVE_FLEX ${HAVE_FLEX}") -message("HAVE_FLEXML ${HAVE_FLEXML}") + if(HAVE_FLEXML AND HAVE_FLEX) - file(REMOVE "${PROJECT_DIRECTORY}/src/gras/DataDesc/ddt_parse.yy.c ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.c ${PROJECT_DIRECTORY}/src/xbt/graphxml.c ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.c ${PROJECT_DIRECTORY}/include/surf/simgrid_dtd.h ${PROJECT_DIRECTORY}/include/xbt/graphxml.h ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.h") + file(REMOVE "${PROJECT_DIRECTORY}/src/gras/DataDesc/ddt_parse.yy.c ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.c ${PROJECT_DIRECTORY}/src/xbt/graphxml.c ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.c ${PROJECT_DIRECTORY}/include/surf/simgrid_dtd.h ${PROJECT_DIRECTORY}/include/xbt/graphxml.h ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.h") - if(HAVE_FLEXML AND HAVE_FLEX) exec_program("${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.l -L ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd" OUTPUT_VARIABLE "FLEX_OK") exec_program("${FLEXML_EXE} --root-tags platform -P surfxml --sysid=simgrid.dtd -H ${PROJECT_DIRECTORY}/include/surf/simgrid_dtd.h -L ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd" OUTPUT_VARIABLE "FLEX_OK") @@ -36,6 +34,8 @@ message("HAVE_FLEXML ${HAVE_FLEXML}") exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/gras/DataDesc/ddt_parse.yy.c -Pgras_ddt_parse_ --noline ${PROJECT_DIRECTORY}/src/gras/DataDesc/ddt_parse.yy.l" OUTPUT_VARIABLE "FLEX_OK") elseif(HAVE_FLEXML AND HAVE_FLEX) + message("HAVE_FLEX ${HAVE_FLEX}") + message("HAVE_FLEXML ${HAVE_FLEXML}") message(FATAL_ERROR "Install flex and flexml before use maintainer mode") endif(HAVE_FLEXML AND HAVE_FLEX) -- 2.20.1