Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use yaml-cpp from the Qt Creator SDK #511

Merged
merged 4 commits into from
Aug 3, 2024
Merged

use yaml-cpp from the Qt Creator SDK #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
019a653
use the libyaml-cpp provided by the Qt Creator SDK
christianrauch Aug 2, 2024
76e2098
remove manual yaml-cpp compilation from CI
christianrauch Aug 2, 2024
fb99227
remove yaml-cpp references from documentation
christianrauch Aug 2, 2024
c46caa3
increment minor version
christianrauch Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,6 @@ jobs:
if: runner.os == 'macOS'
run: brew install ninja

- name: install yaml-cpp
shell: bash
run: |
git clone --depth 1 https://github.com/jbeder/yaml-cpp.git extern/yaml-cpp --branch yaml-cpp-0.7.0
cd extern/yaml-cpp
cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DYAML_CPP_BUILD_TESTS=OFF
$(which sudo) cmake --build build --target install

- name: set build environment variables (Windows)
if: runner.os == 'Windows'
shell: bash
run: |
echo "YAML_DIR='C:/Program Files (x86)/YAML_CPP/share/cmake/yaml-cpp/'" >> $GITHUB_ENV

- name: install Qt and Qt Creator
shell: bash
run: |
Expand All @@ -61,7 +47,7 @@ jobs:

- name: build plugin
run: |
cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${{ env.QTC_PATH }};${{ env.QT_PATH }}" -Dyaml-cpp_DIR=${{ env.YAML_DIR }} -DBUILD_ROSTERMINAL=OFF
cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${{ env.QTC_PATH }};${{ env.QT_PATH }}" -DBUILD_ROSTERMINAL=OFF
cmake --build build --target package

- name: find plugin archive
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10)

project(ROSProjectManager VERSION 14.0)
project(ROSProjectManager VERSION 14.1)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Werror -Wall -Wextra -Wpedantic -Wsuggest-override)
Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,11 @@ To build the Qt Creator plugin, you will need Qt Creator, the matching "Plugin D
Additionally, you need:
- OpenGL development libraries
- ninja for building
- yaml-cpp
- utf8proc

The dependencies can be installed via apt on Ubuntu:
```bash
sudo apt install libgl1-mesa-dev ninja-build libyaml-cpp-dev libutf8proc-dev
sudo apt install libgl1-mesa-dev ninja-build libutf8proc-dev
```

The `setup.py` script needs additional Python dependencies:
Expand Down
3 changes: 1 addition & 2 deletions src/project_manager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set(CMAKE_CXX_STANDARD 17)

find_package(QtCreator COMPONENTS Core REQUIRED)
find_package(QT NAMES Qt6 COMPONENTS Widgets REQUIRED)
find_package(yaml-cpp REQUIRED)

set(SRC
"remove_directory_dialog.cpp"
Expand Down Expand Up @@ -50,8 +49,8 @@ add_qtc_plugin(${PROJECT_NAME}
QtCreator::TextEditor
DEPENDS
QtCreator::Utils
QtCreator::yaml-cpp
Qt::Widgets
yaml-cpp
SOURCES
${SRC}
)
Expand Down