diff --git a/conanfile.py b/conanfile.py index bd2fdeb..eb46357 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,3 +1,5 @@ +import os + from conan import ConanFile from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps from conan.tools.scm import Git @@ -25,7 +27,7 @@ def validate(self): def requirements(self): self.requires("boost/1.83.0") - self.test_requires("gtest/1.14.00") + self.test_requires("gtest/1.14.0") self.requires("jsoncpp/1.9.5") self.requires("libcurl/8.4.0") self.requires("libgettext/0.22") @@ -39,7 +41,7 @@ def requirements(self): def source(self): git = Git(self) git.clone(url="https://github.com/NickvisionApps/libaura.git", target=".") - git.checkout("2024.1.0-pre") + git.checkout("68689f2d2566769f0d28db79ac189b2a0a8735d8") def config_options(self): if self.settings.os == "Windows": @@ -65,11 +67,11 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() - if not self.conf.get("tools.build:skip_test", default=False): - test_folder = os.path - if self.settings.os == "Windows": - test_folder = os.path.join("", str(self.settings.build_type)) - self.run(os.path.join(test_folder, "libaura_test")) + #if not self.conf.get("tools.build:skip_test", default=False): + #test_folder = os.path.join("") + #if self.settings.os == "Windows": + #test_folder = os.path.join("", str(self.settings.build_type)) + #self.run(os.path.join(test_folder, "libaura_test")) def package(self): cmake = CMake(self) diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index 46a2b0f..64dcf6e 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.15) project(PackageTest CXX) find_package(libaura CONFIG REQUIRED) +find_package(jsoncpp REQUIRED) add_executable(example src/example.cpp) -target_link_libraries(example libaura::libaura) +target_link_libraries(example libaura::libaura JsonCpp::JsonCpp) diff --git a/test_package/conanfile.py b/test_package/conanfile.py index a408fb2..61fd181 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -10,6 +10,7 @@ class libauraTestConan(ConanFile): def requirements(self): self.requires(self.tested_reference_str) + self.requires("jsoncpp/1.9.5") def build(self): cmake = CMake(self) diff --git a/test_package/src/example.cpp b/test_package/src/example.cpp index b75eb02..90bbc07 100644 --- a/test_package/src/example.cpp +++ b/test_package/src/example.cpp @@ -1,4 +1,6 @@ -#include "aura.h" +#include "libaura/aura.h" + +using namespace Nickvision::Aura; int main() {