Skip to content

Commit e47ad5e

Browse files
committed
Improve arch-mingw-w64-clang presets
1 parent 47c33c6 commit e47ad5e

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

CMakePresets.json

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,16 @@
100100
"CONFIGURATION_TARGET_SUFFIX": {"type": "STRING", "value": "devel"}
101101
}
102102
},
103+
{
104+
"name": "devel-no-tests",
105+
"inherits": ["devel"],
106+
"displayName": "Generic development config (no tests by default)",
107+
"description": "Development build using ccache with many warnings enabled and treated as errors",
108+
"binaryDir": "$env{BUILD_DIR}/${sourceDirName}/devel",
109+
"cacheVariables": {
110+
"EXCLUDE_TESTS_FROM_ALL": {"type": "BOOL", "value": "ON"}
111+
}
112+
},
103113
{
104114
"name": "devel-clang",
105115
"inherits": ["devel", "clang"],
@@ -359,20 +369,21 @@
359369
"CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "/usr/$env{MINGW_W64_CLANG_TARGET}/include"},
360370
"CMAKE_CXX_FLAGS_RELEASE": {"type": "STRING", "value": "$env{CXXFLAGS}"},
361371
"CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "/usr/$env{MINGW_W64_CLANG_TARGET}/include"},
362-
"CMAKE_SHARED_LINKER_FLAGS_RELEASE": {"type": "STRING", "value": "$env{ANDROID_LDFLAGS}"},
363372
"CMAKE_FIND_ROOT_PATH": {"type": "PATH", "value": "/usr/$env{MINGW_W64_CLANG_TARGET}"},
364373
"CMAKE_INSTALL_PREFIX": {"type": "PATH", "value": "/usr/$env{MINGW_W64_CLANG_TARGET}"},
365374
"CMAKE_INSTALL_LIBDIR": {"type": "PATH", "value": "lib"},
366375
"CMAKE_CROSSCOMPILING_EMULATOR": {"type": "PATH", "value": "/usr/bin/$env{MINGW_W64_CLANG_TARGET}-wine"},
367376
"INCLUDE_INSTALL_DIR": {"type": "PATH", "value": "/usr/$env{MINGW_W64_CLANG_TARGET}/include"},
368377
"BUILD_SHARED_LIBS": {"type": "BOOL", "value": "ON"},
369378
"VERSIONED_MINGW_LIBRARIES": {"type": "BOOL", "value": "ON"},
370-
"ENABLE_TARGETS_FOR_MINGW_CROSS_PACKAGING": {"type": "BOOL", "value": "ON"}
379+
"ENABLE_TARGETS_FOR_MINGW_CROSS_PACKAGING": {"type": "BOOL", "value": "ON"},
380+
"ENABLE_CPP_UNIT": {"type": "BOOL", "value": "OFF"},
381+
"USE_BOOST_PROCESS": {"type": "BOOL", "value": "OFF"}
371382
}
372383
},
373384
{
374385
"name": "arch-mingw-w64-clang-devel",
375-
"inherits": ["arch-mingw-w64-clang", "devel"],
386+
"inherits": ["arch-mingw-w64-clang", "devel-no-tests"],
376387
"displayName": "Target *-w64-mingw32 using LLVM/Clang provided by Arch Linux and additional mingw-w64-clang-* packaging (invoke e.g. \"source mingw-clang-env aarch64-w64-mingw32\" before invoking CMake)",
377388
"description": "Build targeting Windows, paths and flags are specific to Arch Linux packaging, invoke e.g. \"source mingw-clang-env aarch64-w64-mingw32\" for required environment variables",
378389
"binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-mingw-w64-clang-devel-$env{MINGW_W64_CLANG_TARGET}"
@@ -394,7 +405,7 @@
394405
},
395406
{
396407
"name": "arch-mingw-w64-clang-devel-static",
397-
"inherits": ["arch-mingw-w64-clang-static", "devel"],
408+
"inherits": ["arch-mingw-w64-clang-static", "devel-no-tests"],
398409
"displayName": "Target *-w64-mingw32 using LLVM/Clang provided by Arch Linux and additional mingw-w64-clang-* packaging (invoke e.g. \"source mingw-clang-env aarch64-w64-mingw32\" before invoking CMake)",
399410
"description": "Build targeting Windows preferring static libraries, paths and flags are specific to Arch Linux packaging, invoke e.g. \"source mingw-clang-env aarch64-w64-mingw32\" for required environment variables",
400411
"binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-mingw-w64-clang-devel-static-$env{MINGW_W64_CLANG_TARGET}"

0 commit comments

Comments
 (0)