Make icecream compile on MacOS with cmake

HenryMiller1 · Apr 7, 2020 · af1f265 · af1f265
1 parent 102fb91
commit af1f265
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,7 +92,9 @@ endif()
 # ===========================
 # Find required base packages
 # ===========================
-find_package(Libcap-ng)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    find_package(Libcap-ng)
+endif()
 find_package(LZO REQUIRED)
 find_package(TAR REQUIRED)
 find_package(Zstd REQUIRED)

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
@@ -34,7 +34,7 @@ add_executable(iceccd
 
 target_link_libraries(iceccd
   icecc
-  archive
+  LibArchive::LibArchive
 )
 
 if(Libcap-ng_FOUND)

diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
@@ -44,7 +44,7 @@ add_library(icecc STATIC
 target_link_libraries(icecc
     PRIVATE
         LZO::lzo
-        zstd
+        ${ZSTD_LIBRARY}
         dl)
 
 if(Libcap-ng_FOUND)

diff --git a/services/comm.cpp b/services/comm.cpp
@@ -946,6 +946,7 @@ MsgChannel::MsgChannel(int _fd, struct sockaddr *_a, socklen_t _l, bool text)
     maximum_remote_protocol = -1;
 
     int on = 1;
+    int sec;
 
     if (!setsockopt(_fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &on, sizeof(on))) {
 #if defined( TCP_KEEPIDLE ) || defined( TCPCTL_KEEPIDLE )
@@ -955,7 +956,6 @@ MsgChannel::MsgChannel(int _fd, struct sockaddr *_a, socklen_t _l, bool text)
         int keepidle = TCPCTL_KEEPIDLE;
 #endif
 
-        int sec;
         sec = MAX_SCHEDULER_PING - 3 * MAX_SCHEDULER_PONG;
         setsockopt(_fd, IPPROTO_TCP, keepidle, (char *) &sec, sizeof(sec));
 #endif