Skip to content

Commit 416d8ce

Browse files
committed
Update CMakeLists
1 parent 6104fce commit 416d8ce

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ endif()
2727

2828
set(MB_QT_ENABLED ON)
2929
set(MB_C_SUPPORT_DISABLE ON)
30+
set(MB_NO_INSTALL ON)
3031
# EXCLUDE_FROM_ALL: to not generate install data
3132
add_subdirectory(modbus/src EXCLUDE_FROM_ALL)
3233

doc/CMakeLists.txt

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@ find_program(MBTOOLS_DOXYGEN_EXECUTABLE
1111
DOC "Doxygen documentation generator"
1212
)
1313

14-
find_program(MBTOOLS_QHELP_GENERATOR
15-
NAMES qhelpgenerator qhelpgenerator.exe
16-
PATHS
17-
"$ENV{QT_HOME}/bin"
18-
"$ENV{ProgramFiles}/Qt/Tools/QtCreator/bin"
19-
"$ENV{ProgramFiles\(x86\)}/Qt/Tools/QtCreator/bin"
20-
"C:/Qt/Tools/QtCreator/bin"
21-
"C:/Qt/5.15.2/msvc2019_64/bin"
22-
DOC "Qt Help Generator"
23-
)
2414
if(MBTOOLS_DOXYGEN_EXECUTABLE)
2515
message(STATUS "MBTOOLS-DOC: Found Doxygen: ${MBTOOLS_DOXYGEN_EXECUTABLE}")
2616
project("mbtools-doc" VERSION ${MBTOOLS_VERSION})
@@ -66,7 +56,19 @@ if(MBTOOLS_DOXYGEN_EXECUTABLE)
6656
add_dependencies(doxygen-server ${MBTOOLS_CORE_LIB_NAME}
6757
${MBTOOLS_CLIENT_APP_NAME}
6858
${MBTOOLS_SERVER_APP_NAME})
69-
59+
60+
61+
find_program(MBTOOLS_QHELP_GENERATOR
62+
NAMES qhelpgenerator qhelpgenerator.exe
63+
PATHS
64+
"$ENV{QT_HOME}/bin"
65+
"$ENV{ProgramFiles}/Qt/Tools/QtCreator/bin"
66+
"$ENV{ProgramFiles\(x86\)}/Qt/Tools/QtCreator/bin"
67+
"C:/Qt/Tools/QtCreator/bin"
68+
"C:/Qt/5.15.2/msvc2019_64/bin"
69+
DOC "Qt Help Generator"
70+
)
71+
7072
if (MBTOOLS_QHELP_GENERATOR)
7173
message(STATUS "MBTOOLS-DOC: Found QHelpGenerator: ${MBTOOLS_QHELP_GENERATOR}")
7274
file(COPY ${MBTOOLS_DOC_SRC_DIR}/ModbusClient.qhcp

0 commit comments

Comments
 (0)