Skip to content
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

Jump to bottom

Relaxed C++ standard requirement. #54

Merged
merged 1 commit into from
Aug 19, 2023
Merged

Relaxed C++ standard requirement. #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions cmake/backend/emscripten.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ function(nui_add_emscripten_target)
# emscripten cmake with passed down Release/Debug build type
CONFIGURE_COMMAND
${EMCMAKE} cmake
-DCMAKE_CXX_STANDARD=23
-DCMAKE_EXPORT_COMPILE_COMMANDS=1
${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_CMAKE_OPTIONS}
"${SOURCE_DIR}"
# copy over package.json and fill parcel options that do not exist on it
Expand Down
4 changes: 2 additions & 2 deletions nui/src/nui/backend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ else()
endif()
nui_set_target_output_directories(nui-backend)
target_compile_features(nui-backend PUBLIC cxx_std_20)
set_target_properties(nui-backend PROPERTIES CXX_STANDARD_REQUIRED ON)
set_target_properties(nui-backend PROPERTIES CXX_EXTENSIONS ON)
set_target_properties(nui-backend PROPERTIES CXX_STANDARD_REQUIRED OFF)
set_target_properties(nui-backend PROPERTIES CXX_EXTENSIONS OFF)
6 changes: 3 additions & 3 deletions nui/src/nui/frontend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ target_link_libraries(
)
nui_set_project_warnings(nui-frontend)
nui_set_target_output_directories(nui-frontend)
target_compile_features(nui-frontend PUBLIC cxx_std_23)
set_target_properties(nui-frontend PROPERTIES CXX_STANDARD_REQUIRED ON)
set_target_properties(nui-frontend PROPERTIES CXX_EXTENSIONS ON)
target_compile_features(nui-frontend PUBLIC cxx_std_20)
set_target_properties(nui-frontend PROPERTIES CXX_STANDARD_REQUIRED OFF)
set_target_properties(nui-frontend PROPERTIES CXX_EXTENSIONS OFF)