diff options
Diffstat (limited to 'test_package')
| -rw-r--r-- | test_package/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | test_package/conanfile.py | 17 |
2 files changed, 6 insertions, 26 deletions
diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index 4bfe6f5..dcd1f3e 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -5,23 +5,12 @@ project("TestPackage" DESCRIPTION "Conan test package for 'Wanda!'" ) -find_package("wanda" REQUIRED - COMPONENTS - "control" - "meta" - "proto" - "std_ext" - "system" -) +find_package("wanda" REQUIRED) add_executable("test" "test.cpp" ) target_link_libraries("test" - "wanda::control" - "wanda::meta" - "wanda::proto" - "wanda::std_ext" - "wanda::system" + "wanda::wanda" ) diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 6077dcb..403e357 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -13,9 +13,6 @@ class WandaTestConan(ConanFile): self.requires(self.tested_reference_str) def build(self): - if self._apps_only: - return - cmake = CMake(self) cmake.configure() cmake.build() @@ -27,13 +24,7 @@ class WandaTestConan(ConanFile): if not can_run(self): return - if self._apps_only: - self.run("wandad -h", env="conanrun") - self.run("wandac -h", env="conanrun") - else: - cmd = os.path.join(self.cpp.build.bindir, "test") - self.run(cmd, env="conanrun") - - @property - def _apps_only(self): - return self.dependencies[self.tested_reference_str].options.nolibs + self.run("wandad -h", env="conanrun") + self.run("wandac -h", env="conanrun") + cmd = os.path.join(self.cpp.build.bindir, "test") + self.run(cmd, env="conanrun") |