Skip to content

Commit

Permalink
Merge pull request #4 from oblivioncth/dev
Browse files Browse the repository at this point in the history
Merge to master for v0.1.2 hotfix
  • Loading branch information
oblivioncth authored Sep 1, 2022
2 parents c9d6dd4 + 2fcc738 commit b66046d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-qi-qmp-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ jobs:
{
"shared": {
"qt_install_name": "qt-Production-6.3.1-win32-msvc-x64-shared-release.7z",
"qt_install_url": "https://mega.nz/file/h7ZgWSRa",
"qt_install_url": "https://mega.nz/file/QyoQxRiA",
"qt_install_url_key": "${{ secrets.qt_shared_dec_key }}",
"artifact_output_var": "qt_shared_artifact_name"
},
"static": {
"qt_install_name": "qt-Production-6.3.1-win32-msvc-x64-static-release.7z",
"qt_install_url": "https://mega.nz/file/h2RWCKhS",
"qt_install_url": "https://mega.nz/file/QupBFJrC",
"qt_install_url_key": "${{ secrets.qt_static_dec_key }}",
"artifact_output_var": "qt_static_artifact_name"
}
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ cmake_minimum_required(VERSION 3.21.1)
set(TRUE_CMAKE_MINIMUM_REQUIRED ${CMAKE_MINIMUM_REQUIRED_VERSION})

# Configuration options
option(QI_QMP_DOCS_TARGET "Build Qx documentation" OFF)
option(QI_QMP_DOCS_TARGET "Build QI-QMP documentation" OFF)

# Project
# NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
set(QI_QMP_BASE_VERSION 0.1.1) # Required for CI/CD
set(QI_QMP_BASE_VERSION 0.1.2) # Required for CI/CD
project(QI-QMP
VERSION ${QI_QMP_BASE_VERSION}
LANGUAGES CXX
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Finally, the [Minimal Example](https://oblivioncth.github.io/QI-QMP/index.html#a

## Pre-built Releases/Artifacts

Releases and some workflows currently provide builds of Qx in the following configurations:
Releases and some workflows currently provide builds of QI-QMP in the following configurations:

1) - Windows (windows-latest)
- MSVC (latest)
Expand Down
8 changes: 4 additions & 4 deletions cmake/file_templates/doc_mainpage.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ The CMake project is designed to be used with multi-configuration generators suc
If QI-QMP is configured as a sub-project, its install components are automatically removed from the `all` component, as to not pollute the install directory of the top-level project.

#### Documentation:
In order for the `qx_docs` target to be generated the CMake cache variable **QX_DOCS_TARGET** must be set to *ON* when CMake is invoked:
In order for the `qi_qmp_docs` target to be generated the CMake cache variable **QI_QMP_DOCS_TARGET** must be set to *ON* when CMake is invoked:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cmake.exe (...) -D QI_QMP_DOCS_TARGET=ON
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -120,7 +120,7 @@ The QI_QMP documentation supports two optional, but highly recommended features:
- Linking to Qt documentation
- Generating a Qt Compressed Help (.qch) file for use in Qt Creator

In order to enable these features, the CMake variables **QT_DOCS_DIR** and **QT_HELP_GEN_PATH** respectively must be available. Qx tries to set them automatically according to the following defaults, but these can be overridden by passing definitions for the variables to CMake on the command line via @c -D.
In order to enable these features, the CMake variables **QT_DOCS_DIR** and **QT_HELP_GEN_PATH** respectively must be available. QI-QMP tries to set them automatically according to the following defaults, but these can be overridden by passing definitions for the variables to CMake on the command line via @c -D.

# Optional documentation defaults
# Here <QT_ROOT> refers to the install directory of a given Qt build
Expand Down Expand Up @@ -214,8 +214,8 @@ endfunction()
Then in your CMake project:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

include(FetchQx)
fetch_qx(<commitish_here>) # Get QI-QMP
include(FetchQI-QMP)
fetch_qi_qmp(<commitish_here>) # Get QI-QMP

add_executable(SomeExe
...
Expand Down
2 changes: 1 addition & 1 deletion doc/DoxygenLayout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<tab type="mainpage" visible="yes" title=""/>
<tab type="user" url="https://github.com/oblivioncth/QI-QMP/releases" title="Downloads"/>
<tab type="pages" visible="yes" title="" intro=""/>
<tab type="modules" visible="yes" title="Components" intro="Here is a list of the components in Qx:"/>
<tab type="modules" visible="yes" title="Components" intro="Here is a list of the components in QI-QMP:"/>
<tab type="namespacelist" visible="yes" title="Namespaces" intro=""/>
<tab type="namespaces" visible="no" title="">
<tab type="namespacemembers" visible="no" title="" intro=""/>
Expand Down
2 changes: 1 addition & 1 deletion doc/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<body>

<!-- https://tholman.com/github-corners/ -->
<a href="https://github.com/oblivioncth/Qx" class="github-corner" title="View source on GitHub" target="_blank">
<a href="https://github.com/oblivioncth/QI-QMP" class="github-corner" title="View source on GitHub" target="_blank">
<svg viewBox="0 0 250 250" width="40" height="40" style="position: absolute; top: 0; border: 0; right: 0; z-index: 99;" aria-hidden="true">
<path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
<path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
Expand Down

0 comments on commit b66046d

Please sign in to comment.