osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CMake: Doxygen and API reference target updates. 

The DOXYGEN_* variables which we use to create doxygen.cfg are native
paths and are not compatible with Cygwin. We could try to make them
compatible, but given that we're trying to migrate away from Cygwin set
"DOXYGEN_EXECUTABLE" to "DOXYGEN_EXECUTABLE-NOTFOUND" if "cyg" is anywhere
in its path.

Add the wsar_html* targets to "Docs" and exclude them from Visual Studio's
default build.

Change-Id: Id23a3c43a9f4f1edb2d827bbf36a3a7eb64f0212
Reviewed-on: https://code.wireshark.org/review/27100
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2018-04-23 08:31:25 -07:00 committed by Anders Broman
parent f70a7bf09b
commit 631fec3e1b
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -3127,6 +3127,10 @@ if (DOXYGEN_EXECUTABLE)
COMMAND ${CMAKE_COMMAND} -E tar "cfv" "wsar_html.zip" --format=zip wsar_html
DEPENDS wsar_html
)
set_target_properties(wsar_html wsar_html_zip PROPERTIES
FOLDER "Docs"
EXCLUDE_FROM_DEFAULT_BUILD True
)
endif(DOXYGEN_EXECUTABLE)
# Test suite wrapper

16
cmake/modules/FindDOXYGEN.cmake
View File

@ -1,21 +1,27 @@
#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
# - Find Doxygen
# This module looks for a native (non-Cygwin) Doxygen.
#
include( FindCygwin )
find_program( DOXYGEN_EXECUTABLE
NAMES
doxygen
PATHS
${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
)
# We set various paths in doxygen.cfg via configure_file(). These are
# native system paths which aren't compatible with Cygwin's Doxygen.
string(TOLOWER ${DOXYGEN_EXECUTABLE} _de_lower)
if(${_de_lower} MATCHES "cyg")
set(_ignore_reason "Cygwin Doxygen found at ${DOXYGEN_EXECUTABLE}. Ignoring.")
message(STATUS ${_ignore_reason})
set(DOXYGEN_EXECUTABLE DOXYGEN_EXECUTABLE-NOTFOUND CACHE FILEPATH ${_ignore_reason} FORCE)
endif()
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( DOXYGEN DEFAULT_MSG DOXYGEN_EXECUTABLE )