diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index e222fd3d..7eccca8d 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,2 +1,3 @@ libignition-cmake2-dev libignition-tools-dev +libignition-utils1-cli-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index cdee1086..165fb676 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,12 @@ ign_find_package(DL ign_find_package(ignition-tools QUIET) +#-------------------------------------- +# Find ignition-utils +ign_find_package(ignition-utils1 REQUIRED COMPONENTS cli) +set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR}) + + #============================================================================ # Configure the build #============================================================================ diff --git a/configure.bat b/configure.bat deleted file mode 100644 index 0030447d..00000000 --- a/configure.bat +++ /dev/null @@ -1,25 +0,0 @@ - -:: NOTE: This script is only meant to be used as part of the ignition developers' CI system -:: Users and developers should build and install this library using cmake and Visual Studio - - -:: Install dependencies -call %win_lib% :download_unzip_install dlfcn-win32-vc15-x64-dll-MD.zip -call %win_lib% :install_ign_project ign-cmake ign-cmake2 - -:: Set configuration variables -@set build_type=Release -@if not "%1"=="" set build_type=%1 -@echo Configuring for build type %build_type% - -:: Go to the directory that this configure.bat file exists in -cd /d %~dp0 - -:: Create a build directory and configure -md build -cd build -cmake .. -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX="%WORKSPACE_INSTALL_DIR%" -DCMAKE_BUILD_TYPE="%build_type%" -DBUILD_TESTING:BOOL=False -:: Note: We disable testing by default. If the intention is for the CI to build and test -:: this project, then the CI script will turn it back on. - -:: If the caller wants to build and/or install, they should do so after calling this script diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 67ecec46..fd239c4d 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -9,7 +9,7 @@ ign_create_core_library( CXX_STANDARD 17) target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} - PUBLIC ignition-cmake${IGN_CMAKE_VER}::utilities) + PUBLIC ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER}) # Build the unit tests ign_build_tests( diff --git a/core/include/ignition/plugin/Info.hh b/core/include/ignition/plugin/Info.hh index 4ad8f645..aed1a315 100644 --- a/core/include/ignition/plugin/Info.hh +++ b/core/include/ignition/plugin/Info.hh @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/core/include/ignition/plugin/Plugin.hh b/core/include/ignition/plugin/Plugin.hh index d94fc95d..1a4280ee 100644 --- a/core/include/ignition/plugin/Plugin.hh +++ b/core/include/ignition/plugin/Plugin.hh @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/core/include/ignition/plugin/detail/Factory.hh b/core/include/ignition/plugin/detail/Factory.hh index 584ca929..78ef4044 100644 --- a/core/include/ignition/plugin/detail/Factory.hh +++ b/core/include/ignition/plugin/detail/Factory.hh @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/loader/include/ignition/plugin/Loader.hh b/loader/include/ignition/plugin/Loader.hh index 8006ac3c..bbab8979 100644 --- a/loader/include/ignition/plugin/Loader.hh +++ b/loader/include/ignition/plugin/Loader.hh @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/register/include/ignition/plugin/detail/Register.hh b/register/include/ignition/plugin/detail/Register.hh index cd62ba41..021d93b3 100644 --- a/register/include/ignition/plugin/detail/Register.hh +++ b/register/include/ignition/plugin/detail/Register.hh @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md index d6bc1c84..9033ea3a 100644 --- a/tutorials/02_installation.md +++ b/tutorials/02_installation.md @@ -43,7 +43,7 @@ sudo apt install libignition-plugin-dev 1. Install Ignition dependencies ``` - sudo apt-get install libignition-cmake2-dev + sudo apt-get install libignition-cmake2-dev libignition-tools-dev libignition-utils1-cli-dev ``` 2. Clone the repository