diff options
Diffstat (limited to 'astro/opencpn/files/patch-cmake_TargetSetup.cmake')
| -rw-r--r-- | astro/opencpn/files/patch-cmake_TargetSetup.cmake | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/astro/opencpn/files/patch-cmake_TargetSetup.cmake b/astro/opencpn/files/patch-cmake_TargetSetup.cmake index 926bd1008406..fe2e4c8973b6 100644 --- a/astro/opencpn/files/patch-cmake_TargetSetup.cmake +++ b/astro/opencpn/files/patch-cmake_TargetSetup.cmake @@ -1,8 +1,8 @@ ---- 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 -@@ -26,14 +26,10 @@ elseif (APPLE) - execute_process(COMMAND "sw_vers" "-productVersion" - OUTPUT_VARIABLE PKG_TARGET_VERSION) +@@ -39,14 +39,14 @@ elseif(_wx_selected_config MATCHES "androideabi-qt") + endif(ANDROID_ARCH MATCHES "arm64") + elseif (UNIX) - find_program(LSB_RELEASE NAMES lsb_release) - if (NOT LSB_RELEASE) @@ -10,11 +10,15 @@ - "Cannot find the lsb_release program, please install.") - endif () - execute_process(COMMAND ${LSB_RELEASE} "-is" -+ find_program(LSB_RELEASE NAMES uname) -+ execute_process(COMMAND ${LSB_RELEASE} "-s" ++# find_program(LSB_RELEASE NAMES lsb_release) ++# 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) - execute_process(COMMAND ${LSB_RELEASE} "-rs" -+ execute_process(COMMAND ${LSB_RELEASE} "-r" ++ execute_process(COMMAND uname "-r" OUTPUT_VARIABLE PKG_TARGET_VERSION) else () set(PKG_TARGET "unknown") |