[Openvas-commits] r12093 - in trunk/gsa: . src

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2011-11-10 14:18:14 +0100 (Thu, 10 Nov 2011)
New Revision: 12093

Modified:
   trunk/gsa/CMakeLists.txt
   trunk/gsa/ChangeLog
   trunk/gsa/src/CMakeLists.txt
Log:
* src/CMakeLists.txt: Adjust path to make XSLT validation work for
  out-of-source builds.

* CMakeLists.txt: Adjust source locations in install command to enable
  installation from an out-of-source build.



Modified: trunk/gsa/CMakeLists.txt
===================================================================
--- trunk/gsa/CMakeLists.txt	2011-11-10 13:12:45 UTC (rev 12092)
+++ trunk/gsa/CMakeLists.txt	2011-11-10 13:18:14 UTC (rev 12093)
@@ -386,7 +386,7 @@
                 src/html/img/os_windows.png
          DESTINATION ${GSA_DATA_DIR}/img)
 
-install (FILES src/gsad_log.conf
+install (FILES ${CMAKE_BINARY_DIR}/src/gsad_log.conf
          DESTINATION ${GSA_CONFIG_DIR})
 
 ## Program

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-11-10 13:12:45 UTC (rev 12092)
+++ trunk/gsa/ChangeLog	2011-11-10 13:18:14 UTC (rev 12093)
@@ -1,3 +1,11 @@
+2011-11-10  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	* src/CMakeLists.txt: Adjust path to make XSLT validation work for
+	out-of-source builds.
+
+	* CMakeLists.txt: Adjust source locations in install command to enable
+	installation from an out-of-source build.
+
 2011-11-10  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	* src/html/omp.xsl (host): Get the right pos, from the XML, for the

Modified: trunk/gsa/src/CMakeLists.txt
===================================================================
--- trunk/gsa/src/CMakeLists.txt	2011-11-10 13:12:45 UTC (rev 12092)
+++ trunk/gsa/src/CMakeLists.txt	2011-11-10 13:18:14 UTC (rev 12093)
@@ -129,24 +129,24 @@
 if (PATH_TO_XSLTPROC)
   add_custom_target (oap-xsl-syntax ALL
                                     COMMENT "Checking syntax of oap.xsl"
-                                    COMMAND xsltproc html/oap.xsl
-                                    DEPENDS html/oap.xsl)
+                                    COMMAND xsltproc ${CMAKE_CURRENT_SOURCE_DIR}/html/oap.xsl
+                                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/html/oap.xsl)
   add_custom_target (omp-xsl-syntax ALL
                                     COMMENT "Checking syntax of omp.xsl"
-                                    COMMAND xsltproc html/omp.xsl
-                                    DEPENDS html/omp.xsl)
+                                    COMMAND xsltproc ${CMAKE_CURRENT_SOURCE_DIR}/html/omp.xsl
+                                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/html/omp.xsl)
   add_custom_target (gsad-xsl-syntax ALL
                                      COMMENT "Checking syntax of gsad.xsl"
-                                     COMMAND xsltproc html/gsad.xsl
-                                     DEPENDS html/gsad.xsl)
+                                     COMMAND xsltproc ${CMAKE_CURRENT_SOURCE_DIR}/html/gsad.xsl
+                                     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/html/gsad.xsl)
   add_custom_target (dialog-xsl-syntax ALL
                                      COMMENT "Checking syntax of dialog.xsl"
-                                     COMMAND xsltproc html/dialog.xsl
-                                     DEPENDS html/dialog.xsl)
+                                     COMMAND xsltproc ${CMAKE_CURRENT_SOURCE_DIR}/html/dialog.xsl
+                                     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/html/dialog.xsl)
   add_custom_target (help-xsl-syntax ALL
                                      COMMENT "Checking syntax of help.xsl"
-                                     COMMAND xsltproc html/help.xsl
-                                     DEPENDS html/help.xsl)
+                                     COMMAND xsltproc ${CMAKE_CURRENT_SOURCE_DIR}/html/help.xsl
+                                     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/html/help.xsl)
 else (PATH_TO_XSLTPROC)
   message ("Not performing simple stylesheet tests -- xsltproc not found.")
 endif (PATH_TO_XSLTPROC)