certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] certi CMakeLists.txt [br_DEV_HETEROGENEOUS]


From: certi-cvs
Subject: [certi-cvs] certi CMakeLists.txt [br_DEV_HETEROGENEOUS]
Date: Thu, 20 Mar 2008 15:57:07 +0000

CVSROOT:        /sources/certi
Module name:    certi
Branch:         br_DEV_HETEROGENEOUS
Changes by:     Eric NOULARD <erk>      08/03/20 15:57:07

Modified files:
        .              : CMakeLists.txt 

Log message:
        Merge from HEAD

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.34&r2=1.34.2.1

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -b -r1.34 -r1.34.2.1
--- CMakeLists.txt      14 Feb 2008 15:49:40 -0000      1.34
+++ CMakeLists.txt      20 Mar 2008 15:57:07 -0000      1.34.2.1
@@ -310,7 +310,13 @@
 
 SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${MACHINE})
 
-SET(CPACK_SOURCE_IGNORE_FILES 
"/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;.*~;cscope.*")
+# Avoid putting BUILDIR inside source package (simple case)
+IF ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+     SET(CPACK_SOURCE_IGNORE_FILES 
"/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;.*~;cscope.*")
+ELSE ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+     SET(CPACK_SOURCE_IGNORE_FILES 
"/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;.*~;cscope.*;${CMAKE_BINARY_DIR}/*")
+ENDIF ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+
 SET(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
 SET(CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR})
 SET(CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR})




reply via email to

[Prev in Thread] Current Thread [Next in Thread]