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.

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

Ongoing cmake build work. #42182

Merged
merged 2 commits into from
Sep 18, 2020
Merged

Ongoing cmake build work. #42182

merged 2 commits into from
Sep 18, 2020

Conversation

vargaz
Copy link
Contributor

@vargaz vargaz commented Sep 13, 2020

  • Fix indentation.
  • Add linux support.
  • Add tvos support.
  • Use clang only options only with clang.
  • Add check for iconv.

* Fix indentation.
* Add linux support.
* Add tvos support.
* Use clang only options only with clang.
* Add check for iconv.

check_c_compiler_flag("-Werror=incompatible-pointer-types" WERROR_INCOMPATIBLE_POINTER_TYPES)
if(WERROR_INCOMPATIBLE_POINTER_TYPES)
set(WERROR "${WERROR} -Werror=incompatible-pointer-types")
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a tab, which I assume is a mistake? Also, why are we using spaces here—is this a dotnet/runtime CMake standard?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure whenever we should use spaces or tabs.

set(HAVE_SYSTEM 0)
set(MONO_DL_NEED_USCORE 1)
if(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
set(HOST_TVOS 1)
Copy link
Contributor

Choose a reason for hiding this comment

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

Tab again. Maybe specify the cmake files in the editorconfig as well, as a followup to Aleksey's PR?

src/mono/CMakeLists.txt Show resolved Hide resolved
src/mono/CMakeLists.txt Show resolved Hide resolved
"#include <sched.h>\n"
"void main () { CPU_COUNT((void *) 0); }\n"
)
try_compile(GLIBC_HAS_CPU_COUNT ${CMAKE_BINARY_DIR}/CMakeTmp SOURCES "${CMAKE_BINARY_DIR}{$CMAKE_FILES_DIRECTORY}/CMakeTmp/test.c"
Copy link
Contributor

Choose a reason for hiding this comment

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

CMake path handling is so bad :(
I think cmake_path got merged upstream earlier this month? But it's still clunky and we probably can't depend on a bleeding edge version, alas.

@vargaz vargaz merged commit fd09c80 into dotnet:master Sep 18, 2020
@vargaz vargaz deleted the cmake6 branch September 18, 2020 04:49
@ghost ghost locked as resolved and limited conversation to collaborators Dec 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants