From 2b3b225659aa182b69a53b887815aa915dd8723e Mon Sep 17 00:00:00 2001 From: hyzboy Date: Wed, 1 Jul 2020 16:26:19 +0800 Subject: [PATCH 1/5] disable .rc support in QtCommon.cmake --- QtCommon.cmake | 102 ++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/QtCommon.cmake b/QtCommon.cmake index 81beeaf..3bd187c 100644 --- a/QtCommon.cmake +++ b/QtCommon.cmake @@ -1,64 +1,64 @@ macro(fix_project_version) -if (NOT PROJECT_VERSION_PATCH) - set(PROJECT_VERSION_PATCH 0) -endif() + if (NOT PROJECT_VERSION_PATCH) + set(PROJECT_VERSION_PATCH 0) + endif() -if (NOT PROJECT_VERSION_TWEAK) - set(PROJECT_VERSION_TWEAK 0) -endif() + if (NOT PROJECT_VERSION_TWEAK) + set(PROJECT_VERSION_TWEAK 0) + endif() endmacro() macro(add_project_meta FILES_TO_INCLUDE) -if (NOT RESOURCE_FOLDER) - set(RESOURCE_FOLDER res) -endif() + if (NOT RESOURCE_FOLDER) + set(RESOURCE_FOLDER res) + endif() -if (NOT ICON_NAME) - set(ICON_NAME AppIcon) -endif() + if (NOT ICON_NAME) + set(ICON_NAME AppIcon) + endif() -if (APPLE) - set(ICON_FILE GUI/${RESOURCE_FOLDER}/${ICON_NAME}.icns) -elseif (WIN32) - set(ICON_FILE GUI/${RESOURCE_FOLDER}/${ICON_NAME}.ico) -endif() + if (APPLE) + set(ICON_FILE GUI/${RESOURCE_FOLDER}/${ICON_NAME}.icns) + elseif (WIN32) + set(ICON_FILE GUI/${RESOURCE_FOLDER}/${ICON_NAME}.ico) + endif() -if (WIN32) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/windows_metafile.rc.in" - "windows_metafile.rc" - ) - set(RES_FILES "windows_metafile.rc") - set(CMAKE_RC_COMPILER_INIT windres) - ENABLE_LANGUAGE(RC) - SET(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") -endif() + # if (WIN32) + # configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/windows_metafile.rc.in" + # "windows_metafile.rc" + # ) + # set(RES_FILES "windows_metafile.rc") + # set(CMAKE_RC_COMPILER_INIT windres) + # ENABLE_LANGUAGE(RC) + # SET(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") + # endif() -if (APPLE) - set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + if (APPLE) + set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - # Identify MacOS bundle - set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}) - set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}) - set(MACOSX_BUNDLE_LONG_VERSION_STRING ${PROJECT_VERSION}) - set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") - set(MACOSX_BUNDLE_COPYRIGHT ${COPYRIGHT}) - set(MACOSX_BUNDLE_GUI_IDENTIFIER ${IDENTIFIER}) - set(MACOSX_BUNDLE_ICON_FILE ${ICON_NAME}) -endif() + # Identify MacOS bundle + set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}) + set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}) + set(MACOSX_BUNDLE_LONG_VERSION_STRING ${PROJECT_VERSION}) + set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") + set(MACOSX_BUNDLE_COPYRIGHT ${COPYRIGHT}) + set(MACOSX_BUNDLE_GUI_IDENTIFIER ${IDENTIFIER}) + set(MACOSX_BUNDLE_ICON_FILE ${ICON_NAME}) + endif() -if (APPLE) - set(${FILES_TO_INCLUDE} ${ICON_FILE}) -elseif (WIN32) - set(${FILES_TO_INCLUDE} ${RES_FILES}) -endif() + if (APPLE) + set(${FILES_TO_INCLUDE} ${ICON_FILE}) + elseif (WIN32) + set(${FILES_TO_INCLUDE} ${RES_FILES}) + endif() endmacro() macro(init_os_bundle) -if (APPLE) - set(OS_BUNDLE MACOSX_BUNDLE) -elseif (WIN32) - set(OS_BUNDLE WIN32) -endif() + if (APPLE) + set(OS_BUNDLE MACOSX_BUNDLE) + elseif (WIN32) + set(OS_BUNDLE WIN32) + endif() endmacro() macro(fix_win_compiler) @@ -66,10 +66,10 @@ macro(fix_win_compiler) endmacro() macro(init_qt) -# Let's do the CMake job for us -set(CMAKE_AUTOMOC ON) # For meta object compiler -set(CMAKE_AUTORCC ON) # Resource files -set(CMAKE_AUTOUIC ON) # UI files + # Let's do the CMake job for us + set(CMAKE_AUTOMOC ON) # For meta object compiler + set(CMAKE_AUTORCC ON) # Resource files + set(CMAKE_AUTOUIC ON) # UI files endmacro() init_os_bundle() From 5530bcc0dc92f76adc0716a4c3c0ca64d8240642 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 7 Jul 2020 19:14:00 +0800 Subject: [PATCH 2/5] add c++ latest option in Visual C++ --- compiler.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler.cmake b/compiler.cmake index 7396ab4..4144e1f 100644 --- a/compiler.cmake +++ b/compiler.cmake @@ -6,7 +6,7 @@ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD") SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest") add_definitions(-D_CRT_SECURE_NO_WARNINGS) From 0ef326e868c8b249698abea9f2b37a8268491783 Mon Sep 17 00:00:00 2001 From: kusugawa Date: Fri, 10 Jul 2020 17:01:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=BAMINGW32/64=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compiler.cmake | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/compiler.cmake b/compiler.cmake index 4144e1f..65890fc 100644 --- a/compiler.cmake +++ b/compiler.cmake @@ -1,14 +1,25 @@ IF(WIN32) - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") + if(MINGW) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -std=c99 -g") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++2a -g -Wall") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest") + SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c99 -O2") + SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++2a -O2") + + add_definitions(-D_WIN32_WINNT=0x0600) + else(MSVC) + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") - add_definitions(-D_CRT_SECURE_NO_WARNINGS) + SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD") + SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") + + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14") + + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + endif() ELSE() IF(NOT ANDROID) From 4cb22e5b4ca10839a934ac0a835db62e45657b0d Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 10 Jul 2020 18:05:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=9B=A0=E5=A4=9A=E7=BA=BF=E7=A8=8BAPI?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81WinVista/2008=EF=BC=8C=E6=89=80?= =?UTF-8?q?=E4=BB=A5=E5=B0=86=5FWIN32=5FWINNT=E7=89=88=E6=9C=AC=E5=AE=8F?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AF=B9=E5=BA=94Win7/2008R2=E7=9A=840x0601?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compiler.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler.cmake b/compiler.cmake index 65890fc..2f6f4d0 100644 --- a/compiler.cmake +++ b/compiler.cmake @@ -7,8 +7,8 @@ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c99 -O2") SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++2a -O2") - - add_definitions(-D_WIN32_WINNT=0x0600) + + add_definitions(-D_WIN32_WINNT=0x0601) else(MSVC) SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") From 321991587905e07076574f104831bc8457f630b3 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 11 Jul 2020 16:28:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?GCC/MingW=E5=A2=9E=E5=8A=A0-fchar8=5Ft?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compiler.cmake | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/compiler.cmake b/compiler.cmake index 2f6f4d0..c893497 100644 --- a/compiler.cmake +++ b/compiler.cmake @@ -1,12 +1,11 @@ IF(WIN32) if(MINGW) + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -std=c99 -g -fchar8_t") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++2a -g -fchar8_t -Wall") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -std=c99 -g") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++2a -g -Wall") - - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c99 -O2") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++2a -O2") + SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c99 -O2 -fchar8_t") + SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++2a -O2 -fchar8_t") add_definitions(-D_WIN32_WINNT=0x0601) else(MSVC) @@ -16,7 +15,7 @@ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD") SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest") add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() @@ -35,8 +34,8 @@ ELSE() endif() ENDIF() - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++2a -fchar8_t") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -fchar8_t") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb3") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3")