The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 1ede4a51d3887a351fdb54560b460f4917497556 Author: Vincent van Ravesteijn <v...@lyx.org> Date: Thu Apr 25 21:18:41 2013 +0200 CPack: Do not use CPACK_SET_DESTDIR on Windows diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake index 4f9091b..61d15b0 100644 --- a/development/cmake/LyxPackaging.cmake +++ b/development/cmake/LyxPackaging.cmake @@ -32,9 +32,11 @@ FILE(STRINGS "${TOP_CMAKE_PATH}/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMA set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${LYX_INSTALL_SUFFIX}") -# -# needed by rpm -set(CPACK_SET_DESTDIR "ON") +if (NOT WIN32) + # needed by rpm + set(CPACK_SET_DESTDIR "ON") +endif() + FILE(READ "${TOP_CMAKE_PATH}/LyX_license.txt" CPACK_RPM_PACKAGE_LICENSE) set(CPACK_RPM_PACKAGE_GROUP "Applications/Publishing") set(CPACK_RPM_PACKAGE_VENDOR "The LyX team") ----------------------------------------------------------------------- Summary of changes: development/cmake/LyxPackaging.cmake | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository