Improve CMakeLists

Author: jonaski

CMakeLists.txt

@@ -2,67 +2,72 @@
 # Copyright 2019, Jonas Kvinge <jonas@jkvinge.net>
 
 project(sqlrestore)
-cmake_minimum_required(VERSION 3.0)
-if(CMAKE_VERSION VERSION_GREATER 3.0)
-  cmake_policy(SET CMP0054 NEW)
-endif()
+cmake_minimum_required(VERSION 3.1)
+cmake_policy(SET CMP0054 NEW)
 
 include(CheckCXXCompilerFlag)
 include(CheckIncludeFiles)
 include(FindPkgConfig)
 include(FindPackageHandleStandardArgs)
 include(cmake/Version.cmake)
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   include(cmake/Rpm.cmake)
   include(cmake/Deb.cmake)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+option(BUILD_WERROR "Build with -Werror" OFF)
+
+if(WIN32)
+  option(ENABLE_WIN32_CONSOLE "Show the windows console even outside Debug mode" OFF)
+endif()
+
+if(MSVC)
+  set(CMAKE_C_STANDARD 99)
+else()
+  set(CMAKE_C_STANDARD 11)
+endif()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-list(APPEND COMPILE_OPTIONS
-  $<$<COMPILE_LANGUAGE:C>:-std=c99>
-  $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>
-  -Wall
-  -Wextra
-  -Wpedantic
-  -Wunused
-  -Wuninitialized
-  -Wredundant-decls
-  -Wcast-align
-  -Winit-self
-  -Wmissing-include-dirs
-  -Wmissing-declarations
-  -Wstrict-overflow=2
-  -Wunused-parameter
-  -Wformat=2
-  -Wdisabled-optimization
-  -Wno-sign-conversion
-  $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
-  $<$<COMPILE_LANGUAGE:CXX>:-Wno-old-style-cast>
-  $<$<COMPILE_LANGUAGE:CXX>:-fpermissive>
-)
-
-if(APPLE)
-  list(APPEND COMPILE_OPTIONS -Wno-unused-parameter)
-endif()
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-  list(APPEND COMPILE_OPTIONS -Wno-language-extension-token)
+if(MSVC)
+  list(APPEND COMPILE_OPTIONS /std:c++17)
+else()
+  list(APPEND COMPILE_OPTIONS
+    $<$<COMPILE_LANGUAGE:C>:-std=c11>
+    $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>
+    -Wall
+    -Wextra
+    -Wpedantic
+    -Wunused
+    -Wuninitialized
+    -Wredundant-decls
+    -Wcast-align
+    -Winit-self
+    -Wmissing-include-dirs
+    -Wmissing-declarations
+    -Wstrict-overflow=2
+    -Wunused-parameter
+    -Wformat=2
+    -Wdisabled-optimization
+    -Wno-sign-conversion
+    $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
+    $<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
+  )
 endif()
 
-option(BUILD_WERROR "Build with -Werror" ON)
-if(BUILD_WERROR)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-endif(BUILD_WERROR)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+  list(APPEND COMPILE_OPTIONS -Wno-language-extension-token)
+endif()
 
-add_compile_options(${COMPILE_OPTIONS})
+if(NOT MSVC AND BUILD_WERROR)
+  list(APPEND COMPILE_OPTIONS -Werror)
+endif()
 
-if(${CMAKE_BUILD_TYPE} MATCHES "Release")
-  add_definitions(-DNDEBUG)
-  add_definitions(-DQT_NO_DEBUG_OUTPUT)
-  #add_definitions(-DQT_NO_WARNING_OUTPUT)
+if(COMPILE_OPTIONS)
+  add_compile_options(${COMPILE_OPTIONS})
 endif()
 
 find_program(CCACHE_EXECUTABLE NAMES ccache)
@@ -75,7 +80,7 @@ endif()
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
 find_package(Boost REQUIRED)
-find_package(Backtrace QUIET)
+find_package(Backtrace)
 if(Backtrace_FOUND)
   set(HAVE_BACKTRACE ON)
 endif()
@@ -89,11 +94,7 @@ if(GLIB_FOUND)
 endif()
 
 # QT
