Skip to content
This repository was archived by the owner on Apr 17, 2023. It is now read-only.

Commit d99c95b

Browse files
committed
Finish linux-dist-discovery
2 parents 9c23c88 + 93814f4 commit d99c95b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cmake/Platform/Other/FindArduinoSDK.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(${CMAKE_CURRENT_LIST_DIR}/../System/LinuxDistDetector.cmake)
2-
31
function(find_arduino_sdk _return_var)
42

53
if (${CMAKE_HOST_UNIX})
@@ -9,7 +7,6 @@ function(find_arduino_sdk _return_var)
97
else () # Probably Linux
108
file(GLOB platform_search_paths /usr/share/arduino* /opt/local/arduino* /opt/arduino*
119
/usr/local/share/arduino*)
12-
detect_host_linux_distribution()
1310
endif ()
1411
elseif (${CMAKE_HOST_WIN32})
1512
set(platform_search_paths "C:/Program Files (x86)/Arduino" "C:/Program Files/Arduino")

cmake/Platform/System/BuildSystemInitializer.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include(AvrToolsFinder)
22
include(VersionDetector)
33
include(PlatformInitializer)
4+
include(LinuxDistDetector)
45

56
function(find_required_platform_tools)
67

@@ -19,6 +20,9 @@ function(initialize_build_system)
1920
set_arduino_cmake_defaults()
2021
find_required_platform_tools()
2122
detect_sdk_version()
23+
if (CMAKE_HOST_UNIX AND NOT CMAKE_HOST_APPLE) # Detect host's Linux distribution
24+
detect_host_linux_distribution()
25+
endif ()
2226

2327
initialize_arduino_platform()
2428

0 commit comments

Comments
 (0)