Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-24 22:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

update CMake presets

Browse Source
This commit is contained in:
jadebenn 2024-04-03 19:48:20 -05:00
parent 199c8224a5
commit bba825f0c8
2 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -58,7 +58,8 @@ if(UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wuninitialized -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wuninitialized -fPIC")
add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0 _GLIBCXX_USE_CXX17_ABI=0) add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0 _GLIBCXX_USE_CXX17_ABI=0)
if(NOT APPLE) # For all except Clang and Apple Clang
if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -lstdc++fs") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -lstdc++fs")
endif() endif()
@ -73,7 +74,6 @@ if(UNIX)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -fPIC") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -fPIC")
elseif(MSVC) elseif(MSVC)
# Skip warning for invalid conversion from size_t to uint32_t for all targets below for now # Skip warning for invalid conversion from size_t to uint32_t for all targets below for now
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
add_compile_options ("/wd4267" "/utf-8") add_compile_options ("/wd4267" "/utf-8")
elseif(WIN32) elseif(WIN32)
add_compile_definitions(_CRT_SECURE_NO_WARNINGS) add_compile_definitions(_CRT_SECURE_NO_WARNINGS)

55
CMakePresets.json
View File

@ -18,9 +18,8 @@
"displayName": "CI configure step for Ubuntu", "displayName": "CI configure step for Ubuntu",
"description": "Same as default, Used in GitHub actions workflow", "description": "Same as default, Used in GitHub actions workflow",
"inherits": "default", "inherits": "default",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Release", "CMAKE_BUILD_TYPE": "Release"
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
} }
}, },
{ {
@ -28,9 +27,8 @@
"displayName": "Debug configure step for Ubuntu", "displayName": "Debug configure step for Ubuntu",
"description": "Used to generate debug configuration for Ubuntu", "description": "Used to generate debug configuration for Ubuntu",
"inherits": "default", "inherits": "default",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug", "CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"CMAKE_CXX_FLAGS_INIT" : "-Og", "CMAKE_CXX_FLAGS_INIT" : "-Og",
"CMAKE_C_FLAGS_INIT" : "-Og" "CMAKE_C_FLAGS_INIT" : "-Og"
} }
@ -39,7 +37,19 @@
"name": "ci-macos-13", "name": "ci-macos-13",
"displayName": "CI configure step for MacOS", "displayName": "CI configure step for MacOS",
"description": "Same as default, Used in GitHub actions workflow", "description": "Same as default, Used in GitHub actions workflow",
"inherits": "default" "inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
{
"name": "debug-macos-13",
"displayName": "Debug configure step for MacOS",
"description": "Used to generate debug configuration for MacOS",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
}, },
{ {
"name": "ci-windows-2022", "name": "ci-windows-2022",
@ -50,10 +60,22 @@
"architecture": { "architecture": {
"value": "x64" "value": "x64"
}, },
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Release", "CMAKE_BUILD_TYPE": "Release",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON", "CMAKE_CXX_FLAGS_INIT": "/Zc:inline"
"CMAKE_CXX_FLAGS_INIT": "/O2 /Zc:inline" }
},
{
"name": "debug-windows-2022",
"displayName": "Debug configure step for Windows",
"description": "Set architecture to 64-bit (b/c RakNet)",
"inherits": "default",
"generator": "Visual Studio 17 2022",
"architecture": {
"value": "x64"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
} }
}, },
{ {
@ -100,12 +122,27 @@
"configuration": "Release", "configuration": "Release",
"jobs": 2 "jobs": 2
}, },
{
"name": "debug-windows-2022",
"configurePreset": "debug-windows-2022",
"displayName": "Windows Debug Build",
"description": "This preset is used to debug the build on windows",
"configuration": "Release",
"jobs": 2
},
{ {
"name": "ci-macos-13", "name": "ci-macos-13",
"configurePreset": "ci-macos-13", "configurePreset": "ci-macos-13",
"displayName": "MacOS CI Build", "displayName": "MacOS CI Build",
"description": "This preset is used by the CI build on MacOS", "description": "This preset is used by the CI build on MacOS",
"jobs": 2 "jobs": 2
},
{
"name": "debug-macos-13",
"configurePreset": "debug-macos-13",
"displayName": "MacOS Debug Build",
"description": "This preset is used to debug the build on MacOS",
"jobs": 2
} }
], ],
"testPresets": [ "testPresets": [