Skip to content

Commit ea5255c

Browse files
committed
Update CI (relwithdebinfo)
1 parent 9ab8e36 commit ea5255c

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

conanfile.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,8 @@ def generate(self):
9292
qt_path = pathlib.Path(self.deps_cpp_info["qt"].rootpath)
9393
qt_cfg = list(qt_path.glob("**/Qt6Config.cmake"))[0]
9494
qt_dir = qt_cfg.parents[0].as_posix()
95-
qt_root = qt_cfg.parents[3].as_posix()
9695

97-
# for Qt >= 6.4.2
98-
#tc.variables["Qt6_DIR"] = qt_dir
99-
100-
# for Qt < 6.4.2
101-
tc.variables["Qt6_ROOT"] = qt_root
96+
tc.variables["Qt6_DIR"] = qt_dir
10297

10398
# Use the ManiVault .cmake file to find ManiVault with find_package
10499
mv_core_root = self.deps_cpp_info["hdps-core"].rootpath
@@ -121,12 +116,12 @@ def build(self):
121116
print("Build OS is: ", self.settings.os)
122117

123118
cmake = self._configure_cmake()
124-
cmake.build(build_type="Debug")
119+
cmake.build(build_type="RelWithDebInfo")
125120
cmake.build(build_type="Release")
126121

127122
def package(self):
128123
package_dir = pathlib.Path(self.build_folder, "package")
129-
debug_dir = package_dir / "Debug"
124+
relWithDebInfo_dir = package_dir / "RelWithDebInfo"
130125
release_dir = package_dir / "Release"
131126
print("Packaging install dir: ", package_dir)
132127
subprocess.run(
@@ -135,9 +130,9 @@ def package(self):
135130
"--install",
136131
self.build_folder,
137132
"--config",
138-
"Debug",
133+
"RelWithDebInfo",
139134
"--prefix",
140-
debug_dir,
135+
relWithDebInfo_dir,
141136
]
142137
)
143138
subprocess.run(
@@ -152,11 +147,11 @@ def package(self):
152147
]
153148
)
154149
self.copy(pattern="*", src=package_dir)
155-
150+
156151
def package_info(self):
157-
self.cpp_info.debug.libdirs = ["Debug/lib"]
158-
self.cpp_info.debug.bindirs = ["Debug/Plugins", "Debug"]
159-
self.cpp_info.debug.includedirs = ["Debug/include", "Debug"]
152+
self.cpp_info.relwithdebinfo.libdirs = ["RelWithDebInfo/lib"]
153+
self.cpp_info.relwithdebinfo.bindirs = ["RelWithDebInfo/Plugins", "RelWithDebInfo"]
154+
self.cpp_info.relwithdebinfo.includedirs = ["RelWithDebInfo/include", "RelWithDebInfo"]
160155
self.cpp_info.release.libdirs = ["Release/lib"]
161156
self.cpp_info.release.bindirs = ["Release/Plugins", "Release"]
162157
self.cpp_info.release.includedirs = ["Release/include", "Release"]

0 commit comments

Comments
 (0)