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

Bump main to 5.0.0~pre1 #193

Merged
merged 2 commits into from
Apr 2, 2021
Merged

Bump main to 5.0.0~pre1 #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed39bf3
Bump main to 5.0.0~pre1
chapulina Apr 1, 2021
69d27bb
Fix compiling examples
chapulina Apr 1, 2021
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-common4 VERSION 4.0.0)
project(ignition-common5 VERSION 5.0.0)

#============================================================================
# Find ignition-cmake
Expand All @@ -14,7 +14,7 @@ set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
#============================================================================
# Configure the project
#============================================================================
ign_configure_project(VERSION_SUFFIX pre2)
ign_configure_project(VERSION_SUFFIX pre1)

#============================================================================
# Set project-specific options
Expand Down
6 changes: 5 additions & 1 deletion Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## Ignition Common 5.x

## Ignition Common 5.0.0 (20XX-XX-XX)

## Ignition Common 4.x

## Ignition Common 4.X.X
## Ignition Common 4.X.X (20XX-XX-XX)

## Ignition Common 4.0.0 (2021-03-22)

Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)

# Find the ignition-common library
set(IGN_COMMON_VER 4)
set(IGN_COMMON_VER 5)
find_package(ignition-common${IGN_COMMON_VER} QUIET REQUIRED COMPONENTS events profiler)

add_executable(assert_example assert_example.cc)
Expand Down
8 changes: 4 additions & 4 deletions tutorials/profiler.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ enabled at compile time in order to function.
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)

# Find the ignition-common library
find_package(ignition-common4 QUIET REQUIRED COMPONENTS profiler)
find_package(ignition-common5 QUIET REQUIRED COMPONENTS profiler)

add_executable(profiler_example profiler.cc)
target_link_libraries(profiler_example ignition-common4::profiler)
target_link_libraries(profiler_example ignition-common5::profiler)
# Enable the profiler for the example
target_compile_definitions(profiler_example PUBLIC "IGN_PROFILER_ENABLE=1")
```
Expand Down Expand Up @@ -99,10 +99,10 @@ xdg-open $SOURCE_DIR/ign-common/profiler/src/Remotery/vis/index.html

# Use the installation path (Linux)
# This may vary depending on where you have choosen to install
xdg-open /usr/share/ignition/ignition-common4/profiler_vis/index.html
xdg-open /usr/share/ignition/ignition-common5/profiler_vis/index.html

# Use the installation path (macOS)
open /usr/share/ignition/ignition-common4/profiler_vis/index.html
open /usr/share/ignition/ignition-common5/profiler_vis/index.html
```

### On Ignition library
Expand Down