-
-if(NOT QT_DEFAULT_MAJOR_VERSION)
-  set(QT_DEFAULT_MAJOR_VERSION 5)
-endif()
-set(QT_MAJOR_VERSION ${QT_DEFAULT_MAJOR_VERSION} CACHE STRING "Qt version to use (5 or 6), defaults to ${QT_DEFAULT_MAJOR_VERSION}")
+set(QT_MAJOR_VERSION 6 CACHE STRING "Qt version to use (5 or 6), defaults to 6")
 
 option(BUILD_WITH_QT5 "Use Qt 5" OFF)
 option(BUILD_WITH_QT6 "Use Qt 6" OFF)
@@ -108,15 +109,17 @@ else()
   elseif(QT_MAJOR_VERSION EQUAL 6)
     set(BUILD_WITH_QT6 ON)
   else()
-    set(BUILD_WITH_QT5 ON)
-    set(QT_MAJOR_VERSION 5)
+    set(BUILD_WITH_QT6 ON)
+    set(QT_MAJOR_VERSION 6)
   endif()
 endif()
 
+set(QT_DEFAULT_MAJOR_VERSION ${QT_MAJOR_VERSION})
+
 set(QT_COMPONENTS Core Concurrent Network Sql Gui Widgets)
 
 if(QT_MAJOR_VERSION EQUAL 5)
-  set(QT_MIN_VERSION 5.9)
+  set(QT_MIN_VERSION 5.12)
 endif()
 
 find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS})
@@ -127,30 +130,44 @@ set(QtGui_LIBRARIES Qt${QT_MAJOR_VERSION}::Gui)
 set(QtWidgets_LIBRARIES Qt${QT_MAJOR_VERSION}::Widgets)
 set(QtNetwork_LIBRARIES Qt${QT_MAJOR_VERSION}::Network)
 set(QtSql_LIBRARIES Qt${QT_MAJOR_VERSION}::Sql)
-set(QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Concurrent Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::Sql)
 
 # QUAZIP
 find_package(QuaZip-Qt6 REQUIRED)
 
+if(BUILD_WITH_QT5 AND Qt5Core_VERSION VERSION_LESS 5.15.0)
+  macro(qt_add_resources)
+    qt5_add_resources(${ARGN})
+  endmacro()
+  macro(qt_wrap_cpp)
+    qt5_wrap_cpp(${ARGN})
+  endmacro()
+  macro(qt_wrap_ui)
+    qt5_wrap_ui(${ARGN})
+  endmacro()
+endif()
+
 # QODBC - Build a modified QODBC driver that works with FreeTDS on UNIX renamed QODBCX
 if (UNIX AND _Qt5Core_PRIVATE_DIRS_EXIST AND _Qt5Sql_PRIVATE_DIRS_EXIST AND Qt5Sql_VERSION VERSION_GREATER_EQUAL 5.14.1 AND NOT APPLE)
   set(HAVE_QSQLODBCX ON)
   add_subdirectory(3rdparty/qsqlodbc)
   include_directories(3rdparty/qsqlodbc)
 endif ()
 
-if (WIN32)
+if(WIN32 AND NOT MSVC)
   # RC compiler
   string(REPLACE "gcc" "windres" CMAKE_RC_COMPILER_INIT ${CMAKE_C_COMPILER})
   enable_language(RC)
   SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -o <OBJECT> <SOURCE> -I ${CMAKE_SOURCE_DIR}/dist/windows")
-endif(WIN32)
+endif()
 
-# Optional bits
-if(WIN32)
-  option(ENABLE_WIN32_CONSOLE "Show the windows console even outside Debug mode" OFF)
-endif(WIN32)
+if(CMAKE_BUILD_TYPE MATCHES "Release")
+  add_definitions(-DNDEBUG)
+  add_definitions(-DQT_NO_DEBUG_OUTPUT)
+endif()
 
+if(WIN32)
+  add_definitions(-DUNICODE)
+endif()
 
 # Subdirectories
 add_subdirectory(src)

src/CMakeLists.txt

