Skip to content

Commit 6301e88

Browse files
committed
CMake shorter option name to build docs
1 parent 29255cc commit 6301e88

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
matrix:
1313
# CMake build with unit tests, no documentation
1414
# Allow to fail for now until tests are fixed
15-
- BUILD_SCRIPT="mkdir cmake-build && cd cmake-build && cmake -DROBODOC_SKIP_DOC_GEN:BOOL=TRUE .. && make -j 3 && (make test || true)"
15+
- BUILD_SCRIPT="mkdir cmake-build && cd cmake-build && cmake -DSKIP_DOC_GEN:BOOL=TRUE .. && make -j 3 && (make test || true)"
1616
SPECIFIC_DEPENDS="cmake nodejs"
1717
JLINT="yes"
1818
DOCS="no"

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ set_target_properties ( test-${CMAKE_PROJECT_NAME} test-${CMAKE_PROJECT_NAME}-st
120120
#-------------------------------------
121121
# Build the documentation with ROBODoc
122122
#-------------------------------------
123-
set ( ROBODOC_SKIP_DOC_GEN FALSE CACHE BOOL
123+
set ( SKIP_DOC_GEN FALSE CACHE BOOL
124124
"Disable building the API documentation with ROBODoc" )
125-
if ( NOT ROBODOC_SKIP_DOC_GEN )
125+
if ( NOT SKIP_DOC_GEN )
126126
find_program ( ROBODOC robodoc )
127127
if ( ROBODOC ) # Found
128128
set ( ROBODOC_OPTIONS --rc ${CMAKE_SOURCE_DIR}/robodoc.rc --tabsize 4 --index --toc --sections --syntaxcolors --source_line_numbers
@@ -151,9 +151,9 @@ if ( NOT ROBODOC_SKIP_DOC_GEN )
151151
DEPENDS ${ROBODOC_OUTPUTS} )
152152
else ( ROBODOC ) # Not found
153153
message ( WARNING
154-
"ROBODoc not found! Please set the CMake cache variable ROBODOC to point to the installed ROBODoc binary, and reconfigure or disable building the documentation. ROBODoc can be installed from: http://www.xs4all.nl/~rfsber/Robo/ If you do not wish to install ROBODoc and build the json-fortran documentation, then please set the CMake cache variable SKIP_DOCUMENTATION_GENERATION to FALSE." )
154+
"ROBODoc not found! Please set the CMake cache variable ROBODOC to point to the installed ROBODoc binary, and reconfigure or disable building the documentation. ROBODoc can be installed from: http://www.xs4all.nl/~rfsber/Robo/ If you do not wish to install ROBODoc and build the json-fortran documentation, then please set the CMake cache variable SKIP_DOC_GEN to TRUE." )
155155
endif ( ROBODOC )
156-
endif ( NOT ROBODOC_SKIP_DOC_GEN )
156+
endif ( NOT SKIP_DOC_GEN )
157157

158158
#---------------------------------------------------------------------
159159
# Add some tests to ensure that the software is performing as expected

0 commit comments

Comments
 (0)