Skip to content

Commit

Permalink
[#11]: manage gcc/g++ on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
stefled committed Dec 20, 2023
1 parent 95796c4 commit 9e766a0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packagedependencies-parser.pri
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ for(depfile, packagedepsfiles) {
else {
CONAN_COMPILER_VERSION_OPTION=
CONAN_COMPILER_RUNTIME=
win32 {
win32-msvc {
CONAN_COMPILER_VERSION_OPTION=-s compiler.version=$${CONAN_WIN_COMPILER_VERSION}
# manage runtime
Expand Down
2 changes: 1 addition & 1 deletion remaken_arch_define.pri
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ isEmpty(CONAN_MAJOR_VERSION) {

isEmpty(REMAKEN_TARGET_PLATFORM) {
REMAKEN_BUILD_TOOLCHAIN = $$basename(QMAKE_CC)
win32 {
win32-msvc {
!defined(QMAKE_MSC_VER,var) {
!defined (MSVC_VER, var) {
error("Unable to find msvc version : Use minimum Qt 5.6 version.")
Expand Down

0 comments on commit 9e766a0

Please sign in to comment.