fix: Expand path vars in cmake presets at runtime

The binaries should be portable to other machines (paths shouldn't
be fixed to the user's home dir at compile time).
This commit is contained in:
John Colvin committed 2024-06-06 09:15:15 -05:00
1 parent f1744450ca
commit dd4d4e8dc6
1 file changed
+4 -4
+4 -4
View File
@@ -20,7 +20,7 @@
"SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++20 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
},
"cacheVariables": {
"APP_DATA_DIR": "$env{APPDATA}/bts",
"APP_DATA_DIR": "${dollar}{APPDATA}/bts",
"CMAKE_CXX_FLAGS": "$env{SPARK_CMAKE_CXX_FLAGS}",
"CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
"CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
@@ -52,7 +52,7 @@
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"platform": "",
"APP_DATA_DIR": "$env{HOME}/sparkdata",
"APP_DATA_DIR": "${dollar}{HOME}/sparkdata",
"CMAKE_BUILD_WITH_INSTALL_RPATH": {
"type": "BOOL",
"value": "ON"
@@ -230,7 +230,7 @@
"description": "Data Stream utils ported over from Edge",
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"APP_DATA_DIR": "$env{APPDATA}/bts/DataStream",
"APP_DATA_DIR": "${dollar}{APPDATA}/bts/DataStream",
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf",
"SHARED_MEMORY_PREFIX": "data_stream"
}
@@ -248,7 +248,7 @@
"inherits": "sparkd",
"generator": "Ninja Multi-Config",
"cacheVariables": {
"APP_DATA_DIR": "$env{HOME}/.local/share/DataStream",
"APP_DATA_DIR": "${dollar}{HOME}/.local/share/DataStream",
"BUILD_ADMIN_WEB_APP": {
"type": "BOOL",
"value": "OFF"