diff --git a/CMakeLists.txt b/CMakeLists.txt index 6240cffd6..8c55e0648 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,7 @@ if (APPLE) find_library(FRAMEWORK_CORESERVICES CoreServices REQUIRED) endif() -if (APPLE) +#if (APPLE) add_compile_options( -Wall -Wno-pointer-to-int-cast @@ -154,7 +154,7 @@ if (APPLE) -Werror=old-style-definition -fno-optimize-sibling-calls ) -endif() +#endif() set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) diff --git a/CMakePresets.json b/CMakePresets.json index 185e775e1..36469e325 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -33,6 +33,100 @@ "rhs": "Windows" } }, + { + "name": "ninja-msvc-vcpkg-x64", + "description": "Configure with vcpkg toolchain and Windows Subsystem for Linux for all configurations", + "generator": "Ninja", + "inherits": "template-vcpkg", + "cacheVariables": { + "VCPKG_TARGET_TRIPLET": "x64-windows-static" + }, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "ninja-clang-vcpkg-x64", + "hidden": true, + "description": "Configure with vcpkg toolchain clang for all configurations", + "generator": "Ninja", + "inherits": "template-vcpkg", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_VERBOSE_MAKEFILE": "YES", + "CMAKE_C_COMPILER": "clang", + "CMAKE_CXX_COMPILER": "clang++", + "VCPKG_TARGET_TRIPLET": "x64-windows-static" + }, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "ninja-clang-vcpkg-x64-debug", + "inherits": "ninja-clang-vcpkg-x64", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "VCPKG_BUILD_TYPE": "Debug", + "CMAKE_C_FLAGS": "/DWIN32 /D_WINDOWS /W3 /GR /EHsc /arch:AVX2", + "CMAKE_CXX_FLAGS": "/DWIN32 /D_WINDOWS /W3 /GR /EHsc /arch:AVX2", + "CMAKE_EXE_LINKER_FLAGS": "/machine:x64" + } + }, + { + "name": "ninja-clang-vcpkg-x64-release", + "inherits": "ninja-clang-vcpkg-x64", + "cacheVariables": { + "VCPKG_C_FLAGS": "/arch:AVX2 -m64", + "VCPKG_CXX_FLAGS": "/arch:AVX2 -m64", + "CMAKE_BUILD_TYPE": "Release", + "VCPKG_BUILD_TYPE": "Release" + } + }, + { + "name": "ninja-mingw64-vcpkg-x64", + "hidden": true, + "description": "Configure with vcpkg toolchain clang for all configurations", + "generator": "Ninja", + "inherits": "template-vcpkg", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_VERBOSE_MAKEFILE": "YES", + "VCPKG_CMAKE_SYSTEM_NAME": "MinGW", + "VCPKG_TARGET_TRIPLET": "x64-mingw-static" + }, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "ninja-mingw64-vcpkg-x64-debug", + "inherits": "ninja-mingw64-vcpkg-x64", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "VCPKG_BUILD_TYPE": "Debug" + } + }, + { + "name": "ninja-mingw64-vcpkg-x64-release", + "inherits": "ninja-mingw64-vcpkg-x64", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "VCPKG_BUILD_TYPE": "Release" + } + }, { "name": "xcode-vcpkg", "hidden": true, @@ -99,6 +193,48 @@ "description": "Build Visual Studio Release configuration", "configuration": "Release" }, + { + "name": "ninja-msvc-vcpkg-x64-debug", + "configurePreset": "ninja-msvc-vcpkg-x64", + "displayName": "Build wsl-vcpkg-x64-debug", + "description": "Build Windows Subsystem for Linux Debug configuration", + "configuration": "Debug" + }, + { + "name": "ninja-msvc-vcpkg-x64-release", + "configurePreset": "ninja-msvc-vcpkg-x64", + "displayName": "Build wsl-vcpkg-x64-release", + "description": "Build Windows Subsystem for Linux Debug configuration", + "configuration": "Release" + }, + { + "name": "ninja-clang-vcpkg-x64-debug", + "configurePreset": "ninja-clang-vcpkg-x64-debug", + "displayName": "Build ninja-clang-vcpkg-x64-debug", + "description": "Build Windows Subsystem for Linux Debug configuration", + "configuration": "Debug" + }, + { + "name": "ninja-clang-vcpkg-x64-release", + "configurePreset": "ninja-clang-vcpkg-x64-release", + "displayName": "Build ninja-clang-vcpkg-x64-release", + "description": "Build Windows Subsystem for Linux Debug configuration", + "configuration": "Release" + }, + { + "name": "ninja-mingw64-vcpkg-x64-debug", + "configurePreset": "ninja-mingw64-vcpkg-x64-debug", + "displayName": "Build ninja-mingw64-vcpkg-x64-debug", + "description": "Build Windows Subsystem for Linux Debug configuration", + "configuration": "Debug" + }, + { + "name": "ninja-mingw64-vcpkg-x64-release", + "configurePreset": "ninja-mingw64-vcpkg-x64-release", + "displayName": "Build ninja-mingw64-vcpkg-x64-release", + "description": "Build Windows Subsystem for Linux Debug configuration", + "configuration": "Release" + }, { "name": "xcode-vcpkg-arm64-debug", "configurePreset": "xcode-vcpkg-arm64",