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

Remove cmake_minimum_required from toolchain files #412

Merged
merged 1 commit into from
Jul 23, 2024
Merged

Remove cmake_minimum_required from toolchain files #412

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
3 changes: 0 additions & 3 deletions wasi-sdk-p2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Cmake toolchain description file for the Makefile

# This is arbitrary, AFAIK, for now.
cmake_minimum_required(VERSION 3.5.0)

# Until Platform/WASI.cmake is upstream we need to inject the path to it
# into CMAKE_MODULE_PATH.
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
Expand Down
3 changes: 0 additions & 3 deletions wasi-sdk-pthread.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Cmake toolchain description file for the Makefile

# This is arbitrary, AFAIK, for now.
cmake_minimum_required(VERSION 3.4.0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The android NDK toolchain file does seem to include a cmake_minimum_version: https://android.googlesource.com/platform/ndk/+/master/build/cmake/android.toolchain.cmake#35

Are you sure this is not supposed to be here?

Perhaps we could bump to to 3.6 like the android one to avoid the warning you mention?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is not supposed to be there. Was it originally included for a specific reason?

See the examples in the official CMake documentation. Or these examples.

The warning I pointed to is one example of unintended consequences, but there are more. CMake changes its behavior based on policies, which are impacted by a cmake_minimum_required call.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That line as been there since the initial commit (c80964d).

I don't know it was included, it looks like we would have to go back to yury's wasmception to find out why.

It sounds like you know what you are talking about cmake-wise, and also emscripten's cmake does not specify cmake_minimum_required so I'm tempted to just approve this.

Lets wait for @pchickey to chime in though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your attention and consideration.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that this change is likely the right one to make.


set(CMAKE_SYSTEM_NAME WASI)
set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR wasm32)
Expand Down
3 changes: 0 additions & 3 deletions wasi-sdk.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Cmake toolchain description file for the Makefile

# This is arbitrary, AFAIK, for now.
cmake_minimum_required(VERSION 3.5.0)

# Until Platform/WASI.cmake is upstream we need to inject the path to it
# into CMAKE_MODULE_PATH.
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
Expand Down
Loading