Update source code for RRA v1.4 release

Author: ahosier

CMakeLists.txt

@@ -1,15 +1,16 @@
 cmake_minimum_required(VERSION 3.11)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/source/renderer/cmake")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+include(dev_tools)
 
 ## Specify the top level name of the project - this will define the solution name for Visual Studio
 project(RRA)
 
 # Define version information
 set(RRA_MAJOR_VERSION 1)
-set(RRA_MINOR_VERSION 3)
+set(RRA_MINOR_VERSION 4)
 if (NOT RRA_BUGFIX_NUMBER)
-    set(RRA_BUGFIX_NUMBER 1)
+    set(RRA_BUGFIX_NUMBER 0)
 endif ()
 if (NOT RRA_BUILD_NUMBER)
     set(RRA_BUILD_NUMBER 0)
@@ -39,6 +40,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(ADT_PLATFORM_POSTFIX "-x64")
 ENDIF()
 
+# As default for RRA, include the debug status in filename - but not the platform bitness
 set (CMAKE_DEBUG_POSTFIX -d)
 set (CMAKE_RELEASE_POSTFIX)
 
@@ -53,29 +55,17 @@ ENDIF(WIN32)
 # Add for CentOS compiler warning
 add_definitions(-DJSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
 
-# Define C++ standard for RRA
-set(CMAKE_CXX_STANDARD 17)
-
 include_directories("${PROJECT_SOURCE_DIR}/external/")
 include_directories("${PROJECT_SOURCE_DIR}/external/qt_common/")
 include_directories("${PROJECT_SOURCE_DIR}/external/third_party/")
 include_directories("${PROJECT_SOURCE_DIR}/external/third_party/vulkan/include/")
 
 # Global compiler options
 IF(WIN32)
-    add_compile_options(/MP)
-    # disable warning C4201: nonstandard extension used: nameless struct/union
-    add_compile_options(/wd4201)
-    # this warning is caused by the QT header files - use pragma to disable at source
-    # disable warning C4127: conditional expression is constant
-    add_compile_options(/wd4127)
-    # this warning is caused by QT header files and has been introduced by VS2019 16.9.6
-    # disable warning C5240: 'nodiscard': attribute is ignored in this syntactic position
-    add_compile_options(/wd5240)
     # bump the stack size
     add_link_options(/STACK:16777216)
 ELSEIF(UNIX)
-    add_compile_options(-D_LINUX -mno-avx2)
+    add_compile_options(-mno-avx2)
     # Allow executable to be double clicked.
     add_link_options(-no-pie)
     # Use _DEBUG on Unix for Debug Builds (defined automatically on Windows)

build/pre_build.py

@@ -63,7 +63,6 @@
     parser.add_argument("--qt-root", default="~/Qt", help="specify the root directory for locating QT on this system (default: ~/Qt) ")
 else:
     parser.add_argument("--qt-root", default="~/Qt", help="specify the root directory for locating QT on this system (default: ~/Qt) ")
-    parser.add_argument("--disable-extra-qt-lib-deploy", action="store_true", help="prevent extra Qt library files (XCB and ICU libs) from being copied during post build step")
     parser.add_argument("--qt-system", action="store_true", help="use the system-installed version of QT")
 parser.add_argument("--qt", default="5.15.2", help="specify the version of QT to be used with the script (default: 5.15.2)" )
 parser.add_argument("--clean", action="store_true", help="delete any directories created by this script")
@@ -264,8 +263,6 @@ def generate_config(config):
 
 
     if sys.platform.startswith('linux'):
-        if args.disable_extra_qt_lib_deploy:
-            cmake_args.extend(["-DDISABLE_EXTRA_QT_LIB_DEPLOY:BOOL=TRUE"])
         if args.qt_system:
             cmake_args.extend(["-DQT_SYSTEM:BOOL=TRUE"])
 

source/renderer/cmake/FindXCB.cmake cmake/FindXCB.cmakesource/renderer/cmake/FindXCB.cmake renamed to cmake/FindXCB.cmake

@@ -30,11 +30,8 @@ function(devtools_target_options name)
                 -Wall
                 -Werror
                 -Wextra
-                -Wno-deprecated-declarations
-                -Wno-unused-variable
-                -Wno-missing-field-initializers
-                -Wno-unknown-pragmas
                 )
+
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         target_compile_options(${name}
                 PRIVATE
@@ -50,8 +47,12 @@ function(devtools_target_options name)
                 /wd4127
 
                 # Disable warnings about deprecated features
-                # This happens when using later versions of Qt than RDP defaults to.
+                # This happens when using later versions of Qt than RRA defaults to.
                 /wd4996
+
+                # this warning is caused by QT header files and has been introduced by VS2019 16.9.6
+                # disable warning C5240: 'nodiscard': attribute is ignored in this syntactic position
+                /wd5240
                 )
     else ()
 

cmake/dev_tools.cmake

@@ -87,6 +87,13 @@ if (Qt5_DIR OR Qt6_DIR)
                         ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${EXTERNAL_DIR}/libtraceevent/lib:${EXTERNAL_DIR}/libtracefs/lib:${_qt_bin_dir}/../lib
                         ${DEPLOYQT_EXECUTABLE} $<TARGET_FILE:${target}> -qmake=${QT_QMAKE_EXECUTABLE} -verbose=0 -unsupported-allow-new-glibc
                         WORKING_DIRECTORY ${output_directory})
+                # If Qt5, install X11Extras
+                if (Qt5_DIR)
+                    add_custom_command(
+                        TARGET ${target} POST_BUILD
+                        COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${PROJECT_NAME}>/lib
+                        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_qt_bin_dir}/../lib/libQt5X11Extras.so.5 $<TARGET_FILE_DIR:${PROJECT_NAME}>/lib)
+                endif()
             elseif (include_mac)
 
                 set(DEPLOYQT_POST_BUILD_COMMAND