Merge pull request #3 from oblivioncth/dev

Merge for doc hotfix
oblivioncth · Aug 28, 2022 · c9d6dd4 · c9d6dd4
2 parents 2ee80c4 + 0b93d71
commit c9d6dd4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ option(QI_QMP_DOCS_TARGET "Build Qx documentation" OFF)
 
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
-set(QI_QMP_BASE_VERSION 0.1) # Required for CI/CD
+set(QI_QMP_BASE_VERSION 0.1.1) # Required for CI/CD
 project(QI-QMP
     VERSION ${QI_QMP_BASE_VERSION}
     LANGUAGES CXX
@@ -280,6 +280,15 @@ install(FILES
     ${SUB_PROJ_EXCLUDE_FROM_ALL} # "EXCLUDE_FROM_ALL" if project is not top-level
 )
 
+# Install Docs if available
+install(DIRECTORY ${DOC_BUILD_PATH}
+    COMPONENT ${PROJECT_NAME_LC}_docs
+    DESTINATION .
+    CONFIGURATIONS Release
+    OPTIONAL
+    ${SUB_PROJ_EXCLUDE_FROM_ALL} # "EXCLUDE_FROM_ALL" if project is not top-level
+)
+
 #======== Export For In-tree Builds =================
 export(EXPORT ${PROJECT_NAME}Targets
     FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Targets.cmake"

diff --git a/cmake/file_templates/doc_mainpage.md.in b/cmake/file_templates/doc_mainpage.md.in
@@ -50,7 +50,7 @@ target_link_libraries(example_app PUBLIC QI-QMP::Qmpi)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 5) Include the public header in your code
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
 #include <qi-qmp/qmpi.h>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -69,7 +69,7 @@ QObject::connect(&iQemu, &Qmpi::connected, [](QJsonObject version, QJsonArray ca
 	qDebug() << "Capabilities: " << capabilities;
 });
 QObject::connect(&iQemu, &Qmpi::readyForCommands, [&](){
-	iQemu.execute("query-status", QJsonObject(), R"("query-status")");
+	iQemu.execute("query-status", QJsonObject(), QString("query-status"));
 });
 QObject::connect(&iQemu, &Qmpi::connectionErrorOccured, [](QAbstractSocket::SocketError error){
 	qDebug() << "Socker Error: " << error;