Remove duplication in test_package

conan-io · Feb 5, 2023 · 30b6d40 · 30b6d40
1 parent e10890c
commit 30b6d40
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 41 deletions.
diff --git a/recipes/folly/all/test_v1_package/CMakeLists.txt b/recipes/folly/all/test_v1_package/CMakeLists.txt
@@ -4,14 +4,5 @@ project(test_package CXX)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-find_package(folly CONFIG REQUIRED)
-
-add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} Folly::folly)
-
-
-if (${FOLLY_VERSION} VERSION_LESS "2021.07.20.00")
-    set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
-else()
-    set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
-endif()
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package)
diff --git a/recipes/folly/all/test_v1_package/conanfile.py b/recipes/folly/all/test_v1_package/conanfile.py
@@ -15,4 +15,4 @@ def build(self):
     def test(self):
         if not tools.cross_building(self):
             bin_path = os.path.join("bin", "test_package")
-            self.run(command=bin_path, run_environment=True)
+            self.run(bin_path, run_environment=True)
diff --git a/recipes/folly/all/test_v1_package/test_package.cpp b/recipes/folly/all/test_v1_package/test_package.cpp