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

Tidy ups to variable and argument names #656

Merged
merged 11 commits into from
Aug 14, 2024
Merged

Tidy ups to variable and argument names #656

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
da660a9
Ensure all macros and functions are padded with 2 empty lines
jhol Jul 19, 2024
6f63da3
Set detect_os variables and arguments to lower-case snake-case
jhol Jul 19, 2024
07c8436
Set detect_arch variables and arguments to lower-case snake-case
jhol Jul 19, 2024
d669866
Set detect_cxx_standard argument to lower-case snake-case
jhol Jul 19, 2024
c989c6a
Set detect_lib_cxx variables and arguments to lower-case snake-case
jhol Jul 19, 2024
da333a6
Set detect_compiler variables and arguments to lower-case snake-case
jhol Jul 19, 2024
e9f7c20
Set detect_build_type argument and variables to lower-case snake-case
jhol Jul 19, 2024
fb62b74
Improved naming of variables in detect_host_profile
jhol Jul 18, 2024
ea0e704
Set conan_install variables to lower-case snake-case
jhol Jul 19, 2024
f789d10
Set conan_version_check variables to lower-case snake-case
jhol Jul 19, 2024
1098876
Set conan_provide_dependency_check variables to lower-case snake-case
jhol Jul 19, 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
Next Next commit
Ensure all macros and functions are padded with 2 empty lines
  • Loading branch information
@jhol
jhol committed Jul 19, 2024
commit da660a95bac8970b3dbcfa7c93561060f469e80b
2 changes: 2 additions & 0 deletions conan_provider.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ set(CONAN_MINIMUM_VERSION 2.0.5)
cmake_policy(PUSH)
cmake_minimum_required(VERSION 3.24)


function(detect_os OS OS_API_LEVEL OS_SDK OS_SUBSYSTEM OS_VERSION)
# it could be cross compilation
message(STATUS "CMake-Conan: cmake_system_name=${CMAKE_SYSTEM_NAME}")
Expand Down Expand Up @@ -304,6 +305,7 @@ function(detect_build_type BUILD_TYPE)
endif()
endfunction()


macro(set_conan_compiler_if_appleclang lang command output_variable)
if(CMAKE_${lang}_COMPILER_ID STREQUAL "AppleClang")
execute_process(COMMAND xcrun --find ${command}
Expand Down
Loading