- Add a comment how to improve the output of supported features later on.
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 4 Feb 2012 14:19:38 +0000 (14:19 +0000)
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 4 Feb 2012 14:19:38 +0000 (14:19 +0000)
- Move docbook pdf installation to toplevel.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40840 f5534014-38df-0310-8fa8-9805f1628bb7

CMakeLists.txt
docbook/CMakeLists.txt

index 118fab5b22b2b7f1cd684cf1e0cd36eb00032193..c62709d63715d87d8255a8876d38e8cda490038e 100644 (file)
@@ -489,6 +489,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h
 
 include(FeatureSummary)
 #SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
+#FEATURE_SUMMARY(WHAT ALL) Requires removal of our local copy of FeatureSummary
 PRINT_ENABLED_FEATURES()
 PRINT_DISABLED_FEATURES()
 
@@ -615,7 +616,6 @@ set(TSHARK_TAP_SRC
 
 set(INSTALL_DIRS
        diameter
-       docbook
        dtds
        help
        radius
@@ -1056,3 +1056,20 @@ install(
        PATTERN "Makefile.*" EXCLUDE
        PATTERN "faq.py" EXCLUDE
 )
+
+message(STATUS "Debugging docdir install: ${DOC_DIR}")
+
+if(${DOC_DIR})
+       INSTALL(
+               DIRECTORY
+                       ${CMAKE_BINARY_DIR}/docbook/
+               DIRECTORY_PERMISSIONS
+                       OWNER_EXECUTE OWNER_WRITE OWNER_READ
+                       GROUP_EXECUTE GROUP_READ
+                       WORLD_EXECUTE WORLD_READ
+               DESTINATION
+                       ${DOC_DIR}/guides
+#              PATTERN "*.pdf" 
+       )
+endif()
+
index 231a8483ffa14c28c78edde07d05fef043c9d43a..10cf77cdb9720983c0a1e8e8d2ed94ee76e9dacc 100644 (file)
@@ -360,19 +360,3 @@ ADD_CUSTOM_COMMAND(
                ${WSLUA_MODULES}
 )
 
-message(STATUS "Debugging docdir install: ${DOC_DIR}")
-
-if(${DOC_DIR})
-       INSTALL(
-               DIRECTORY
-                       ${CMAKE_CURRENT_BINARY_DIR}
-               DIRECTORY_PERMISSIONS
-                       OWNER_EXECUTE OWNER_WRITE OWNER_READ
-                       GROUP_EXECUTE GROUP_READ
-                       WORLD_EXECUTE WORLD_READ
-               DESTINATION
-                       ${DOC_DIR}/guides
-#              PATTERN "*.pdf" 
-       )
-endif()
-