diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/compiler/clang/settings.cmake | 4 | ||||
| -rw-r--r-- | cmake/compiler/gcc/settings.cmake | 6 | ||||
| -rw-r--r-- | cmake/compiler/icc/settings.cmake | 4 | ||||
| -rw-r--r-- | cmake/compiler/mingw/settings.cmake | 4 | ||||
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/AutoCollect.cmake | 4 | ||||
| -rw-r--r-- | cmake/macros/CheckBuildDir.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/ConfigureScripts.cmake | 8 | ||||
| -rw-r--r-- | cmake/macros/EnsureVersion.cmake | 58 | ||||
| -rw-r--r-- | cmake/macros/FindGit.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 70 | ||||
| -rw-r--r-- | cmake/macros/FindOpenSSL.cmake | 34 | ||||
| -rw-r--r-- | cmake/macros/FindPCHSupport.cmake | 12 | ||||
| -rw-r--r-- | cmake/macros/GroupSources.cmake | 10 | ||||
| -rw-r--r-- | cmake/options.cmake | 10 | ||||
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/platform/win/settings.cmake | 6 | ||||
| -rw-r--r-- | cmake/showoptions.cmake | 38 |
18 files changed, 138 insertions, 138 deletions
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index 222271c8990..8e04f66abb2 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -13,7 +13,7 @@ if(WITH_WARNINGS) -Wfatal-errors -Wno-mismatched-tags -Woverloaded-virtual) - + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10) target_compile_options(trinity-warning-interface INTERFACE @@ -57,7 +57,7 @@ target_compile_options(trinity-compile-option-interface -Wno-narrowing -Wno-deprecated-register) -if (BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS) # -fPIC is needed to allow static linking in shared libs. # -fvisibility=hidden sets the default visibility to hidden to prevent exporting of all symbols. target_compile_options(trinity-compile-option-interface diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index a0dce55019c..cbb74526795 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -24,7 +24,7 @@ if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") message(STATUS "GCC: SFMT enabled, SSE2 flags forced") endif() -if( WITH_WARNINGS ) +if(WITH_WARNINGS) target_compile_options(trinity-warning-interface INTERFACE -W @@ -42,7 +42,7 @@ if( WITH_WARNINGS ) message(STATUS "GCC: All warnings enabled") endif() -if( WITH_COREDEBUG ) +if(WITH_COREDEBUG) target_compile_options(trinity-compile-option-interface INTERFACE -g3) @@ -68,7 +68,7 @@ if(ASAN) message(STATUS "GCC: Enabled Address Sanitizer") endif() -if (BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS) target_compile_options(trinity-compile-option-interface INTERFACE -fPIC diff --git a/cmake/compiler/icc/settings.cmake b/cmake/compiler/icc/settings.cmake index fd591440355..87187cc3a5c 100644 --- a/cmake/compiler/icc/settings.cmake +++ b/cmake/compiler/icc/settings.cmake @@ -12,7 +12,7 @@ else() -xSSE2) endif() -if( WITH_WARNINGS ) +if(WITH_WARNINGS) target_compile_options(trinity-warning-interface INTERFACE -w1) @@ -20,7 +20,7 @@ if( WITH_WARNINGS ) message(STATUS "ICC: All warnings enabled") endif() -if( WITH_COREDEBUG ) +if(WITH_COREDEBUG) target_compile_options(trinity-compile-option-interface INTERFACE -g) diff --git a/cmake/compiler/mingw/settings.cmake b/cmake/compiler/mingw/settings.cmake index 0268de93ff5..94cb2f9d522 100644 --- a/cmake/compiler/mingw/settings.cmake +++ b/cmake/compiler/mingw/settings.cmake @@ -19,7 +19,7 @@ target_compile_definitions(trinity-compile-option-interface -D__SSE2__) message(STATUS "GCC: SFMT enabled, SSE2 flags forced") -if( WITH_WARNINGS ) +if(WITH_WARNINGS) target_compile_options(trinity-warning-interface INTERFACE -W @@ -33,7 +33,7 @@ if( WITH_WARNINGS ) message(STATUS "GCC: All warnings enabled") endif() -if( WITH_COREDEBUG ) +if(WITH_COREDEBUG) target_compile_options(trinity-compile-option-interface INTERFACE -g3) diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index fea0eaf8a79..1d58f1b2cd3 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -128,7 +128,7 @@ if(NOT WITH_WARNINGS) message(STATUS "MSVC: Disabled generic compiletime warnings") endif() -if (BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS) # C4251: needs to have dll-interface to be used by clients of class '...' # C4275: non dll-interface class ...' used as base for dll-interface class '...' target_compile_options(trinity-compile-option-interface diff --git a/cmake/macros/AutoCollect.cmake b/cmake/macros/AutoCollect.cmake index 73c019f7031..6b91517bc0d 100644 --- a/cmake/macros/AutoCollect.cmake +++ b/cmake/macros/AutoCollect.cmake @@ -36,7 +36,7 @@ function(CollectSourceFiles current_dir variable) file(GLOB SUB_DIRECTORIES ${current_dir}/*) foreach(SUB_DIRECTORY ${SUB_DIRECTORIES}) - if (IS_DIRECTORY ${SUB_DIRECTORY}) + if(IS_DIRECTORY ${SUB_DIRECTORY}) CollectSourceFiles("${SUB_DIRECTORY}" "${variable}" "${ARGN}") endif() endforeach() @@ -62,7 +62,7 @@ function(CollectIncludeDirectories current_dir variable) list(APPEND ${variable} ${current_dir}) file(GLOB SUB_DIRECTORIES ${current_dir}/*) foreach(SUB_DIRECTORY ${SUB_DIRECTORIES}) - if (IS_DIRECTORY ${SUB_DIRECTORY}) + if(IS_DIRECTORY ${SUB_DIRECTORY}) CollectIncludeDirectories("${SUB_DIRECTORY}" "${variable}" "${ARGN}") endif() endforeach() diff --git a/cmake/macros/CheckBuildDir.cmake b/cmake/macros/CheckBuildDir.cmake index d45dc9b4c8e..a62259f8ca1 100644 --- a/cmake/macros/CheckBuildDir.cmake +++ b/cmake/macros/CheckBuildDir.cmake @@ -14,7 +14,7 @@ string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" BUILDING_IN_SOURCE) -if( BUILDING_IN_SOURCE ) +if(BUILDING_IN_SOURCE) message(FATAL_ERROR " This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, create a separate build directory diff --git a/cmake/macros/ConfigureScripts.cmake b/cmake/macros/ConfigureScripts.cmake index 77da0cf6a54..7ad99f95ba7 100644 --- a/cmake/macros/ConfigureScripts.cmake +++ b/cmake/macros/ConfigureScripts.cmake @@ -11,10 +11,10 @@ # Returns the base path to the script directory in the source directory function(WarnAboutSpacesInBuildPath) # Only check win32 since unix doesn't allow spaces in paths - if (WIN32) + if(WIN32) string(FIND "${CMAKE_BINARY_DIR}" " " SPACE_INDEX_POS) - if (SPACE_INDEX_POS GREATER -1) + if(SPACE_INDEX_POS GREATER -1) message("") message(WARNING " *** WARNING!\n" " *** Your selected build directory contains spaces!\n" @@ -51,7 +51,7 @@ function(GetScriptModuleList variable) set(${variable}) foreach(SCRIPT_MODULE ${LOCALE_SCRIPT_MODULE_LIST}) GetPathToScriptModule(${SCRIPT_MODULE} SCRIPT_MODULE_PATH) - if (IS_DIRECTORY ${SCRIPT_MODULE_PATH}) + if(IS_DIRECTORY ${SCRIPT_MODULE_PATH}) list(APPEND ${variable} ${SCRIPT_MODULE}) endif() endforeach() @@ -76,7 +76,7 @@ function(IsDynamicLinkingRequired variable) set(IS_REQUIRED OFF) foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) ScriptModuleNameToVariable(${SCRIPT_MODULE} SCRIPT_MODULE_VARIABLE) - if ((${SCRIPT_MODULE_VARIABLE} STREQUAL "dynamic") OR + if((${SCRIPT_MODULE_VARIABLE} STREQUAL "dynamic") OR (${SCRIPT_MODULE_VARIABLE} STREQUAL "default" AND IS_DEFAULT_VALUE_DYNAMIC)) set(IS_REQUIRED ON) break() diff --git a/cmake/macros/EnsureVersion.cmake b/cmake/macros/EnsureVersion.cmake index a85e12abb7f..5d9af294765 100644 --- a/cmake/macros/EnsureVersion.cmake +++ b/cmake/macros/EnsureVersion.cmake @@ -11,10 +11,10 @@ # ENSURE_VERSION # This macro compares version numbers of the form "x.y.z" or "x.y" -# ENSURE_VERSION( FOO_MIN_VERSION FOO_VERSION_FOUND FOO_VERSION_OK) +# ENSURE_VERSION(FOO_MIN_VERSION FOO_VERSION_FOUND FOO_VERSION_OK) # will set FOO_VERSION_OK to true if FOO_VERSION_FOUND >= FOO_MIN_VERSION # Leading and trailing text is ok, e.g. -# ENSURE_VERSION( "2.5.31" "flex 2.5.4a" VERSION_OK) +# ENSURE_VERSION("2.5.31" "flex 2.5.4a" VERSION_OK) # which means 2.5.31 is required and "flex 2.5.4a" is what was found on the system # Copyright (c) 2006, David Faure, <faure@kde.org> @@ -29,7 +29,7 @@ # min_version <= found_version < max_version. # If this expression holds, FOO_VERSION_OK will be set TRUE # -# Example: ENSURE_VERSION_RANGE3( "0.1.0" ${FOOCODE_VERSION} "0.7.0" FOO_VERSION_OK ) +# Example: ENSURE_VERSION_RANGE3("0.1.0" ${FOOCODE_VERSION} "0.7.0" FOO_VERSION_OK) # # This macro will break silently if any of x,y,z are greater than 100. # @@ -61,55 +61,55 @@ MACRO(NORMALIZE_VERSION _requested_version _normalized_version) STRING(REGEX MATCH "[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" _threePartMatch "${_requested_version}") - if (_threePartMatch) + if(_threePartMatch) # parse the parts of the version string STRING(REGEX REPLACE "[^0-9]*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" _major_vers "${_requested_version}") STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" _minor_vers "${_requested_version}") STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" _patch_vers "${_requested_version}") - else (_threePartMatch) + else(_threePartMatch) STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" _major_vers "${_requested_version}") STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" _minor_vers "${_requested_version}") set(_patch_vers "0") - endif (_threePartMatch) + endif(_threePartMatch) # compute an overall version number which can be compared at once MATH(EXPR ${_normalized_version} "${_major_vers}*10000 + ${_minor_vers}*100 + ${_patch_vers}") ENDMACRO(NORMALIZE_VERSION) MACRO(CHECK_RANGE_INCLUSIVE_LOWER _lower_limit _value _upper_limit _ok) - if (${_value} LESS ${_lower_limit}) - set( ${_ok} FALSE ) - elseif (${_value} EQUAL ${_lower_limit}) - set( ${_ok} TRUE ) - elseif (${_value} EQUAL ${_upper_limit}) - set( ${_ok} FALSE ) - elseif (${_value} GREATER ${_upper_limit}) - set( ${_ok} FALSE ) - else (${_value} LESS ${_lower_limit}) - set( ${_ok} TRUE ) - endif (${_value} LESS ${_lower_limit}) + if(${_value} LESS ${_lower_limit}) + set(${_ok} FALSE) + elseif(${_value} EQUAL ${_lower_limit}) + set(${_ok} TRUE) + elseif(${_value} EQUAL ${_upper_limit}) + set(${_ok} FALSE) + elseif(${_value} GREATER ${_upper_limit}) + set(${_ok} FALSE) + else(${_value} LESS ${_lower_limit}) + set(${_ok} TRUE) + endif(${_value} LESS ${_lower_limit}) ENDMACRO(CHECK_RANGE_INCLUSIVE_LOWER) MACRO(ENSURE_VERSION requested_version found_version var_too_old) - NORMALIZE_VERSION( ${requested_version} req_vers_num ) - NORMALIZE_VERSION( ${found_version} found_vers_num ) + NORMALIZE_VERSION(${requested_version} req_vers_num) + NORMALIZE_VERSION(${found_version} found_vers_num) - if (found_vers_num LESS req_vers_num) - set( ${var_too_old} FALSE ) - else (found_vers_num LESS req_vers_num) - set( ${var_too_old} TRUE ) - endif (found_vers_num LESS req_vers_num) + if(found_vers_num LESS req_vers_num) + set(${var_too_old} FALSE) + else(found_vers_num LESS req_vers_num) + set(${var_too_old} TRUE) + endif(found_vers_num LESS req_vers_num) ENDMACRO(ENSURE_VERSION) MACRO(ENSURE_VERSION2 requested_version2 found_version2 var_too_old2) - ENSURE_VERSION( ${requested_version2} ${found_version2} ${var_too_old2}) + ENSURE_VERSION(${requested_version2} ${found_version2} ${var_too_old2}) ENDMACRO(ENSURE_VERSION2) MACRO(ENSURE_VERSION_RANGE min_version found_version max_version var_ok) - NORMALIZE_VERSION( ${min_version} req_vers_num ) - NORMALIZE_VERSION( ${found_version} found_vers_num ) - NORMALIZE_VERSION( ${max_version} max_vers_num ) + NORMALIZE_VERSION(${min_version} req_vers_num) + NORMALIZE_VERSION(${found_version} found_vers_num) + NORMALIZE_VERSION(${max_version} max_vers_num) - CHECK_RANGE_INCLUSIVE_LOWER( ${req_vers_num} ${found_vers_num} ${max_vers_num} ${var_ok}) + CHECK_RANGE_INCLUSIVE_LOWER(${req_vers_num} ${found_vers_num} ${max_vers_num} ${var_ok}) ENDMACRO(ENSURE_VERSION_RANGE) diff --git a/cmake/macros/FindGit.cmake b/cmake/macros/FindGit.cmake index 31a4be760f2..84a03430a1e 100644 --- a/cmake/macros/FindGit.cmake +++ b/cmake/macros/FindGit.cmake @@ -34,7 +34,7 @@ else() ) # make sure we're using minimum the required version of git, so the "dirty-testing" will work properly - ensure_version( "${_REQUIRED_GIT_VERSION}" "${_GIT_VERSION}" _GIT_VERSION_OK) + ensure_version("${_REQUIRED_GIT_VERSION}" "${_GIT_VERSION}" _GIT_VERSION_OK) # throw an error if we don't have a recent enough version of git... if(NOT _GIT_VERSION_OK) diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 24022a5372a..608644d2c6c 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -11,9 +11,9 @@ # also defined, but not for general use are # MYSQL_LIBRARY, where to find the MySQL library. -set( MYSQL_FOUND 0 ) +set(MYSQL_FOUND 0) -if( UNIX ) +if(UNIX) set(MYSQL_CONFIG_PREFER_PATH "$ENV{MYSQL_HOME}/bin" CACHE FILEPATH "preferred path to MySQL (mysql_config)" ) @@ -25,7 +25,7 @@ if( UNIX ) /usr/bin/ ) - if( MYSQL_CONFIG ) + if(MYSQL_CONFIG) message(STATUS "Using mysql-config: ${MYSQL_CONFIG}") # set INCLUDE_DIR exec_program(${MYSQL_CONFIG} @@ -57,24 +57,24 @@ if( UNIX ) #message("[DEBUG] MYSQL ADD_LIBRARIES_PATH : ${MYSQL_ADD_LIBRARIES_PATH}") endforeach(LIB ${MYSQL_LIBS}) - else( MYSQL_CONFIG ) + else(MYSQL_CONFIG) set(MYSQL_ADD_LIBRARIES "") list(APPEND MYSQL_ADD_LIBRARIES "mysqlclient_r") - endif( MYSQL_CONFIG ) -endif( UNIX ) + endif(MYSQL_CONFIG) +endif(UNIX) -if( WIN32 ) +if(WIN32) # read environment variables and change \ to / SET(PROGRAM_FILES_32 $ENV{ProgramFiles}) - if (${PROGRAM_FILES_32}) + if(${PROGRAM_FILES_32}) STRING(REPLACE "\\\\" "/" PROGRAM_FILES_32 ${PROGRAM_FILES_32}) endif(${PROGRAM_FILES_32}) SET(PROGRAM_FILES_64 $ENV{ProgramW6432}) - if (${PROGRAM_FILES_64}) + if(${PROGRAM_FILES_64}) STRING(REPLACE "\\\\" "/" PROGRAM_FILES_64 ${PROGRAM_FILES_64}) endif(${PROGRAM_FILES_64}) -endif ( WIN32 ) +endif(WIN32) find_path(MYSQL_INCLUDE_DIR NAMES @@ -109,9 +109,9 @@ find_path(MYSQL_INCLUDE_DIR "Specify the directory containing mysql.h." ) -if( UNIX ) +if(UNIX) foreach(LIB ${MYSQL_ADD_LIBRARIES}) - find_library( MYSQL_LIBRARY + find_library(MYSQL_LIBRARY NAMES mysql libmysql ${LIB} PATHS @@ -124,10 +124,10 @@ if( UNIX ) DOC "Specify the location of the mysql library here." ) endforeach(LIB ${MYSQL_ADD_LIBRARY}) -endif( UNIX ) +endif(UNIX) -if( WIN32 ) - find_library( MYSQL_LIBRARY +if(WIN32) + find_library(MYSQL_LIBRARY NAMES libmysql libmariadb PATHS @@ -161,13 +161,13 @@ if( WIN32 ) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]/lib" DOC "Specify the location of the mysql library here." ) -endif( WIN32 ) +endif(WIN32) # On Windows you typically don't need to include any extra libraries # to build MYSQL stuff. -if( NOT WIN32 ) - find_library( MYSQL_EXTRA_LIBRARIES +if(NOT WIN32) + find_library(MYSQL_EXTRA_LIBRARIES NAMES z zlib PATHS @@ -176,11 +176,11 @@ if( NOT WIN32 ) DOC "if more libraries are necessary to link in a MySQL client (typically zlib), specify them here." ) -else( NOT WIN32 ) - set( MYSQL_EXTRA_LIBRARIES "" ) -endif( NOT WIN32 ) +else(NOT WIN32) + set(MYSQL_EXTRA_LIBRARIES "") +endif(NOT WIN32) -if( UNIX ) +if(UNIX) find_program(MYSQL_EXECUTABLE mysql PATHS ${MYSQL_CONFIG_PREFER_PATH} @@ -190,9 +190,9 @@ if( UNIX ) DOC "path to your mysql binary." ) -endif( UNIX ) +endif(UNIX) -if( WIN32 ) +if(WIN32) find_program(MYSQL_EXECUTABLE mysql PATHS "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0/bin" @@ -225,20 +225,20 @@ if( WIN32 ) DOC "path to your mysql binary." ) -endif( WIN32 ) +endif(WIN32) -if( MYSQL_LIBRARY ) - if( MYSQL_INCLUDE_DIR ) - set( MYSQL_FOUND 1 ) +if(MYSQL_LIBRARY) + if(MYSQL_INCLUDE_DIR) + set(MYSQL_FOUND 1) message(STATUS "Found MySQL library: ${MYSQL_LIBRARY}") message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIR}") - else( MYSQL_INCLUDE_DIR ) + else(MYSQL_INCLUDE_DIR) message(FATAL_ERROR "Could not find MySQL headers! Please install the development libraries and headers") - endif( MYSQL_INCLUDE_DIR ) - if( MYSQL_EXECUTABLE ) + endif(MYSQL_INCLUDE_DIR) + if(MYSQL_EXECUTABLE) message(STATUS "Found MySQL executable: ${MYSQL_EXECUTABLE}") - endif( MYSQL_EXECUTABLE ) - mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR MYSQL_EXECUTABLE) -else( MYSQL_LIBRARY ) + endif(MYSQL_EXECUTABLE) + mark_as_advanced(MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR MYSQL_EXECUTABLE) +else(MYSQL_LIBRARY) message(FATAL_ERROR "Could not find the MySQL libraries! Please install the development libraries and headers") -endif( MYSQL_LIBRARY ) +endif(MYSQL_LIBRARY) diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake index b403092f9d7..fef3779b129 100644 --- a/cmake/macros/FindOpenSSL.cmake +++ b/cmake/macros/FindOpenSSL.cmake @@ -81,7 +81,7 @@ IF(WIN32 AND NOT CYGWIN) # ssleay32MD.lib is identical to ../ssleay32.lib # Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib - if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" ) + if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") set(_OPENSSL_MSVC_ARCH_SUFFIX "64") else() set(_OPENSSL_MSVC_ARCH_SUFFIX "32") @@ -115,13 +115,13 @@ IF(WIN32 AND NOT CYGWIN) ${OPENSSL_ROOT_DIR}/lib/VC ) - if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE ) - set( OPENSSL_LIBRARIES + if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) + set(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} debug ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG} ) else() - set( OPENSSL_LIBRARIES + set(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ) @@ -147,7 +147,7 @@ IF(WIN32 AND NOT CYGWIN) MARK_AS_ADVANCED(SSL_EAY LIB_EAY) - set( OPENSSL_LIBRARIES + set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) @@ -170,7 +170,7 @@ IF(WIN32 AND NOT CYGWIN) ) MARK_AS_ADVANCED(SSL_EAY LIB_EAY) - SET( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) + SET(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY}) ENDIF(MSVC) ELSE(WIN32 AND NOT CYGWIN) FIND_LIBRARY(OPENSSL_SSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD) @@ -181,7 +181,7 @@ ELSE(WIN32 AND NOT CYGWIN) ENDIF(WIN32 AND NOT CYGWIN) -if (NOT OPENSSL_INCLUDE_DIR) +if(NOT OPENSSL_INCLUDE_DIR) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenSSL DEFAULT_MSG OPENSSL_LIBRARIES @@ -189,12 +189,12 @@ if (NOT OPENSSL_INCLUDE_DIR) ) endif() -if (OPENSSL_INCLUDE_DIR) - message( STATUS "Found OpenSSL library: ${OPENSSL_LIBRARIES}") - message( STATUS "Found OpenSSL headers: ${OPENSSL_INCLUDE_DIR}") - if (_OPENSSL_VERSION) +if(OPENSSL_INCLUDE_DIR) + message(STATUS "Found OpenSSL library: ${OPENSSL_LIBRARIES}") + message(STATUS "Found OpenSSL headers: ${OPENSSL_INCLUDE_DIR}") + if(_OPENSSL_VERSION) set(OPENSSL_VERSION "${_OPENSSL_VERSION}") - else (_OPENSSL_VERSION) + else(_OPENSSL_VERSION) file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9][0-9][0-9][0-9].*") @@ -215,23 +215,23 @@ if (OPENSSL_INCLUDE_DIR) string(REGEX REPLACE "^0(.)" "\\1" OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_MINOR}") string(REGEX REPLACE "^0(.)" "\\1" OPENSSL_VERSION_FIX "${OPENSSL_VERSION_FIX}") - if (NOT OPENSSL_VERSION_PATCH STREQUAL "00") + if(NOT OPENSSL_VERSION_PATCH STREQUAL "00") # 96 is the ASCII code of 'a' minus 1 math(EXPR OPENSSL_VERSION_PATCH_ASCII "${OPENSSL_VERSION_PATCH} + 96") # Once anyone knows how OpenSSL would call the patch versions beyond 'z' # this should be updated to handle that, too. This has not happened yet # so it is simply ignored here for now. string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING) - endif (NOT OPENSSL_VERSION_PATCH STREQUAL "00") + endif(NOT OPENSSL_VERSION_PATCH STREQUAL "00") set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}") - endif (_OPENSSL_VERSION) + endif(_OPENSSL_VERSION) include(EnsureVersion) ENSURE_VERSION_RANGE("${OPENSSL_EXPECTED_VERSION}" "${OPENSSL_VERSION}" "${OPENSSL_MAX_VERSION}" OPENSSL_VERSION_OK) - if (NOT OPENSSL_VERSION_OK) + if(NOT OPENSSL_VERSION_OK) message(FATAL_ERROR "TrinityCore needs OpenSSL version ${OPENSSL_EXPECTED_VERSION} but found too new version ${OPENSSL_VERSION}. TrinityCore needs OpenSSL 1.0.x or 1.1.x to work properly. If you still have problems please install OpenSSL 1.0.x if you still have problems search on forum for TCE00022") endif() -endif (OPENSSL_INCLUDE_DIR) +endif(OPENSSL_INCLUDE_DIR) MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES) diff --git a/cmake/macros/FindPCHSupport.cmake b/cmake/macros/FindPCHSupport.cmake index 11388d6fed9..0179a62240c 100644 --- a/cmake/macros/FindPCHSupport.cmake +++ b/cmake/macros/FindPCHSupport.cmake @@ -1,5 +1,5 @@ -if (CMAKE_VERSION VERSION_LESS "3.16.0") - if (MSVC) +if(CMAKE_VERSION VERSION_LESS "3.16.0") + if(MSVC) # Specify the maximum PreCompiled Header memory allocation limit # Fixes a compiler-problem when using PCH - the /Ym flag is adjusted by the compiler in MSVC2012, # hence we need to set an upper limit with /Zm to avoid discrepancies) @@ -7,13 +7,13 @@ if (CMAKE_VERSION VERSION_LESS "3.16.0") # # Note: This workaround was verified to be required on MSVC 2017 as well set(COTIRE_PCH_MEMORY_SCALING_FACTOR 500) - endif () + endif() include(cotire) function(ADD_CXX_PCH TARGET_NAME_LIST PCH_HEADER) # Use the header for every target - foreach (TARGET_NAME ${TARGET_NAME_LIST}) + foreach(TARGET_NAME ${TARGET_NAME_LIST}) # Disable unity builds set_target_properties(${TARGET_NAME} PROPERTIES COTIRE_ADD_UNITY_BUILD OFF) @@ -22,7 +22,7 @@ if (CMAKE_VERSION VERSION_LESS "3.16.0") # Workaround for cotire bug: https://github.com/sakra/cotire/issues/138 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 17) - endforeach () + endforeach() cotire(${TARGET_NAME_LIST}) endfunction(ADD_CXX_PCH) @@ -32,4 +32,4 @@ else() target_precompile_headers(${TARGET_NAME} PRIVATE ${PCH_HEADER}) endforeach() endfunction(ADD_CXX_PCH) -endif()
\ No newline at end of file +endif() diff --git a/cmake/macros/GroupSources.cmake b/cmake/macros/GroupSources.cmake index 4a74a2d59f1..a9c58bc82c1 100644 --- a/cmake/macros/GroupSources.cmake +++ b/cmake/macros/GroupSources.cmake @@ -10,7 +10,7 @@ macro(GroupSources dir) # Skip this if WITH_SOURCE_TREE is not set (empty string). - if (NOT ${WITH_SOURCE_TREE} STREQUAL "") + if(NOT ${WITH_SOURCE_TREE} STREQUAL "") # Include all header and c files file(GLOB_RECURSE elements RELATIVE ${dir} *.h *.hpp *.c *.cpp *.cc) @@ -19,12 +19,12 @@ macro(GroupSources dir) get_filename_component(element_name ${element} NAME) get_filename_component(element_dir ${element} DIRECTORY) - if (NOT ${element_dir} STREQUAL "") + if(NOT ${element_dir} STREQUAL "") # If the file is in a subdirectory use it as source group. - if (${WITH_SOURCE_TREE} STREQUAL "flat") + if(${WITH_SOURCE_TREE} STREQUAL "flat") # Build flat structure by using only the first subdirectory. string(FIND ${element_dir} "/" delemiter_pos) - if (NOT ${delemiter_pos} EQUAL -1) + if(NOT ${delemiter_pos} EQUAL -1) string(SUBSTRING ${element_dir} 0 ${delemiter_pos} group_name) source_group("${group_name}" FILES ${dir}/${element}) else() @@ -45,7 +45,7 @@ macro(GroupSources dir) endif() endmacro() -if (WITH_SOURCE_TREE STREQUAL "hierarchical-folders") +if(WITH_SOURCE_TREE STREQUAL "hierarchical-folders") # Use folders set_property(GLOBAL PROPERTY USE_FOLDERS ON) endif() diff --git a/cmake/options.cmake b/cmake/options.cmake index af4be4b3332..52b39e4532c 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -13,9 +13,9 @@ option(SERVERS "Build worldserver and authserver" set(SCRIPTS_AVAILABLE_OPTIONS none static dynamic minimal-static minimal-dynamic) # Log a fatal error when the value of the SCRIPTS variable isn't a valid option. -if (SCRIPTS) - list (FIND SCRIPTS_AVAILABLE_OPTIONS "${SCRIPTS}" SCRIPTS_INDEX) - if (${SCRIPTS_INDEX} EQUAL -1) +if(SCRIPTS) + list(FIND SCRIPTS_AVAILABLE_OPTIONS "${SCRIPTS}" SCRIPTS_INDEX) + if(${SCRIPTS_INDEX} EQUAL -1) message(FATAL_ERROR "The value (${SCRIPTS}) of your SCRIPTS variable is invalid! " "Allowed values are: ${SCRIPTS_AVAILABLE_OPTIONS} if you still " "have problems search on forum for TCE00019.") @@ -38,10 +38,10 @@ option(USE_SCRIPTPCH "Use precompiled headers when compiling scripts" option(USE_COREPCH "Use precompiled headers when compiling servers" 1) option(WITH_DYNAMIC_LINKING "Enable dynamic library linking." 0) IsDynamicLinkingRequired(WITH_DYNAMIC_LINKING_FORCED) -if (WITH_DYNAMIC_LINKING AND WITH_DYNAMIC_LINKING_FORCED) +if(WITH_DYNAMIC_LINKING AND WITH_DYNAMIC_LINKING_FORCED) set(WITH_DYNAMIC_LINKING_FORCED OFF) endif() -if (WITH_DYNAMIC_LINKING OR WITH_DYNAMIC_LINKING_FORCED) +if(WITH_DYNAMIC_LINKING OR WITH_DYNAMIC_LINKING_FORCED) set(BUILD_SHARED_LIBS ON) else() set(BUILD_SHARED_LIBS OFF) diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 47e10d3cda1..51e0955977f 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -1,5 +1,5 @@ # set default configuration directory -if( NOT CONF_DIR ) +if(NOT CONF_DIR) set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc) message(STATUS "UNIX: Using default configuration directory") endif() diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake index eb9b12990dd..60614b1ec6e 100644 --- a/cmake/platform/win/settings.cmake +++ b/cmake/platform/win/settings.cmake @@ -2,10 +2,10 @@ add_definitions(-D_WIN32_WINNT=0x0601) add_definitions(-DWIN32_LEAN_AND_MEAN) add_definitions(-DNOMINMAX) -if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake) -elseif (CMAKE_CXX_PLATFORM_ID MATCHES "MinGW") +elseif(CMAKE_CXX_PLATFORM_ID MATCHES "MinGW") include(${CMAKE_SOURCE_DIR}/cmake/compiler/mingw/settings.cmake) -elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) endif() diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index dcbeda554ac..da14ac383f3 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -1,7 +1,7 @@ # output generic information about the core and buildtype chosen message("") message("* TrinityCore revision : ${rev_hash} ${rev_date} (${rev_branch} branch)") -if( UNIX ) +if(UNIX) message("* TrinityCore buildtype : ${CMAKE_BUILD_TYPE}") endif() message("") @@ -9,12 +9,12 @@ message("") # output information about installation-directories and locations message("* Install core to : ${CMAKE_INSTALL_PREFIX}") -if( UNIX ) +if(UNIX) message("* Install configs to : ${CONF_DIR}") endif() -if( COPY_CONF ) - if( UNIX ) +if(COPY_CONF) + if(UNIX) message("* Install configs to : ${CONF_DIR}") else() message("* Install configs to : ${CMAKE_INSTALL_PREFIX}") @@ -25,7 +25,7 @@ message("") # Show infomation about the options selected during configuration -if( SERVERS ) +if(SERVERS) message("* Build world/auth : Yes (default)") else() message("* Build world/authserver : No") @@ -37,32 +37,32 @@ else() message("* Build with scripts : No") endif() -if( TOOLS ) +if(TOOLS) message("* Build map/vmap tools : Yes (default)") add_definitions(-DNO_CORE_FUNCS) else() message("* Build map/vmap tools : No") endif() -if( USE_COREPCH ) +if(USE_COREPCH) message("* Build core w/PCH : Yes (default)") else() message("* Build core w/PCH : No") endif() -if( USE_SCRIPTPCH ) +if(USE_SCRIPTPCH) message("* Build scripts w/PCH : Yes (default)") else() message("* Build scripts w/PCH : No") endif() -if( WITH_WARNINGS ) +if(WITH_WARNINGS) message("* Show all warnings : Yes") else() message("* Show compile-warnings : No (default)") endif() -if( WITH_COREDEBUG ) +if(WITH_COREDEBUG) message("") message(" *** WITH_COREDEBUG - WARNING!") message(" *** additional core debug logs have been enabled!") @@ -76,13 +76,13 @@ else() message("* Use coreside debug : No (default)") endif() -if( NOT WITH_SOURCE_TREE STREQUAL "no" ) +if(NOT WITH_SOURCE_TREE STREQUAL "no") message("* Show source tree : Yes (${WITH_SOURCE_TREE})") else() message("* Show source tree : No") endif() -if ( WITHOUT_GIT ) +if(WITHOUT_GIT) message("* Use GIT revision hash : No") message("") message(" *** WITHOUT_GIT - WARNING!") @@ -97,7 +97,7 @@ else() message("* Use GIT revision hash : Yes (default)") endif() -if ( NOJEM ) +if(NOJEM) message("") message(" *** NOJEM - WARNING!") message(" *** jemalloc linking has been disabled!") @@ -105,7 +105,7 @@ if ( NOJEM ) message(" *** DO NOT DISABLE IT UNLESS YOU KNOW WHAT YOU'RE DOING!") endif() -if ( HELGRIND ) +if(HELGRIND) message("") message(" *** HELGRIND - WARNING!") message(" *** Please specify the valgrind include directory in VALGRIND_INCLUDE_DIR option if you get build errors") @@ -113,21 +113,21 @@ if ( HELGRIND ) add_definitions(-DHELGRIND) endif() -if ( ASAN ) +if(ASAN) message("") message(" *** ASAN - WARNING!") message(" *** Please note that this is for DEBUGGING WITH ADDRESS SANITIZER only!") add_definitions(-DASAN) endif() -if ( PERFORMANCE_PROFILING ) +if(PERFORMANCE_PROFILING) message("") message(" *** PERFORMANCE_PROFILING - WARNING!") message(" *** Please note that this is for PERFORMANCE PROFILING only! Do NOT report any issue when enabling this configuration!") add_definitions(-DPERFORMANCE_PROFILING) endif() -if( WITH_STRICT_DATABASE_TYPE_CHECKS ) +if(WITH_STRICT_DATABASE_TYPE_CHECKS) message("") message(" *** WITH_STRICT_DATABASE_TYPE_CHECKS - WARNING!") message(" *** Validates uses of database Get***() functions from Field class") @@ -136,12 +136,12 @@ if( WITH_STRICT_DATABASE_TYPE_CHECKS ) add_definitions(-DTRINITY_STRICT_DATABASE_TYPE_CHECKS) endif() -if (BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS) message("") message(" *** WITH_DYNAMIC_LINKING - INFO!") message(" *** Will link against shared libraries!") message(" *** Please note that this is an experimental feature!") - if (WITH_DYNAMIC_LINKING_FORCED) + if(WITH_DYNAMIC_LINKING_FORCED) message("") message(" *** Dynamic linking was enforced through a dynamic script module!") endif() |