From 414707c9189742245677536b5242b39c28fab01f Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 15 Apr 2010 10:12:34 +0000 Subject: [PATCH] Some make command were unvailable if they were launch out of project Directory. Now fixed. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7590 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/src/CMakeDistrib.txt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt index 1a76c577e0..8f8807bbbb 100644 --- a/buildtools/Cmake/src/CMakeDistrib.txt +++ b/buildtools/Cmake/src/CMakeDistrib.txt @@ -147,18 +147,18 @@ WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc" add_custom_target(dist COMMAND make package -COMMAND rm -rf ${PROJECT_DIRECTORY}/_CPack_Packages -WORKING_DIRECTORY "${PROJECT_DIRECTORY}" +COMMAND rm -rf _CPack_Packages +#WORKING_DIRECTORY "${PROJECT_DIRECTORY}" ) add_custom_target(distcheck COMMAND make package -COMMAND rm -rf ${PROJECT_DIRECTORY}/_CPack_Packages +COMMAND rm -rf _CPack_Packages COMMAND tar xvf ${CPACK_PACKAGE_FILE_NAME}.tar.bz2 -COMMAND cd ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} && cmake . -COMMAND cd ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} && make -COMMAND cd ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} && make test -COMMAND rm -rf ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} -WORKING_DIRECTORY "${PROJECT_DIRECTORY}" +COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && cmake . +COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && make +COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && make test +COMMAND rm -rf ${CPACK_PACKAGE_FILE_NAME} +#WORKING_DIRECTORY "${PROJECT_DIRECTORY}" ) add_custom_target(maintainer-clean @@ -238,6 +238,5 @@ COMMAND make java-clean COMMAND make doc-clean COMMAND make supernovae-clean COMMAND make maintainer-clean -WORKING_DIRECTORY "${PROJECT_DIRECTORY}" ) include(CPack) -- 2.20.1