diff --git a/recipes/dnet/all/conanfile.py b/recipes/dnet/all/conanfile.py index 6996407d640f0..c8d803e208864 100644 --- a/recipes/dnet/all/conanfile.py +++ b/recipes/dnet/all/conanfile.py @@ -34,16 +34,17 @@ def config_options(self): del self.options.fPIC def configure(self): - self.options.rm_safe("fPIC") - self.settings.rm_safe("compiler.libcxx") + if self.options.shared: + self.options.rm_safe("fPIC") + # This is a pure C project self.settings.rm_safe("compiler.cppstd") + self.settings.rm_safe("compiler.libcxx") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) def generate(self): tc = CMakeToolchain(self) - tc.generate() deps = CMakeDeps(self) diff --git a/recipes/dnet/all/test_v1_package/CMakeLists.txt b/recipes/dnet/all/test_v1_package/CMakeLists.txt deleted file mode 100644 index 0d20897301b68..0000000000000 --- a/recipes/dnet/all/test_v1_package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package - ${CMAKE_CURRENT_BINARY_DIR}/test_package) diff --git a/recipes/dnet/all/test_v1_package/conanfile.py b/recipes/dnet/all/test_v1_package/conanfile.py deleted file mode 100644 index c7e2dc9c61059..0000000000000 --- a/recipes/dnet/all/test_v1_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run("{} {}".format(bin_path, "127.0.0.1"), run_environment=True)