Skip to content

Disable scan for C++ modules in CMake #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 23, 2024
Merged

Disable scan for C++ modules in CMake #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4d0df8
chore: Build wasi and emscripten workflows in release
robertoraggi Oct 20, 2024
79ec6f2
chore: Disable scan for C++ modules in CMake
robertoraggi Oct 23, 2024
dc81ab8
chore: Rename WASI_SDK_ROOT to WASI_SDK_PATH
robertoraggi Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/features/wasi-sdk/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"ghcr.io/devcontainers/features/common-utils": {}
},
"containerEnv": {
"WASI_SDK_ROOT": "/opt/wasi-sdk"
"WASI_SDK_PATH": "/opt/wasi-sdk"
}
}
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
endif()

set(CMAKE_CXX_SCAN_FOR_MODULES OFF)

FetchContent_Declare(
utfcpp
URL https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz
Expand Down
22 changes: 14 additions & 8 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "YES",
"CMAKE_TOOLCHAIN_FILE": "$env{EMSCRIPTEN_ROOT}/cmake/Modules/Platform/Emscripten.cmake",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/build.em/install/usr",
"CMAKE_INTERPROCEDURAL_OPTIMIZATION": "YES",
"CXX_ENABLE_FLATBUFFERS": "NO",
Expand All @@ -50,16 +50,16 @@
"binaryDir": "${sourceDir}/build.wasi",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "YES",
"CMAKE_TOOLCHAIN_FILE": "$env{WASI_SDK_ROOT}/share/cmake/wasi-sdk.cmake",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_TOOLCHAIN_FILE": "$env{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake",
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/build.wasi/install/usr",
"CMAKE_INTERPROCEDURAL_OPTIMIZATION": "YES",
"CXX_ENABLE_FLATBUFFERS": "NO",
"CXX_INSTALL_WASI_SYSROOT": "YES"
},
"condition": {
"type": "notEquals",
"lhs": "$env{WASI_SDK_ROOT}",
"lhs": "$env{WASI_SDK_PATH}",
"rhs": ""
}
}
Expand All @@ -76,7 +76,9 @@
{
"name": "install",
"configurePreset": "default",
"targets": ["install"]
"targets": [
"install"
]
},
{
"name": "build-emscripten",
Expand All @@ -85,7 +87,9 @@
{
"name": "install-emscripten",
"configurePreset": "emscripten",
"targets": ["install"]
"targets": [
"install"
]
},
{
"name": "build-wasi",
Expand All @@ -94,7 +98,9 @@
{
"name": "install-wasi",
"configurePreset": "wasi",
"targets": ["install"]
"targets": [
"install"
]
}
],
"testPresets": [
Expand Down Expand Up @@ -168,4 +174,4 @@
]
}
]
}
}