Perform more cleanup of CMakeLists.txt files

This moves setting of compilation flags to common file to be used by all
subprojects and explicitly enables only C++ support, skipping whole C
support in CMake.

CMakeLists.txt

@@ -4,10 +4,9 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)
     message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
 endif()
 
-project(openrct2)
+project(openrct2 CXX)
 
 include(FindPkgConfig)
-include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(GNUInstallDirs)
 
@@ -22,9 +21,17 @@ option(WITH_TESTS "Build tests")
 option(PORTABLE "Create a portable build (-rpath=$ORIGIN)" OFF)
 option(DOWNLOAD_TITLE_SEQUENCES "Download title sequences during installation." ON)
 
+# Options
+option(STATIC "Create a static build.")
+option(USE_MMAP "Use mmap to try loading rct2's data segment into memory.")
+
+option(DISABLE_HTTP_TWITCH "Disable HTTP and Twitch support.")
+option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.")
+option(DISABLE_TTF "Disable support for TTF provided by freetype2.")
+option(ENABLE_LIGHTFX "Enable lighting effects." ON)
+
 if (FORCE32)
     set(TARGET_M "-m32")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_M}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_M}")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${TARGET_M}")
 endif ()
@@ -52,15 +59,6 @@ execute_process(
     ERROR_QUIET
 )
 
-function (ADD_CHECK_C_COMPILER_FLAG _CFLAGS _CACHE_VAR _FLAG)
-    CHECK_C_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
-    if (${_CACHE_VAR})
-        set(${_CFLAGS} "${${_CFLAGS}} ${_FLAG}" PARENT_SCOPE)
-    else ()
-        message(STATUS "Unsupported CFLAG: ${_FLAG}")
-    endif ()
-endfunction ()
-
 function (ADD_CHECK_CXX_COMPILER_FLAG _CXXFLAGS _CACHE_VAR _FLAG)
     CHECK_CXX_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
     if (${_CACHE_VAR})
@@ -85,18 +83,66 @@ if (MINGW)
 endif ()
 
 # Items below are not supported by ICC
-ADD_CHECK_C_COMPILER_FLAG(CMAKE_C_FLAGS C_WARN_REDUNDANT_DECLS -Wredundant-decls)
-ADD_CHECK_C_COMPILER_FLAG(CMAKE_C_FLAGS C_WARN_IGNORED_QUALIFIERS -Wignored-qualifiers)
 ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_REDUNDANT_DECLS -Wredundant-decls)
 ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_IGNORED_QUALIFIERS -Wignored-qualifiers)
 
 # -Wstrict-overflow is only active when -fstrict-overflow is enabled, but -fstrict-overflow
 # is enabled on -O2, -O3, -Os. This should help catch bugs locally before they reach Travis
 # As of 2a435bf -Wstrict-overflow=1 passes, but higher values do not.
-set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -fstrict-overflow")
-ADD_CHECK_C_COMPILER_FLAG(CMAKE_C_FLAGS C_WARN_STRICT_OVERFLOW -Wstrict-overflow=1)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-overflow")
 ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_STRICT_OVERFLOW -Wstrict-overflow=1)
 
