BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-15 08:15:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixes by code style

Browse Source
This commit is contained in:
Matvey Cherevko
2019-06-27 23:37:55 +07:00
parent 12712cebc5
commit fb26f70a21
1 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
CMakeLists.txt
View File

@@ -4,29 +4,28 @@ project(enduro2d)
set(E2D_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) set(E2D_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
set(E2D_ROOT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) set(E2D_ROOT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
message("E2D_SYSTEM_NAME: " ${E2D_SYSTEM_NAME})
message("E2D_ROOT_DIRECTORY: " ${E2D_ROOT_DIRECTORY})
#
# linking mode
#
set(E2D_ALL_C_CONFIGS "CMAKE_C_FLAGS") set(E2D_ALL_C_CONFIGS "CMAKE_C_FLAGS")
set(E2D_ALL_CXX_CONFIGS "CMAKE_CXX_FLAGS") set(E2D_ALL_CXX_CONFIGS "CMAKE_CXX_FLAGS")
foreach(type ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER ${type} build_type)
set(E2D_ALL_C_CONFIGS "${E2D_ALL_C_CONFIGS}" "CMAKE_C_FLAGS_${build_type}")
set(E2D_ALL_CXX_CONFIGS "${E2D_ALL_CXX_CONFIGS}" "CMAKE_CXX_FLAGS_${build_type}")
endforeach()
if(CMAKE_BUILD_TYPE) if(CMAKE_BUILD_TYPE)
string(TOUPPER ${CMAKE_BUILD_TYPE} build_type) string(TOUPPER ${CMAKE_BUILD_TYPE} build_type)
set(E2D_ALL_C_CONFIGS "${E2D_ALL_C_CONFIGS}" "CMAKE_C_FLAGS_${build_type}") set(E2D_ALL_C_CONFIGS "${E2D_ALL_C_CONFIGS}" "CMAKE_C_FLAGS_${build_type}")
set(E2D_ALL_CXX_CONFIGS "${E2D_ALL_CXX_CONFIGS}" "CMAKE_CXX_FLAGS_${build_type}") set(E2D_ALL_CXX_CONFIGS "${E2D_ALL_CXX_CONFIGS}" "CMAKE_CXX_FLAGS_${build_type}")
endif() endif()
foreach(type ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER ${type} build_type)
set(E2D_ALL_C_CONFIGS "${E2D_ALL_C_CONFIGS}" "CMAKE_C_FLAGS_${build_type}")
set(E2D_ALL_CXX_CONFIGS "${E2D_ALL_CXX_CONFIGS}" "CMAKE_CXX_FLAGS_${build_type}")
endforeach()
#
# linking mode
#
if(MSVC) if(MSVC)
option(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC runtime library DLL" OFF) option(E2D_BUILD_WITH_STATIC_CRT "Use static C runtime library" ON)
if(NOT USE_MSVC_RUNTIME_LIBRARY_DLL) if(E2D_BUILD_WITH_STATIC_CRT)
foreach(flag ${E2D_ALL_C_CONFIGS} ${E2D_ALL_CXX_CONFIGS}) foreach(flag ${E2D_ALL_C_CONFIGS} ${E2D_ALL_CXX_CONFIGS})
if(${flag} MATCHES "/MD") if(${flag} MATCHES "/MD")
string(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}") string(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
@@ -38,39 +37,38 @@ if(MSVC)
endif() endif()
endif(MSVC) endif(MSVC)
#
# compilation mode
#
set(E2D_SHARED_CXX_FLAGS "") set(E2D_SHARED_CXX_FLAGS "")
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(E2D_SHARED_CXX_FLAGS -Wloop-analysis set(E2D_SHARED_CXX_FLAGS -Wloop-analysis
-Wpointer-arith -Wpointer-arith
-Wpessimizing-move -Wpessimizing-move
-Wuninitialized -Wuninitialized
-Werror=init-self -Werror=init-self
-Werror=self-assign -Werror=self-assign
-Werror=self-move -Werror=self-move
-Werror=infinite-recursion -Werror=infinite-recursion
-Werror=dangling-else -Werror=dangling-else
-Werror=large-by-value-copy -Werror=large-by-value-copy
-Werror=instantiation-after-specialization -Werror=instantiation-after-specialization
-Werror=array-bounds -Werror=array-bounds
-Werror=missing-field-initializers -Werror=missing-field-initializers
-Werror=user-defined-literals -Werror=user-defined-literals
-Werror=parentheses -Werror=parentheses
-Werror=address -Werror=address
-Werror=return-stack-address) -Werror=return-stack-address)
string(REPLACE ";" " " E2D_SHARED_CXX_FLAGS "${E2D_SHARED_CXX_FLAGS}") string(REPLACE ";" " " E2D_SHARED_CXX_FLAGS "${E2D_SHARED_CXX_FLAGS}")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
endif() endif()
# append cxx flags for each configuration
foreach(config ${E2D_ALL_CXX_CONFIGS}) foreach(config ${E2D_ALL_CXX_CONFIGS})
set(${config} "${${config}} ${E2D_SHARED_CXX_FLAGS}") set(${config} "${${config}} ${E2D_SHARED_CXX_FLAGS}")
endforeach() endforeach()
# #
# coverage mode # coverage mode
# #