[gawk-diffs] [SCM] gawk branch, cmake, updated. 119d46dcdfbc84058ea517ac1ec18bf3dbb26ec4

[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  119d46dcdfbc84058ea517ac1ec18bf3dbb26ec4 (commit)
      from  698b17a3422b7b9cc1e4ab078ed7f26cfa30c463 (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=119d46dcdfbc84058ea517ac1ec18bf3dbb26ec4

commit 119d46dcdfbc84058ea517ac1ec18bf3dbb26ec4
Author: Juergen Kahrs <address@hidden>
Date:   Sat Feb 23 18:29:03 2013 +0100

    .pdf files are now packaged into the doc directory.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0714a02..ba604c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,11 +94,10 @@ if (CMAKE_HOST_UNIX)
   if(NOT ${CMAKE_CROSSCOMPILING} STREQUAL "TRUE")
     enable_testing()
     add_subdirectory(test)
-    if (LATEX_COMPILER)
-      add_subdirectory(doc)
-    endif()
   endif()
 
+  add_subdirectory(doc)
+
   include(InstallRequiredSystemLibraries)
   set(CPACK_PACKAGING_INSTALL_PREFIX /usr)
   include(cmake/package.cmake)
diff --git a/cmake/package.cmake b/cmake/package.cmake
index 62bf20e..b63c286 100644
--- a/cmake/package.cmake
+++ b/cmake/package.cmake
@@ -37,7 +37,7 @@ set(CPACK_PACKAGE_CONTACT "address@hidden")
 
 IF (WIN32)
   SET(CPACK_GENERATOR "NSIS")
-  set(CPACK_NSIS_INSTALL_ROOT "C:/Programs")
+  set(CPACK_NSIS_INSTALL_ROOT "C:")
   set(CPACK_NSIS_MENU_LINKS "http://www.gnu.org/software/gawk"; "GNU Awk")
   set(CPACK_NSIS_MUI_ICON    "${CMAKE_SOURCE_DIR}/cmake/auk.ico")
   set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/auk.ico")
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 299f52a..86ed9f1 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -24,31 +24,59 @@
 
 ## process this file with CMake to produce Makefile
 
-add_custom_target(doc)
-add_custom_command(
-  TARGET doc
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  COMMAND texi2dvi  --clean gawkinet.texi gawk.texi
-  COMMAND groff -man gawk.1 > gawk.1.ps
-  COMMAND groff -man igawk.1 > igawk.1.ps
-)
-
-if (DVIPS_CONVERTER)
+if (LATEX_COMPILER)
+  add_custom_target(doc)
   add_custom_command(
     TARGET doc
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND dvips -o gawk.ps gawk.dvi
-    COMMAND dvips -o gawkinet.ps gawkinet.dvi
+    COMMAND texi2dvi  --clean gawkinet.texi gawk.texi
+    COMMAND groff -man gawk.1 > gawk.1.ps
+    COMMAND groff -man igawk.1 > igawk.1.ps
   )
-  if (PS2PDF_CONVERTER)
+
+  if (DVIPS_CONVERTER)
     add_custom_command(
       TARGET doc
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      COMMAND ps2pdf gawk.1.ps gawk.1.pdf
-      COMMAND ps2pdf igawk.1.ps igawk.1.pdf
-      COMMAND ps2pdf gawk.1.ps gawk.1.pdf
-      COMMAND ps2pdf gawkinet.ps gawkinet.pdf
+      COMMAND dvips -o gawk.ps gawk.dvi
+      COMMAND dvips -o gawkinet.ps gawkinet.dvi
     )
+    if (PS2PDF_CONVERTER)
+      add_custom_command(
+        TARGET doc
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        COMMAND ps2pdf gawk.1.ps gawk.1.pdf
+        COMMAND ps2pdf igawk.1.ps igawk.1.pdf
+        COMMAND ps2pdf gawk.ps gawk.pdf
+        COMMAND ps2pdf gawkinet.ps gawkinet.pdf
+      )
+    else()
+      message(WARNING "Found no PS2PDF_CONVERTER; no doc will be generated")
+    endif()
+  else()
+    message(WARNING "Found no DVIPS_CONVERTER; no doc will be generated")
   endif()
+else()
+  message(WARNING "Found no LATEX_COMPILER; no doc will be generated")
 endif()
 
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gawk.1.pdf)
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gawk.1.pdf DESTINATION doc)
+else()
+  message(STATUS "No file gawk.1.pdf will be built into package")
+endif()
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/igawk.1.pdf)
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/igawk.1.pdf DESTINATION doc)
+else()
+  message(STATUS "No file igawk.1.pdf will be built into package")
+endif()
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gawk.pdf)
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gawk.pdf DESTINATION doc)
+else()
+  message(STATUS "No file gawk.pdf will be built into package")
+endif()
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gawkinet.pdf)
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gawkinet.pdf DESTINATION doc)
+else()
+  message(STATUS "No file gawkinet.pdf will be built into package")
+endif()

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

Summary of changes:
 CMakeLists.txt      |    5 +--
 cmake/package.cmake |    2 +-
 doc/CMakeLists.txt  |   62 +++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 48 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
gawk