Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Code Issues Releases Activity

Use posix awk instead of GNU awk

Browse Source 
We don't use any fancy GNU awk extensions so chekc for a portable awk
instead of require GNU awk.
This commit is contained in:
Natanael Copa 2015-07-23 13:15:58 +02:00
parent 9ac60dcc15
commit 8711bdee8b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/Conky.cmake
View File

@ -71,10 +71,10 @@ set(VERSION_MAJOR "1")
set(VERSION_MINOR "10") set(VERSION_MINOR "10")
set(VERSION_PATCH "1") set(VERSION_PATCH "1")
find_program(APP_GAWK gawk) find_program(APP_AWK awk)
if(NOT APP_GAWK) if(NOT APP_AWK)
message(FATAL_ERROR "Unable to find program 'gawk'") message(FATAL_ERROR "Unable to find program 'awk'")
endif(NOT APP_GAWK) endif(NOT APP_AWK)
find_program(APP_WC wc) find_program(APP_WC wc)
if(NOT APP_WC) if(NOT APP_WC)
@ -99,7 +99,7 @@ if(NOT RELEASE)
mark_as_advanced(APP_GIT) mark_as_advanced(APP_GIT)
endif(NOT RELEASE) endif(NOT RELEASE)
mark_as_advanced(APP_GAWK APP_WC APP_DATE APP_UNAME) mark_as_advanced(APP_AWK APP_WC APP_DATE APP_UNAME)
#BUILD_DATE=$(LANG=en_US LC_ALL=en_US LOCALE=en_US date) #BUILD_DATE=$(LANG=en_US LC_ALL=en_US LOCALE=en_US date)
#BUILD_ARCH="$(uname -sr) ($(uname -m))" #BUILD_ARCH="$(uname -sr) ($(uname -m))"

2
cmake/ConkyCPackSetup.cmake
View File

@ -44,7 +44,7 @@ endif(CPACK_GENERATOR MATCHES "NSIS")
# Source package setup. Compile with "make package_source". # Source package setup. Compile with "make package_source".
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION}-src") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION}-src")
set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_SOURCE_GENERATOR "TBZ2")
execute_process(COMMAND ${APP_UNAME} COMMAND ${APP_GAWK} "{print $1}" execute_process(COMMAND ${APP_UNAME} COMMAND ${APP_AWK} "{print $1}"
RESULT_VARIABLE RETVAL OUTPUT_VARIABLE CPU_ARCH RESULT_VARIABLE RETVAL OUTPUT_VARIABLE CPU_ARCH
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)

2
cmake/ConkyPlatformChecks.cmake
View File

@ -422,6 +422,6 @@ if(DEBUG)
execute_process(COMMAND execute_process(COMMAND
${APP_GIT} --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git log ${APP_GIT} --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git log
--since=${VERSION_MAJOR}-${VERSION_MINOR}-01 --pretty=oneline COMMAND --since=${VERSION_MAJOR}-${VERSION_MINOR}-01 --pretty=oneline COMMAND
${APP_WC} -l COMMAND ${APP_GAWK} "{print $1}" RESULT_VARIABLE RETVAL ${APP_WC} -l COMMAND ${APP_AWK} "{print $1}" RESULT_VARIABLE RETVAL
OUTPUT_VARIABLE COMMIT_COUNT OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_VARIABLE COMMIT_COUNT OUTPUT_STRIP_TRAILING_WHITESPACE)
endif(DEBUG) endif(DEBUG)