[gawk-diffs] [SCM] gawk branch, cmake, updated. 698b17a3422b7b9cc1e4ab078ed7f26cfa30c463

[Juergen Kahrs]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, cmake has been updated
       via  698b17a3422b7b9cc1e4ab078ed7f26cfa30c463 (commit)
      from  1e09bc8abf811e718a5ae77f6428bc31b1f4fdcb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=698b17a3422b7b9cc1e4ab078ed7f26cfa30c463

commit 698b17a3422b7b9cc1e4ab078ed7f26cfa30c463
Author: Juergen Kahrs <address@hidden>
Date:   Sat Feb 23 17:25:46 2013 +0100

    cmake -DCPACK_GENERATOR=DEB allows to produce packages in format of Debian 
or RPM based distributions.

diff --git a/cmake/Toolchain_clang.cmake b/cmake/Toolchain_clang.cmake
index 2c6bbbb..8935357 100644
--- a/cmake/Toolchain_clang.cmake
+++ b/cmake/Toolchain_clang.cmake
@@ -2,7 +2,7 @@
 # http://www.cmake.org/Wiki/CMake_Cross_Compiling#The_toolchain_file
 
 # the name of the target operating system
-SET(CMAKE_SYSTEM_NAME Clang)
+SET(CMAKE_SYSTEM_NAME Generic)
 
 # which compilers to use for C and C++
 SET(CMAKE_C_COMPILER /usr/bin/clang)
diff --git a/cmake/package.cmake b/cmake/package.cmake
index a7ebe44..62bf20e 100644
--- a/cmake/package.cmake
+++ b/cmake/package.cmake
@@ -24,6 +24,17 @@
 
 ## process this file with CMake to produce Makefile
 
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "This is GNU Awk ${GAWK_VERSION}")
+set(CPACK_PACKAGE_VENDOR "GNU Project - Free Software Foundation (FSF)")
+SET(CPACK_PACKAGE_NAME "gawk")
+SET(CPACK_PACKAGE_VERSION "${GAWK_VERSION}")
+SET(CPACK_PACKAGE_VERSION_MAJOR "${GAWK_MAJOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${GAWK_MINOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${GAWK_BUGFIX_VERSION}")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+SET(CPACK_RESOURCE_FILE_README  "${CMAKE_SOURCE_DIR}/README")
+set(CPACK_PACKAGE_CONTACT "address@hidden")
+
 IF (WIN32)
   SET(CPACK_GENERATOR "NSIS")
   set(CPACK_NSIS_INSTALL_ROOT "C:/Programs")
@@ -33,18 +44,11 @@ IF (WIN32)
   set(CPACK_NSIS_CONTACT "address@hidden")
   set(CPACK_NSIS_DISPLAY_NAME "GNU Awk")
 ELSE()
-  SET(CPACK_GENERATOR "TGZ")
   SET(CPACK_PACKAGING_INSTALL_PREFIX /usr)
+  IF(NOT CPACK_GENERATOR)
+    SET(CPACK_GENERATOR "TGZ")
+  ENDIF() 
+  message(STATUS "CPACK_GENERATOR set to ${CPACK_GENERATOR}")
 ENDIF() 
 
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "This is GNU Awk ${GAWK_VERSION}")
-set(CPACK_PACKAGE_VENDOR "GNU Project - Free Software Foundation (FSF)")
-SET(CPACK_PACKAGE_NAME "gawk")
-SET(CPACK_PACKAGE_VERSION "${GAWK_VERSION}")
-SET(CPACK_PACKAGE_VERSION_MAJOR "${GAWK_MAJOR_VERSION}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${GAWK_MINOR_VERSION}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${GAWK_BUGFIX_VERSION}")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
-SET(CPACK_RESOURCE_FILE_README  "${CMAKE_SOURCE_DIR}/README")
-
 INCLUDE(CPack)

-----------------------------------------------------------------------

Summary of changes:
 cmake/Toolchain_clang.cmake |    2 +-
 cmake/package.cmake         |   26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
gawk