diff --git a/recipes/flatbush/all/test_package/CMakeLists.txt b/recipes/flatbush/all/test_package/CMakeLists.txt index 2d31fd26de999..e514b751028de 100644 --- a/recipes/flatbush/all/test_package/CMakeLists.txt +++ b/recipes/flatbush/all/test_package/CMakeLists.txt @@ -1,10 +1,12 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.12) +cmake_minimum_required(VERSION 3.12) -PROJECT(test_package VERSION 1.0.0 LANGUAGES CXX) -INCLUDE(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +project(test_package VERSION 1.0.0 LANGUAGES CXX) +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup(TARGETS) find_package(flatbush CONFIG REQUIRED) -ADD_EXECUTABLE(${PROJECT_NAME} "test_package.cpp") +add_executable(${PROJECT_NAME} "test_package.cpp") -TARGET_LINK_LIBRARIES(${PROJECT_NAME} flatbush::flatbush) +target_link_libraries(${PROJECT_NAME} flatbush::flatbush) + +set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) \ No newline at end of file diff --git a/recipes/flatbush/all/test_package/conanfile.py b/recipes/flatbush/all/test_package/conanfile.py index 08144aa9b8986..1898592557c28 100644 --- a/recipes/flatbush/all/test_package/conanfile.py +++ b/recipes/flatbush/all/test_package/conanfile.py @@ -12,15 +12,6 @@ def build(self): cmake.configure() cmake.build() - def configure(self): - compiler = self.settings.compiler - - if compiler.cppstd: - tools.check_min_cppstd(self, 11) - - if (compiler == "gcc" and Version(compiler.version) < 6) or (compiler == "apple-clang" and compiler.cppstd == "None"): - compiler.cppstd = "11" - def test(self): if not tools.cross_building(self): bin_path = os.path.join("bin", "test_package")