diff --git a/Doxyfile b/Doxyfile index 7d4d751..18f0609 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1355,7 +1355,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = html +HTML_OUTPUT = docs/html # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). @@ -2027,7 +2027,7 @@ GENERATE_LATEX = NO # The default directory is: latex. # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_OUTPUT = latex +LATEX_OUTPUT = docs/latex # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 37ab398..a7ec5aa 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -117,4 +117,4 @@ if (NOT EMSCRIPTEN) endforeach() else() file(GLOB_RECURSE sims "simulators/*") -endif() +endif() \ No newline at end of file diff --git a/dockerfile-qt-build/Dockerfile b/dockerfile-qt-build/Dockerfile index b0c0465..ec6e336 100644 --- a/dockerfile-qt-build/Dockerfile +++ b/dockerfile-qt-build/Dockerfile @@ -1,5 +1,6 @@ FROM fedora:latest RUN dnf upgrade -y RUN dnf install -y gcc g++ ninja cmake git -RUN dnf install -y qt6-*-devel --exclude=qt6-doc --exclude=qt6-doc-devel --exclude=qt6-qtwebengine* --exclude=qt6-qtwebview* +RUN dnf install -y gtest-devel +RUN dnf install -y qt6-qtbase-devel qt6-qtdeclarative-devel qt6-qtserialbus-devel qt6-qtserialport-devel qt6-qtwebsockets-devel qt6-qttools-devel qt6-qtsvg-devel RUN dnf install -y libgpiod-devel diff --git a/external/qwt b/external/qwt index 0040196..a5dff94 160000 --- a/external/qwt +++ b/external/qwt @@ -1 +1 @@ -Subproject commit 004019656196b2b12003d266076bcba4e8b7f87a +Subproject commit a5dff947d9d82a3242651028d2d89e540c73486e diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 544d367..6fe67cb 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -65,7 +65,6 @@ target_link_libraries(unisim_server PRIVATE git_tag ) - file(GLOB_RECURSE sims "simulators/*.cpp") # Loop through each .cpp file and create a library for it diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a3e8cd1..cd0340e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,6 +11,7 @@ file(GLOB_RECURSE CAN "../server/CAN/to_id.cpp") if (GTest_FOUND) message(STATUS "GTest found - building target tests") add_executable(tests ${TEST_SOURCES} ${CAN}) + set_target_properties(tests PROPERTIES EXCLUDE_FROM_ALL TRUE) target_compile_options(tests PRIVATE $<$: -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion