Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ghc-filesystem: use same config file name even before 1.5.2 #9383

Merged
merged 1 commit into from
Feb 15, 2022
Merged

ghc-filesystem: use same config file name even before 1.5.2 #9383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions recipes/ghc-filesystem/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ def package(self):
tools.rmdir(os.path.join(self.package_folder, "lib"))

def package_info(self):
config_file = "ghcFilesystem" if tools.Version(self.version) < "1.5.2" else "ghc_filesystem"
self.cpp_info.set_property("cmake_file_name", config_file)
self.cpp_info.set_property("cmake_file_name", "ghc_filesystem")
self.cpp_info.set_property("cmake_target_name", "ghcFilesystem::ghc_filesystem")
# TODO: back to global scope in conan v2 once cmake_find_package_* generators removed
self.cpp_info.components["ghc_filesystem"].bindirs = []
self.cpp_info.components["ghc_filesystem"].frameworkdirs = []
self.cpp_info.components["ghc_filesystem"].libdirs = []
self.cpp_info.components["ghc_filesystem"].resdirs = []

# TODO: to remove in conan v2 once cmake_find_package_* generators removed
self.cpp_info.filenames["cmake_find_package"] = config_file
self.cpp_info.filenames["cmake_find_package_multi"] = config_file
self.cpp_info.filenames["cmake_find_package"] = "ghc_filesystem"
self.cpp_info.filenames["cmake_find_package_multi"] = "ghc_filesystem"
self.cpp_info.names["cmake_find_package"] = "ghcFilesystem"
self.cpp_info.names["cmake_find_package_multi"] = "ghcFilesystem"
self.cpp_info.components["ghc_filesystem"].names["cmake_find_package"] = "ghc_filesystem"
Expand Down
6 changes: 1 addition & 5 deletions recipes/ghc-filesystem/all/test_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ project(test_package)
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup(TARGETS)

if(GHC_FILESYSTEM_VERSION VERSION_LESS "1.5.2")
find_package(ghcFilesystem REQUIRED CONFIG)
else()
find_package(ghc_filesystem REQUIRED CONFIG)
endif()
find_package(ghc_filesystem REQUIRED CONFIG)

add_executable(${PROJECT_NAME} test_package.cpp)
target_link_libraries(${PROJECT_NAME} ghcFilesystem::ghc_filesystem)
Expand Down
1 change: 0 additions & 1 deletion recipes/ghc-filesystem/all/test_package/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ class TestPackageConan(ConanFile):

def build(self):
cmake = CMake(self)
cmake.definitions["GHC_FILESYSTEM_VERSION"] = self.deps_cpp_info["ghc-filesystem"].version
cmake.configure()
cmake.build()

Expand Down