Merge branch 'master' of github.com:doxygen/doxygen

doxygen · Aug 8, 2015 · 8a22f5f · 8a22f5f
2 parents fa6585b + 293d0d5
commit 8a22f5f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
@@ -84,6 +84,12 @@ elseif(UNIX)
       execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
       set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE})
 
+    elseif(distribution MATCHES "RedHat.*")
+      # extract the major version from RedHat full version (e.g. 6.7 --> 6)
+      execute_process(COMMAND lsb_release -sr COMMAND sed s/[.].*//  OUTPUT_VARIABLE redhat_version_major OUTPUT_STRIP_TRAILING_WHITESPACE)
+      set(CPACK_GENERATOR "RPM")
+      set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.el${redhat_version_major}.${CPACK_RPM_PACKAGE_ARCHITECTURE})
+
     elseif(distribution MATCHES "openSUSE.*")
       set(CPACK_GENERATOR "RPM")
       set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${release}.${CPACK_RPM_PACKAGE_ARCHITECTURE})

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -30,7 +30,6 @@ else()
 endif()
 
 set(DOC_INSTALL_DIR "share/doc/packages/doxygen" CACHE STRING "Relative path where to install the documentation")
-set(EXAMPLE_DIR ${TOP}/examples)
 set(DOC_FILES
         arch.doc
         archoverview.eps
@@ -95,7 +94,6 @@ file(COPY ${TOP}/VERSION                  DESTINATION ${PROJECT_BINARY_DIR}/)
 file(COPY ${TOP}/src/translator.h         DESTINATION ${PROJECT_BINARY_DIR}/src/)
 file(COPY ${TOP}/src/translator_adapter.h DESTINATION ${PROJECT_BINARY_DIR}/src/)
 file(COPY ${LANG_FILES}                   DESTINATION ${PROJECT_BINARY_DIR}/src/)
-file(COPY ${EXAMPLE_DIR}                  DESTINATION ${PROJECT_BINARY_DIR}/)
 
 foreach (f  ${DOC_FILES})
 add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/${f}
@@ -134,15 +132,12 @@ set_source_files_properties(config.doc PROPERTIES GENERATED 1)
 add_custom_target(run_doxygen
         COMMENT "Generating Latex and HTML documentation."
         COMMAND ${DOXYGEN_EXECUTABLE}
-        DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc ${OUT_DOC_FILES}
+        DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc
+        DEPENDS ${OUT_DOC_FILES}
+        DEPENDS examples
+        DEPENDS doxygen
         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
 )
-if (doxygen_BINARY_DIR)
-    # building from project `doxygen'
-    add_dependencies(run_doxygen
-       doxygen
-    )
-endif()
 
 add_custom_target(doxygen_pdf
         COMMENT "Generating Doxygen Manual PDF."

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -2,22 +2,24 @@ if (build_doc)
 
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/examples)
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/html/examples)
-file(GLOB EXAMPLE_FILES "*")
+file(GLOB EXAMPLE_FILES RELATIVE ${CMAKE_SOURCE_DIR}/examples "*")
 
 if (DOT)
   set(DIAGRAM_EXAMPLE ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html)
 endif()
 
-# copy all example files
-add_custom_target(copy_examples)
-foreach(example_file ${EXAMPLE_FILES})
-  add_custom_command(TARGET copy_examples PRE_BUILD
-                     COMMAND ${CMAKE_COMMAND} -E
-                         copy ${example_file} ${PROJECT_BINARY_DIR}/examples)
+foreach (f  ${EXAMPLE_FILES})
+    add_custom_command(
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/examples/${f}" "${PROJECT_BINARY_DIR}/examples/"
+        DEPENDS "${CMAKE_SOURCE_DIR}/examples/${f}"
+        OUTPUT "${PROJECT_BINARY_DIR}/examples/${f}"
+    )
+    set_source_files_properties("${PROJECT_BINARY_DIR}/examples/${f}" PROPERTIES GENERATED 1)
+    list(APPEND OUT_EXAMPLE_FILES "${PROJECT_BINARY_DIR}/examples/${f}")
 endforeach()
 
 add_custom_target(examples
-	DEPENDS doxygen copy_examples
+  DEPENDS ${OUT_EXAMPLE_FILES}
                 ${PROJECT_BINARY_DIR}/html/examples/class/html/index.html
                 ${PROJECT_BINARY_DIR}/html/examples/define/html/index.html
                 ${PROJECT_BINARY_DIR}/html/examples/enum/html/index.html

diff --git a/src/scanner.l b/src/scanner.l
@@ -6749,7 +6749,7 @@ static void parseCompounds(Entry *rt)
 
       // deep copy group list from parent (see bug 727732)
       static bool autoGroupNested = Config_getBool("GROUP_NESTED_COMPOUNDS");
-      if (rt->groups && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum))
+      if (autoGroupNested && rt->groups && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum))
       {
         QListIterator<Grouping> gli(*rt->groups);
         Grouping *g;