Skip to content

Commit

Permalink
don't test with qmake on static qt
Browse files Browse the repository at this point in the history
  • Loading branch information
ericLemanissier committed Dec 7, 2022
1 parent 7c0bd3a commit 91b3060
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion recipes/qt/6.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ def generate(self):
tc.variables["INPUT_dbus"] = "linked"
else:
tc.variables["FEATURE_dbus"] = "OFF"
tc.variables["CMAKE_FIND_DEBUG_MODE"] = "TRUE"
tc.variables["CMAKE_FIND_DEBUG_MODE"] = "FALSE"


for opt, conf_arg in [("with_glib", "glib"),
Expand Down
9 changes: 1 addition & 8 deletions recipes/qt/6.x.x/test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ def _meson_supported(self):
not self._is_mingw()

def _qmake_supported(self):
return self.settings.compiler != "Visual Studio" or self.options["qt"].shared

def _cmake_multi_supported(self):
return True
return self.options["qt"].shared

def _build_with_qmake(self):
if not self._qmake_supported():
Expand Down Expand Up @@ -89,8 +86,6 @@ def _build_with_meson(self):
meson.build()

def _build_with_cmake_find_package_multi(self):
if not self._cmake_multi_supported():
return
self.output.info("Building with cmake_find_package_multi")
env_build = RunEnvironment(self)
with tools.environment_append(env_build.vars):
Expand Down Expand Up @@ -123,8 +118,6 @@ def _test_with_meson(self):
self.run(os.path.join("meson_folder", "test_package"), run_environment=True)

def _test_with_cmake_find_package_multi(self):
if not self._cmake_multi_supported():
return
self.output.info("Testing CMake_find_package_multi")
shutil.copy("qt.conf", "bin")
self.run(os.path.join("bin", "test_package"), run_environment=True)
Expand Down

0 comments on commit 91b3060

Please sign in to comment.