+# Compiler flags
+set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 0–3.")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing -Werror -Wundef -Wmissing-declarations -Winit-self -Wall -Wno-unknown-pragmas -Wno-unused-function -Wno-missing-braces ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-comment -Wshadow -Wnonnull")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG=${DEBUG_LEVEL}")
+
+if(APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=objc-method-access")
+endif()
+
+# On mingw all code is already PIC, this will avoid compiler error on redefining this option
+if (NOT MINGW)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+endif ()
+
+if (APPLE AND NOT USE_MMAP)
+    set(PIE_FLAG "-fno-pie")
+else ()
+    set(PIE_FLAG "-fpie")
+endif ()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
+
+# Defines
+if (USE_MMAP)
+    add_definitions(-DUSE_MMAP)
+endif ()
+if (DISABLE_NETWORK)
+    add_definitions(-DDISABLE_NETWORK)
+endif ()
+if (DISABLE_HTTP_TWITCH)
+    add_definitions(-DDISABLE_HTTP)
+    add_definitions(-DDISABLE_TWITCH)
+endif ()
+if (DISABLE_TTF)
+    add_definitions(-DNO_TTF)
+endif ()
+if (ENABLE_LIGHTFX)
+    add_definitions(-D__ENABLE_LIGHTFX__)
+endif ()
+
+if (CXX_WARN_SUGGEST_FINAL_TYPES)
+    # Disable -Wsuggest-final-types via pragmas where due.
+   add_definitions(-D__WARN_SUGGEST_FINAL_TYPES__)
+endif ()
+
+if (CXX_WARN_SUGGEST_FINAL_METHODS)
+    # Disable -Wsuggest-final-methods via pragmas where due.
+   add_definitions(-D__WARN_SUGGEST_FINAL_METHODS__)
+endif ()
+
 if(EXISTS "${ROOT_DIR}/discord-rpc")
     add_subdirectory("${ROOT_DIR}/discord-rpc")
     add_definitions(-D__ENABLE_DISCORD__)

src/openrct2-cli/CMakeLists.txt

@@ -6,14 +6,13 @@ endif ()
 
 # Sources
 file(GLOB_RECURSE OPENRCT2_CLI_SOURCES
-    "${CMAKE_CURRENT_LIST_DIR}/*.c"
     "${CMAKE_CURRENT_LIST_DIR}/*.cpp"
     "${CMAKE_CURRENT_LIST_DIR}/*.h"
     "${CMAKE_CURRENT_LIST_DIR}/*.hpp")
 
 # Outputs
 set (PROJECT openrct2-cli)
-project(${PROJECT})
+project(${PROJECT} CXX)
 add_executable(${PROJECT} ${OPENRCT2_CLI_SOURCES})
 
 target_link_libraries(${PROJECT} "libopenrct2")
@@ -24,7 +23,3 @@ endif ()
 
 # Includes
 target_include_directories(${PROJECT} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/..")
-
-# Compiler flags
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")

src/openrct2-ui/CMakeLists.txt

@@ -32,7 +32,7 @@ endif ()
 
 # Outputs
 set (PROJECT openrct2)
-project(${PROJECT})
+project(${PROJECT} CXX)
 add_executable(${PROJECT} ${OPENRCT2_UI_SOURCES} ${OPENRCT2_UI_MM_SOURCES})
 
 target_link_libraries(${PROJECT} "libopenrct2"
@@ -65,9 +65,6 @@ if (WIN32)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__USE_MINGW_ANSI_STDIO=1")
 endif ()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
-
 # Defines
 if (DISABLE_OPENGL)
     add_definitions(-DDISABLE_OPENGL)

src/openrct2/CMakeLists.txt

@@ -4,15 +4,6 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)
     message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
 endif ()
 
-# Options
-option(STATIC "Create a static build.")
-option(USE_MMAP "Use mmap to try loading rct2's data segment into memory.")
-
-option(DISABLE_HTTP_TWITCH "Disable HTTP and Twitch support.")
-option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.")
-option(DISABLE_TTF "Disable support for TTF provided by freetype2.")
-option(ENABLE_LIGHTFX "Enable lighting effects." ON)
-
 # Needed for linking with non-broken OpenSSL on Apple platforms
 if (APPLE)
     set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/openssl/lib/pkgconfig")
@@ -60,10 +51,9 @@ endif ()
 
 # Outputs
 set(PROJECT libopenrct2)
-project(${PROJECT})
+project(${PROJECT} CXX)
 add_library(${PROJECT} ${OPENRCT2_CORE_SOURCES} ${OPENRCT2_CORE_MM_SOURCES} ${RCT2_SECTIONS})
 set_target_properties(${PROJECT} PROPERTIES PREFIX "")
-set_target_properties(${PROJECT} PROPERTIES COMPILE_FLAGS "-Wundef")
 
 # Libraries
 if (STATIC)
@@ -150,58 +140,6 @@ if (NOT DISABLE_TTF)
     endif ()
 endif ()
 
-if(APPLE)
-    set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -Wno-error=objc-method-access")
-endif()
-
-# Compiler flags
-set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 0–3.")
-set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -fstrict-aliasing -Werror -Wundef -Wmissing-declarations -Winit-self -Wall -Wno-unknown-pragmas -Wno-unused-function -Wno-missing-braces ")
-set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -Wno-comment -Wshadow  -Wmissing-declarations -Wnonnull")
-set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -DDEBUG=${DEBUG_LEVEL}")
-
-# On mingw all code is already PIC, this will avoid compiler error on redefining this option
-if (NOT MINGW)
-    set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -fPIC")
-endif ()
-
-if (APPLE AND NOT USE_MMAP)
-    set(PIE_FLAG "-fno-pie")
-else ()
-    set(PIE_FLAG "-fpie")
-endif ()
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11 ${COMMON_COMPILE_OPTIONS} -Wimplicit")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 ${COMMON_COMPILE_OPTIONS}")
-
-# Defines
-if (USE_MMAP)
-    add_definitions(-DUSE_MMAP)
-endif ()
-if (DISABLE_NETWORK)
-    add_definitions(-DDISABLE_NETWORK)
-endif ()
-if (DISABLE_HTTP_TWITCH)
-    add_definitions(-DDISABLE_HTTP)
-    add_definitions(-DDISABLE_TWITCH)
-endif ()
-if (DISABLE_TTF)
-    add_definitions(-DNO_TTF)
-endif ()
-if (ENABLE_LIGHTFX)
-    add_definitions(-D__ENABLE_LIGHTFX__)
-endif ()
-
-if (CXX_WARN_SUGGEST_FINAL_TYPES)
-    # Disable -Wsuggest-final-types via pragmas where due.
-   add_definitions(-D__WARN_SUGGEST_FINAL_TYPES__)
-endif ()
-
-if (CXX_WARN_SUGGEST_FINAL_METHODS)
-    # Disable -Wsuggest-final-methods via pragmas where due.
-   add_definitions(-D__WARN_SUGGEST_FINAL_METHODS__)
-endif ()
-
 # To avoid unnecessary rebuilds set the current branch and
 # short sha1 only for the two files that use these
 # definitions: Version.cpp and Crash/Platform.cpp