Skip to content

Commit

Permalink
Implement feedback on PR #5691, remove not needed requirement and fun…
Browse files Browse the repository at this point in the history
…ction
  • Loading branch information
wdobbe committed Jun 1, 2021
1 parent dbe22b4 commit 1a78207
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
7 changes: 0 additions & 7 deletions recipes/qt/5.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -656,9 +656,6 @@ def _getenvpath(var):
def _cmake_executables_file(self):
return os.path.join("lib", "cmake", "Qt5Core", "conan_qt_executables_variables.cmake")

def _cmake_qt5_private_file(self, module):
return os.path.join("lib", "cmake", "Qt5{0}".format(module), "conan_qt_qt5_{0}private.cmake".format(module.lower()))

def package(self):
with tools.chdir("build_folder"):
self.run("%s install" % self._make_program())
Expand Down Expand Up @@ -842,8 +839,6 @@ def _create_plugin(pluginname, libname, type, requires):

if self.options.qtdeclarative:
_create_module("Qml", ["Network"])
#self.cpp_info.components["qtQml"].build_modules["cmake_find_package"].append(self._cmake_qt5_private_file("Qml"))
#self.cpp_info.components["qtQml"].build_modules["cmake_find_package_multi"].append(self._cmake_qt5_private_file("Qml"))
_create_module("QmlModels", ["Qml"])
self.cpp_info.components["qtQmlImportScanner"].names["cmake_find_package"] = "QmlImportScanner" # this is an alias for Qml and there to integrate with existing consumers
self.cpp_info.components["qtQmlImportScanner"].names["cmake_find_package_multi"] = "QmlImportScanner"
Expand Down Expand Up @@ -1017,8 +1012,6 @@ def _create_plugin(pluginname, libname, type, requires):
self.cpp_info.components["qtCore"].builddirs.append(os.path.join("res","archdatadir","bin"))
self.cpp_info.components["qtCore"].build_modules["cmake_find_package"].append(self._cmake_executables_file)
self.cpp_info.components["qtCore"].build_modules["cmake_find_package_multi"].append(self._cmake_executables_file)
#self.cpp_info.components["qtCore"].build_modules["cmake_find_package"].append(self._cmake_qt5_private_file("Core"))
#self.cpp_info.components["qtCore"].build_modules["cmake_find_package_multi"].append(self._cmake_qt5_private_file("Core"))

for m in os.listdir(os.path.join("lib", "cmake")):
module = os.path.join("lib", "cmake", m, "%sMacros.cmake" % m)
Expand Down
1 change: 0 additions & 1 deletion recipes/qt/5.x.x/test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ class TestPackageConan(ConanFile):
generators = "qt", "cmake", "cmake_find_package_multi"

def build_requirements(self):
self.build_requires("cmake/3.20.2")
if tools.os_info.is_windows and self.settings.compiler == "Visual Studio":
self.build_requires("jom/1.1.3")
if self._meson_supported():
Expand Down

0 comments on commit 1a78207

Please sign in to comment.