From 4493f87627bf2a2becb55a7246e13fff1a6155bf Mon Sep 17 00:00:00 2001 From: npyl Date: Mon, 30 Jul 2018 17:22:02 +0300 Subject: [PATCH] Setup cmake files and project code for Objective-C code #17 We want to use CoreWLAN framework. --- cmake/ConkyPlatformChecks.cmake | 7 +------ src/darwin.mm | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake index a95b41c359..27753a9116 100644 --- a/cmake/ConkyPlatformChecks.cmake +++ b/cmake/ConkyPlatformChecks.cmake @@ -151,11 +151,6 @@ if(BUILD_MATH) set(conky_libs ${conky_libs} -lm) endif(BUILD_MATH) -if(OS_DARWIN AND BUILD_IPGFREQ) - find_library(IPG IntelPowerGadget) - set(conky_libs ${conky_libs} ${IPG}) -endif(OS_DARWIN AND BUILD_IPGFREQ) - if(BUILD_ICAL) check_include_files(libical/ical.h ICAL_H_) if(NOT ICAL_H_) @@ -524,4 +519,4 @@ if(DEBUG) --since=${VERSION_MAJOR}-${VERSION_MINOR}-01 --pretty=oneline COMMAND ${APP_WC} -l COMMAND ${APP_AWK} "{print $1}" RESULT_VARIABLE RETVAL OUTPUT_VARIABLE COMMIT_COUNT OUTPUT_STRIP_TRAILING_WHITESPACE) -endif(DEBUG) +endif(DEBUG) \ No newline at end of file diff --git a/src/darwin.mm b/src/darwin.mm index 8babfff7e6..b07e6b35c3 100644 --- a/src/darwin.mm +++ b/src/darwin.mm @@ -82,6 +82,10 @@ #include #endif +#ifdef BUILD_WLAN +#import +#endif + /* clock_gettime includes */ #ifndef HAVE_CLOCK_GETTIME #include