Skip to content

Commit

Permalink
fix Invalid character escape
Browse files Browse the repository at this point in the history
  • Loading branch information
ericLemanissier committed Dec 7, 2022
1 parent 91b3060 commit 5a0ee1c
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions recipes/qt/6.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -462,11 +462,12 @@ def generate(self):

tc = CMakeToolchain(self, generator="Ninja")

tc.variables["INSTALL_MKSPECSDIR"] = os.path.join(self.package_folder, "res", "archdatadir", "mkspecs")
tc.variables["INSTALL_ARCHDATADIR"] = os.path.join(self.package_folder, "res", "archdatadir")
tc.variables["INSTALL_LIBEXECDIR"] = os.path.join(self.package_folder, "bin")
tc.variables["INSTALL_DATADIR"] = os.path.join(self.package_folder, "res", "datadir")
tc.variables["INSTALL_SYSCONFDIR"] = os.path.join(self.package_folder, "res", "sysconfdir")
package_folder = self.package_folder.replace('\\', '/')
tc.variables["INSTALL_MKSPECSDIR"] = f"{package_folder}/res/archdatadir/mkspecs"
tc.variables["INSTALL_ARCHDATADIR"] = f"{package_folder}/res/archdatadir"
tc.variables["INSTALL_LIBEXECDIR"] = f"{package_folder}/bin"
tc.variables["INSTALL_DATADIR"] = f"{package_folder}/res/datadir"
tc.variables["INSTALL_SYSCONFDIR"] = f"{package_folder}/res/sysconfdir"

tc.variables["QT_BUILD_TESTS"] = "OFF"
tc.variables["QT_BUILD_EXAMPLES"] = "OFF"
Expand Down Expand Up @@ -567,7 +568,7 @@ def generate(self):
tc.variables["CMAKE_SYSROOT"] = self.options.sysroot

if self.options.device:
tc.variables["QT_QMAKE_TARGET_MKSPEC"] = os.path.join("devices", self.options.device)
tc.variables["QT_QMAKE_TARGET_MKSPEC"] = f"devices/{self.options.device}"
else:
xplatform_val = self._xplatform()
if xplatform_val:
Expand Down

0 comments on commit 5a0ee1c

Please sign in to comment.