@@ -27,6 +27,7 @@ set(SOURCES
 set(HEADERS
   mainwindow.h
   application.h
+  logging.h
   scopedresult.h
   aboutdialog.h
   qsearchfield.h
@@ -53,20 +54,12 @@ set(UI
 set(RESOURCES ../data/data.qrc ../data/icons.qrc)
 set(OTHER_SOURCES)
 
-option(USE_INSTALL_PREFIX "Look for data in CMAKE_INSTALL_PREFIX" ON)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
-if(Qt6Core_FOUND)
-  qt6_wrap_cpp(MOC ${HEADERS})
-  qt6_wrap_ui(UIC ${UI})
-  qt6_add_resources(QRC ${RESOURCES})
-else()
-  qt5_wrap_cpp(MOC ${HEADERS})
-  qt5_wrap_ui(UIC ${UI})
-  qt5_add_resources(QRC ${RESOURCES})
-endif()
+qt_wrap_cpp(MOC ${HEADERS})
+qt_wrap_ui(UIC ${UI})
+qt_add_resources(QRC ${RESOURCES})
 
 add_library(sqlrestore_lib STATIC
   ${SOURCES}
@@ -78,53 +71,70 @@ add_library(sqlrestore_lib STATIC
   ${OTHER_UIC_SOURCES}
 )
 
+target_include_directories(sqlrestore_lib SYSTEM PUBLIC
+  ${GLIB_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+  ${ZLIB_INCLUDE_DIRS}
+  ${MAGIC_INCLUDE_DIRS}
+  ${QUAZIP_INCLUDE_DIRS}
+  ${SINGLEAPPLICATION_INCLUDE_DIRS}
+  ${SINGLECOREAPPLICATION_INCLUDE_DIRS}
+)
+
 target_include_directories(sqlrestore_lib PUBLIC
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${GLIB_INCLUDE_DIRS}
-  ${GLIBCONFIG_INCLUDE_DIRS}
-  ${Boost_INCLUDE_DIRS}
-  ${ZLIB_INCLUDE_DIRS}
-  ${QUAZIP_INCLUDE_DIRS}
 )
 
-link_directories(
+target_link_directories(sqlrestore_lib PUBLIC
+  ${ZLIB_LIBRARY_DIRS}
+  ${MAGIC_LIBRARY_DIRS}
   ${GLIB_LIBRARY_DIRS}
   ${QUAZIP_LIBRARY_DIRS}
 )
 
 target_link_libraries(sqlrestore_lib PUBLIC
   ${CMAKE_THREAD_LIBS_INIT}
-  ${GLIB_LIBRARIES}
   ${ZLIB_LIBRARIES}
   ${MAGIC_LIBRARIES}
-  ${QT_LIBRARIES}
+  ${GLIB_LIBRARIES}
+  ${QtCore_LIBRARIES}
+  ${QtConcurrent_LIBRARIES}
+  ${QtGui_LIBRARIES}
+  ${QtWidgets_LIBRARIES}
+  ${QtNetwork_LIBRARIES}
+  ${QtSql_LIBRARIES}
   QuaZip::QuaZip
 )
 
-if (UNIX AND _Qt5Core_PRIVATE_DIRS_EXIST AND _Qt5Sql_PRIVATE_DIRS_EXIST AND Qt5Sql_VERSION VERSION_GREATER_EQUAL 5.14.1 AND NOT APPLE)
+if(UNIX AND _Qt5Core_PRIVATE_DIRS_EXIST AND _Qt5Sql_PRIVATE_DIRS_EXIST AND Qt5Sql_VERSION VERSION_GREATER_EQUAL 5.14.1 AND NOT APPLE)
   target_link_libraries(sqlrestore_lib PRIVATE qsqlodbc)
 endif()
 
-if (WIN32)
-  target_link_libraries(sqlrestore_lib PRIVATE odbccp32 regex shlwapi bz2 harfbuzz freetype)
+if(WIN32)
+  target_link_libraries(sqlrestore_lib PRIVATE odbccp32 regex shlwapi)
+  if(CMAKE_CROSSCOMPILING)
+    target_link_libraries(sqlrestore_lib PUBLIC bz2 harfbuzz freetype)
+  endif()
+  if(MSVC)
+    target_link_libraries(sqlrestore_lib PUBLIC legacy_stdio_definitions)
+  endif()
 endif()
 
-
 set(EXECUTABLE_OUTPUT_PATH ..)
 
 # Show the console window in debug mode on Windows
-if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
   set(SQLRESTORE-WIN32-FLAG WIN32)
-endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
+endif()
 
 # Resource file for windows
 if(WIN32)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../dist/windows/windres.rc.in ${CMAKE_CURRENT_BINARY_DIR}/windres.rc)
   set(SQLRESTORE-WIN32-RESOURCES windres.rc)
-endif(WIN32)
+endif()
 
 add_executable(sqlrestore ${SQLRESTORE-WIN32-FLAG} ${SQLRESTORE-WIN32-RESOURCES} main.cpp)
 target_link_libraries(sqlrestore PRIVATE sqlrestore_lib)