Browse Source
Merge pull request #2010 from feng-ye/master
fix cmake syntax.
pull/2016/head
Max Lv
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
4 deletions
-
cmake/configure.cmake
-
doc/CMakeLists.txt
|
|
|
@ -114,7 +114,7 @@ set(SELECT_TYPE_ARG5 "(struct timeval *)") |
|
|
|
set(STDC_HEADERS 1) |
|
|
|
|
|
|
|
|
|
|
|
check_include_files(sys/time.h time.h TIME_WITH_SYS_TIME) |
|
|
|
check_include_files("sys/time.h;time.h" TIME_WITH_SYS_TIME) |
|
|
|
|
|
|
|
|
|
|
|
# If the compiler supports a TLS storage class define it to that here |
|
|
|
|
|
|
|
@ -2,19 +2,18 @@ find_program(XMLTO_EXECUTABLE NAMES xmlto) |
|
|
|
find_program(ASCIIDOC_EXECUTABLE NAMES asciidoc asciidoc.py) |
|
|
|
|
|
|
|
# Opt-in doc build option |
|
|
|
if (XMLTO_EXECUTABLE-NOTFOUND OR ASCIIDOC_EXECUTABLE-NOTFOUND) |
|
|
|
if (NOT XMLTO_EXECUTABLE OR NOT ASCIIDOC_EXECUTABLE) |
|
|
|
option(WITH_DOC_MAN "Build manpage doc" OFF) |
|
|
|
else () |
|
|
|
option(WITH_DOC_MAN "Build manpage doc" ON) |
|
|
|
endif () |
|
|
|
|
|
|
|
if (ASCIIDOC_EXECUTABLE-NOTFOUND) |
|
|
|
if (NOT ASCIIDOC_EXECUTABLE) |
|
|
|
option(WITH_DOC_HTML "Build html doc" OFF) |
|
|
|
else () |
|
|
|
option(WITH_DOC_HTML "Build html doc" ON) |
|
|
|
endif () |
|
|
|
|
|
|
|
|
|
|
|
# NOTE For brew user, we have to setup this env var. see `brew info asciidoc' |
|
|
|
set(XMLTO_ENV) |
|
|
|
set(XMLTO_CATALOG_DIR_MACOS /usr/local/etc/xml/catalog) |
|
|
|
|
