From 858bbf4bc44af58d8ac5cb2404508fa948dc2c97 Mon Sep 17 00:00:00 2001 From: Dimo Markov Date: Tue, 8 Oct 2024 16:19:44 +0300 Subject: [PATCH] Bumped core; Removed CMakeSettings --- CMakeLists.txt | 2 +- CMakeSettings.json | 284 --------------------------------------------- 2 files changed, 1 insertion(+), 285 deletions(-) delete mode 100644 CMakeSettings.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 21dfe2d..f070ee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ if (PROJECT_IS_TOP_LEVEL OR NOT LANGULUS) include(LangulusUtilities.cmake) # Add Langulus::Core library - fetch_langulus_module(Core GIT_TAG 393d95b6ab13fc5846bda8a3044e4ca62f02fd5a) + fetch_langulus_module(Core GIT_TAG 92ddfa982d0e83af45b46f5935f462ace81e0aeb) endif() # Configure {fmt} library diff --git a/CMakeSettings.json b/CMakeSettings.json deleted file mode 100644 index e29fea7..0000000 --- a/CMakeSettings.json +++ /dev/null @@ -1,284 +0,0 @@ -{ - "configurations": [ - { - "name": "MSVC-x64-Debug", - "generator": "Ninja", - "configurationType": "Debug", - "inheritEnvironments": [ "msvc_x64_x64" ], - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "MSVC-x86-Debug", - "generator": "Ninja", - "configurationType": "Debug", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "msvc_x86" ], - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "WSL-GCC-Debug", - "generator": "Ninja", - "configurationType": "Debug", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeExecutable": "cmake", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "linux_x64" ], - "wslPath": "${defaultWSLPath}", - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "x86-Clang-Debug", - "generator": "Ninja", - "configurationType": "Debug", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "clang_cl_x86" ], - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "MSVC-x86-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "msvc_x86" ], - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "MSVC-x64-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "msvc_x64_x64" ], - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "x86-Clang-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "clang_cl_x86" ], - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "WSL-GCC-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeExecutable": "cmake", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "linux_x64" ], - "wslPath": "${defaultWSLPath}", - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "x64-Clang-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "clang_cl_x64_x64" ], - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "x64-Clang-Debug", - "generator": "Ninja", - "configurationType": "Debug", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "clang_cl_x64_x64" ], - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "arm64-Clang-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "clang_cl_arm64_x64" ], - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - }, - { - "name": "arm64-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "installRoot": "${projectDir}\\out\\install\\${name}", - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "msvc_arm64_x64" ], - "variables": [ - { - "name": "LANGULUS_TESTING", - "value": "ON", - "type": "BOOL" - }, - { - "name": "LANGULUS_SHARED_LIBRARIES", - "value": "ON", - "type": "BOOL" - } - ] - } - ] -} \ No newline at end of file