diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2015-08-08 14:38:36 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-08-08 14:38:36 (GMT) |
commit | 8a22f5f9bebb52427f06108c02e3390c85d29d7f (patch) | |
tree | 9bc9bc4a4339921ec02925e2685bd6e92e17d841 | |
parent | fa6585b2fc6847c2b242b226b163810c7a6366de (diff) | |
parent | 293d0d5273a0564e5ecf488b7f366f79770d711f (diff) | |
download | Doxygen-8a22f5f9bebb52427f06108c02e3390c85d29d7f.zip Doxygen-8a22f5f9bebb52427f06108c02e3390c85d29d7f.tar.gz Doxygen-8a22f5f9bebb52427f06108c02e3390c85d29d7f.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r-- | cmake/packaging.cmake | 6 | ||||
-rw-r--r-- | doc/CMakeLists.txt | 13 | ||||
-rw-r--r-- | examples/CMakeLists.txt | 18 | ||||
-rw-r--r-- | src/scanner.l | 2 |
4 files changed, 21 insertions, 18 deletions
diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake index a85ce33..0798b83 100644 --- 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 index 3279b83..805bd83 100644 --- 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 index d689eda..e7b61a1 100644 --- 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 index 328dc3f..e9d5707 100644 --- 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; |