[Debichem-commits] [SCM] massXpert mass spectrometry suite: debian packaging branch, debian, updated. upstream/3.2.0-1-g5564507

Filippo Rusconi (Debian Maintainer) rusconi-debian at laposte.net
Thu Nov 24 21:27:16 UTC 2011


The following commit has been merged in the debian branch:
commit de298387f2b82f86b2742c4ae38a5352dec21d9c
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Mon Sep 21 12:00:18 2009 +0200

    Improved build system to build by default the binary and the data (no user manual;  Thanks to Pere Constans for reporting.).

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1b9602..822bda3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,17 +82,23 @@ ENDIF (APPLE)
 # Note that if BUILD_ALL = 1 then all of the BUILD_PROGRAM, BUILD_DATA or
 # BUILD_USERMANUAL are defined to 1 and everything is built.
 
-IF (${BUILD_ALL})
+IF (BUILD_ALL)
   SET (BUILD_PROGRAM 1)
   SET (BUILD_DATA 1)
   SET (BUILD_USERMANUAL 1)
-ENDIF (${BUILD_ALL})
+ENDIF (BUILD_ALL)
 
-IF (${BUILD_RESET})
+IF (BUILD_RESET)
   SET (BUILD_PROGRAM 0)
   SET (BUILD_DATA 0)
   SET (BUILD_USERMANUAL 0)
-ENDIF (${BUILD_RESET})
+ENDIF (BUILD_RESET)
+
+IF (NOT BUILD_PROGRAM AND NOT BUILD_DATA AND NOT BUILD_USERMANUAL)
+  SET (BUILD_PROGRAM 1)
+  SET (BUILD_DATA 1)
+  SET (BUILD_USERMANUAL 0)
+ENDIF (NOT BUILD_PROGRAM AND NOT BUILD_DATA AND NOT BUILD_USERMANUAL)
 
 
 #############################################################
@@ -100,9 +106,6 @@ ENDIF (${BUILD_RESET})
 # BUILD OF THE PROGRAM
 
 IF (${BUILD_PROGRAM})
-  
-  MESSAGE (STATUS "BUILD_PROGRAM:" ${BUILD_PROGRAM})
-
 
   ################
   # Search for Qt4
@@ -160,8 +163,6 @@ ENDIF (${BUILD_PROGRAM})
 
 IF (${BUILD_DATA})
   
-  MESSAGE (STATUS "BUILD_DATA:" ${BUILD_DATA})
-  
   ###############
   # install stuff
   
@@ -188,8 +189,6 @@ ENDIF (${BUILD_DATA})
 
 IF (${BUILD_USERMANUAL})
   
-  MESSAGE (STATUS "BUILD_USERMANUAL:" ${BUILD_USERMANUAL})
-  
   # Below : no more in use since started using UseLATEX.cmake
   # Use the configured VERSION to create the 
   # usermanual/massxpert-version.tex file
@@ -223,6 +222,10 @@ ENDIF (${BUILD_USERMANUAL})
 # summary
 MESSAGE ("")
 MESSAGE ("~~~~~~~~~~~~~~~~~~~~~~~~ SUMMARY ~~~~~~~~~~~~~~~~~~~~~~~~")
+MESSAGE (STATUS "BUILD_PROGRAM:" ${BUILD_PROGRAM})
+MESSAGE (STATUS "BUILD_DATA:" ${BUILD_DATA})
+MESSAGE (STATUS "BUILD_USERMANUAL:" ${BUILD_USERMANUAL})
+MESSAGE ("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
 MESSAGE (STATUS "TARGET: " ${TARGET}  --  "VERSION: " ${VERSION})
 MESSAGE (STATUS "CMAKE_INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX})
 MESSAGE (STATUS "MASSXPERT_BIN_DIR: " ${MASSXPERT_BIN_DIR})

-- 
massXpert mass spectrometry suite: debian packaging



More information about the Debichem-commits mailing list