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

Remaned package qt_gui_icons -> tango_icons_vendor #4

Merged
merged 8 commits into from
Jun 19, 2020
Merged

Remaned package qt_gui_icons -> tango_icons_vendor #4

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9c059da
Remaned package qt_gui_icons -> tango_icons_vendor
ahcorde Jun 4, 2020
29331b8
Updated CMake var to install tango icons: INSTALL_TANGO_ICONS
ahcorde Jun 4, 2020
7de6708
Merge remote-tracking branch 'origin/master' into ahcorde/package_name
ahcorde Jun 4, 2020
a6b8ffd
Added cmake option INSTALL_TANGO_ICONS
ahcorde Jun 5, 2020
e0e2596
Merge remote-tracking branch 'origin/master' into ahcorde/package_name
ahcorde Jun 5, 2020
4864653
Fixed logic
ahcorde Jun 18, 2020
3c67365
set INSTALL_TANGO_ICONS_DEFAULT_VALUE to option
ahcorde Jun 18, 2020
1bee105
Make linters happy
ahcorde Jun 18, 2020
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
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
cmake_minimum_required(VERSION 3.5)
project(qt_gui_icons)
project(tango_icons_vendor)
ahcorde marked this conversation as resolved.
Show resolved Hide resolved

find_package(ament_cmake REQUIRED)

if (WIN32 OR APPLE OR INSTALL_QT_GUI_ICONS)
option(INSTALL_TANGO_ICONS "Install Tango icons" OFF)
dirk-thomas marked this conversation as resolved.
Show resolved Hide resolved

if (WIN32 OR APPLE OR INSTALL_TANGO_ICONS)
dirk-thomas marked this conversation as resolved.
Show resolved Hide resolved
install(DIRECTORY resource
DESTINATION share/${PROJECT_NAME})
endif()
Expand Down
4 changes: 2 additions & 2 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<package format="2">
<name>qt_gui_icons</name>
<name>tango_icons_vendor</name>
<version>0.0.0</version>
<description>qt_gui_icons provides the public domain Tango icons for Windows (<a href="http://tango.freedesktop.org/Tango_Icon_Library">Tango Icon Library</a>) from the <a href="http://tango.freedesktop.org/Tango_Desktop_Project">Tango Desktop Project</a></description>
<description>tango_icons_vendor provides the public domain Tango icons for non-linux systems (<a href="http://tango.freedesktop.org/Tango_Icon_Library">Tango Icon Library</a>) from the <a href="http://tango.freedesktop.org/Tango_Desktop_Project">Tango Desktop Project</a></description>
dirk-thomas marked this conversation as resolved.
Show resolved Hide resolved
<maintainer email="[email protected]">Alejandro Hernandez</maintainer>

<license>Public Domain</license>
Expand Down