From 59d692b0b7abf1a899e4e4cfc7257217e70b79fb Mon Sep 17 00:00:00 2001 From: dvirtz Date: Tue, 4 Jan 2022 11:07:51 +0000 Subject: [PATCH 1/4] set opencl pkg_config name --- recipes/opencl-headers/all/conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/opencl-headers/all/conanfile.py b/recipes/opencl-headers/all/conanfile.py index 40b897f290a5b..7f797a8b9e9c3 100644 --- a/recipes/opencl-headers/all/conanfile.py +++ b/recipes/opencl-headers/all/conanfile.py @@ -37,9 +37,12 @@ def package_info(self): # TODO: to remove in conan v2 once cmake_find_package_* generators removed self.cpp_info.filenames["cmake_find_package"] = "OpenCLHeaders" self.cpp_info.filenames["cmake_find_package_multi"] = "OpenCLHeaders" + self.cpp_info.set_property("cmake_file_name", "OpenCLHeaders") + self.cpp_info.names["cmake_find_package"] = "OpenCL" self.cpp_info.names["cmake_find_package_multi"] = "OpenCL" - self.cpp_info.names["pkg_config"] = "OpenCL" + self.cpp_info.set_property("cmake_target_name", "OpenCL") + self.cpp_info.set_property("pkg_config_name", "OpenCL") self.cpp_info.components["_opencl-headers"].names["cmake_find_package"] = "Headers" self.cpp_info.components["_opencl-headers"].names["cmake_find_package_multi"] = "Headers" self.cpp_info.components["_opencl-headers"].set_property("cmake_target_name", "OpenCL::Headers") From c20419b5b2cd041f89e60f6b3a3584af63bd97af Mon Sep 17 00:00:00 2001 From: dvirtz Date: Tue, 4 Jan 2022 12:43:32 +0000 Subject: [PATCH 2/4] apply review changes --- recipes/opencl-headers/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opencl-headers/all/conanfile.py b/recipes/opencl-headers/all/conanfile.py index 7f797a8b9e9c3..4046d9389c8ab 100644 --- a/recipes/opencl-headers/all/conanfile.py +++ b/recipes/opencl-headers/all/conanfile.py @@ -41,7 +41,7 @@ def package_info(self): self.cpp_info.names["cmake_find_package"] = "OpenCL" self.cpp_info.names["cmake_find_package_multi"] = "OpenCL" - self.cpp_info.set_property("cmake_target_name", "OpenCL") + self.cpp_info.set_property("cmake_target_name", "OpenCL::OpenCL") self.cpp_info.set_property("pkg_config_name", "OpenCL") self.cpp_info.components["_opencl-headers"].names["cmake_find_package"] = "Headers" self.cpp_info.components["_opencl-headers"].names["cmake_find_package_multi"] = "Headers" From c661cc7f399e8b7746545724337ebb562127aff2 Mon Sep 17 00:00:00 2001 From: dvirtz Date: Tue, 4 Jan 2022 13:44:14 +0000 Subject: [PATCH 3/4] apply more suggestions --- recipes/opencl-headers/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opencl-headers/all/conanfile.py b/recipes/opencl-headers/all/conanfile.py index 4046d9389c8ab..ae0b3063de4e8 100644 --- a/recipes/opencl-headers/all/conanfile.py +++ b/recipes/opencl-headers/all/conanfile.py @@ -41,7 +41,7 @@ def package_info(self): self.cpp_info.names["cmake_find_package"] = "OpenCL" self.cpp_info.names["cmake_find_package_multi"] = "OpenCL" - self.cpp_info.set_property("cmake_target_name", "OpenCL::OpenCL") + self.cpp_info.set_property("cmake_target_name", "OpenCL::Headers") self.cpp_info.set_property("pkg_config_name", "OpenCL") self.cpp_info.components["_opencl-headers"].names["cmake_find_package"] = "Headers" self.cpp_info.components["_opencl-headers"].names["cmake_find_package_multi"] = "Headers" From 838d75e0de581b19d508fa3d318768cba801ad17 Mon Sep 17 00:00:00 2001 From: dvirtz Date: Tue, 4 Jan 2022 20:19:54 +0000 Subject: [PATCH 4/4] component file name should be different --- recipes/opencl-headers/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opencl-headers/all/conanfile.py b/recipes/opencl-headers/all/conanfile.py index ae0b3063de4e8..6ee65b45a73a7 100644 --- a/recipes/opencl-headers/all/conanfile.py +++ b/recipes/opencl-headers/all/conanfile.py @@ -46,4 +46,4 @@ def package_info(self): self.cpp_info.components["_opencl-headers"].names["cmake_find_package"] = "Headers" self.cpp_info.components["_opencl-headers"].names["cmake_find_package_multi"] = "Headers" self.cpp_info.components["_opencl-headers"].set_property("cmake_target_name", "OpenCL::Headers") - self.cpp_info.components["_opencl-headers"].set_property("pkg_config_name", "OpenCL") + self.cpp_info.components["_opencl-headers"].set_property("pkg_config_name", "OpenCLHeaders")