From 083c8757544fee48100a1bfadc332c2c07993cd1 Mon Sep 17 00:00:00 2001 From: Gennady Pospelov <g.pospelov@fz-juelich.de> Date: Fri, 27 Sep 2013 12:54:21 +0200 Subject: [PATCH] Hide debian clack staff behind option --- CMakeLists.txt | 12 ----------- cmake/modules/BornAgainCPack.cmake | 34 +++++++++++++++++------------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97b0a6a3e6f..f9497dcf445 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,18 +11,6 @@ option(BORNAGAIN_PYTHON "Build with python support" ON) option(BORNAGAIN_APP "Build test application" ON) option(BORNAGAIN_GUI "Build a graphical user interface" OFF) -#if(NOT BORNAGAIN_PYTHON) -# set(BORNAGAIN_PYTHON ON) -#endif() - -#if(NOT BORNAGAIN_APP) -# set(BORNAGAIN_APP ON) -#endif() - -#if(NOT BORNAGAIN_GUI) -# set(BORNAGAIN_GUI OFF) -#endif() - #--- Path for additional cmake modules --- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) diff --git a/cmake/modules/BornAgainCPack.cmake b/cmake/modules/BornAgainCPack.cmake index 68f7d2aa834..8fd77fa99ad 100644 --- a/cmake/modules/BornAgainCPack.cmake +++ b/cmake/modules/BornAgainCPack.cmake @@ -1,6 +1,6 @@ # file to build installer -option(BUILD_DEBIAN "Build a debian package" ON) +option(BUILD_DEBIAN "Build a debian package" OFF) include(InstallRequiredSystemLibraries) @@ -82,6 +82,7 @@ set(CPACK_SOURCE_IGNORE_FILES ) +if(BUILD_DEBIAN) # parameters to build a debian package set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Marina Ganeva <m.ganeva@fz-juelich.de>") @@ -114,18 +115,20 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}") set(CPACK_DEBIAN_PACKAGE_VERSION 1) set(CPACK_PACKAGE_FILE_NAME "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_DEBIAN_PACKAGE_VERSION}_${CMAKE_SYSTEM_PROCESSOR}") +# write changelog file + # write copyrite file [TODO:] fix the text of copyright file(WRITE "${CMAKE_BINARY_DIR}/copyright" "Copyright (C) 2013 Sceintific Computing at MLZ - + This software is licensed under the terms of the GNU General Public License Version 3. - + Software distributed under the License is distributed on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the GPL for the specific language governing rights and limitations. - + You should have received a copy of the GPL along with this program. If not, go to http://www.gnu.org/licenses/gpl.html or write to the Free Software Foundation, Inc., @@ -137,21 +140,22 @@ License can be found in `/usr/share/common-licenses/GPL-3'.") install(FILES "${CMAKE_BINARY_DIR}/copyright" DESTINATION "share/doc/${CPACK_DEBIAN_PACKAGE_NAME}") -# write changelog file -FIND_PROGRAM(GIT_EXECUTABLE git) -FIND_PROGRAM(GIT2CL_EXECUTABLE git2cl) -IF(GIT_EXECUTABLE AND GIT2CL_EXECUTABLE) + FIND_PROGRAM(GIT_EXECUTABLE git) + FIND_PROGRAM(GIT2CL_EXECUTABLE git2cl) + + if(GIT_EXECUTABLE AND GIT2CL_EXECUTABLE) set(GIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.git") execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${GIT_DIR} log - COMMAND ${GIT2CL_EXECUTABLE} - COMMAND gzip -9 - OUTPUT_FILE "${CMAKE_BINARY_DIR}/changelog.gz") - install(FILES "${CMAKE_BINARY_DIR}/changelog.gz" + COMMAND ${GIT2CL_EXECUTABLE} + COMMAND gzip -9 + OUTPUT_FILE "${CMAKE_BINARY_DIR}/changelog.gz") + install(FILES "${CMAKE_BINARY_DIR}/changelog.gz" DESTINATION "share/doc/${CPACK_DEBIAN_PACKAGE_NAME}") -else() - MESSAGE(STATUS "W: git or git2cl not found. Can't create the debian changelog file.") -ENDIF(GIT_EXECUTABLE AND GIT2CL_EXECUTABLE) + else() + MESSAGE(STATUS "W: git or git2cl not found. Can't create the debian changelog file.") + endif(GIT_EXECUTABLE AND GIT2CL_EXECUTABLE) +endif() # check if such commands are exist -- GitLab