Changeset View
Changeset View
Standalone View
Standalone View
head/astro/opencpn/files/patch-cmake_TargetSetup.cmake
| --- cmake/TargetSetup.cmake.orig 2020-07-15 18:02:29 UTC | --- cmake/TargetSetup.cmake.orig 2020-10-22 23:20:06 UTC | ||||
| +++ cmake/TargetSetup.cmake | +++ cmake/TargetSetup.cmake | ||||
| @@ -26,14 +26,10 @@ elseif (APPLE) | @@ -39,14 +39,14 @@ elseif(_wx_selected_config MATCHES "androideabi-qt") | ||||
| execute_process(COMMAND "sw_vers" "-productVersion" | endif(ANDROID_ARCH MATCHES "arm64") | ||||
| OUTPUT_VARIABLE PKG_TARGET_VERSION) | |||||
| elseif (UNIX) | elseif (UNIX) | ||||
| - find_program(LSB_RELEASE NAMES lsb_release) | - find_program(LSB_RELEASE NAMES lsb_release) | ||||
| - if (NOT LSB_RELEASE) | - if (NOT LSB_RELEASE) | ||||
| - message(FATAL_ERROR | - message(FATAL_ERROR | ||||
| - "Cannot find the lsb_release program, please install.") | - "Cannot find the lsb_release program, please install.") | ||||
| - endif () | - endif () | ||||
| - execute_process(COMMAND ${LSB_RELEASE} "-is" | - execute_process(COMMAND ${LSB_RELEASE} "-is" | ||||
| + find_program(LSB_RELEASE NAMES uname) | +# find_program(LSB_RELEASE NAMES lsb_release) | ||||
| + execute_process(COMMAND ${LSB_RELEASE} "-s" | +# if (NOT LSB_RELEASE) | ||||
| +# message(FATAL_ERROR | |||||
| +# "Cannot find the lsb_release program, please install.") | |||||
| +# endif () | |||||
| + execute_process(COMMAND uname "-i" | |||||
| OUTPUT_VARIABLE PKG_TARGET) | OUTPUT_VARIABLE PKG_TARGET) | ||||
| - execute_process(COMMAND ${LSB_RELEASE} "-rs" | - execute_process(COMMAND ${LSB_RELEASE} "-rs" | ||||
| + execute_process(COMMAND ${LSB_RELEASE} "-r" | + execute_process(COMMAND uname "-r" | ||||
| OUTPUT_VARIABLE PKG_TARGET_VERSION) | OUTPUT_VARIABLE PKG_TARGET_VERSION) | ||||
| else () | else () | ||||
| set(PKG_TARGET "unknown") | set(PKG_TARGET "unknown") | ||||