Skip to content

Commit a997a8f

Browse files
committed
CMakeLists.txt clean-ups.
1 parent 097f59d commit a997a8f

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

CMakeLists.txt

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,29 +82,37 @@ ENDIF()
8282
#############################################################################
8383

8484
IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
85-
MESSAGE(STATUS ${CMAKE_SYSTEM_NAME} " supported")
86-
FIND_LIBRARY(SCTP_LIB sctp)
85+
MESSAGE(STATUS ${CMAKE_SYSTEM_NAME} " supported")
86+
FIND_LIBRARY(SCTP_LIBRARY sctp)
87+
IF (NOT SCTP_LIBRARY)
88+
MESSAGE(FATAL_ERROR
89+
" Cannot find Linux Kernel SCTP library! Try:\n"
90+
" * Ubuntu/Debian: sudo apt install -y libsctp-dev\n"
91+
" * Fedora: sudo dnf install -y lksctp-tools-devel\n"
92+
" * SuSE: sudo zypper install -y lksctp-tools-devel\n"
93+
" * Alpine: sudo apk add lksctp-tools-dev\n")
94+
ENDIF()
8795

8896
ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
89-
MESSAGE(STATUS ${CMAKE_SYSTEM_NAME} " supported")
90-
SET(CMAKE_REQUIRED_INCLUDES "/usr/local/include" "/usr/include")
91-
SET(CMAKE_LIBRARY_PATH "/usr/local/lib")
92-
INCLUDE_DIRECTORIES("/usr/local/include")
97+
MESSAGE(STATUS ${CMAKE_SYSTEM_NAME} " supported")
98+
SET(CMAKE_REQUIRED_INCLUDES "/usr/local/include" "/usr/include")
99+
SET(CMAKE_LIBRARY_PATH "/usr/local/lib")
100+
INCLUDE_DIRECTORIES("/usr/local/include")
93101

94102
ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
95-
MESSAGE(STATUS ${CMAKE_SYSTEM_NAME} " supported")
96-
SET(CMAKE_REQUIRED_INCLUDES "/usr/local/include" "/usr/include" "/usr/local/opt/openssl/include")
97-
SET(CMAKE_LIBRARY_PATH "/usr/local/lib")
98-
INCLUDE_DIRECTORIES("/usr/local/include" "/usr/local/opt/openssl/include")
103+
MESSAGE(STATUS ${CMAKE_SYSTEM_NAME} " supported")
104+
SET(CMAKE_REQUIRED_INCLUDES "/usr/local/include" "/usr/include" "/usr/local/opt/openssl/include")
105+
SET(CMAKE_LIBRARY_PATH "/usr/local/lib")
106+
INCLUDE_DIRECTORIES("/usr/local/include" "/usr/local/opt/openssl/include")
99107

100108
ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
101-
MESSAGE(STATUS ${CMAKE_SYSTEM_NAME} " supported")
102-
SET(CMAKE_REQUIRED_INCLUDES "/usr/pkg/include" "/usr/include" "/usr/local/include")
103-
SET(CMAKE_LIBRARY_PATH "/usr/local/lib")
104-
INCLUDE_DIRECTORIES("/usr/pkg/include" "/usr/local/include")
109+
MESSAGE(STATUS ${CMAKE_SYSTEM_NAME} " supported")
110+
SET(CMAKE_REQUIRED_INCLUDES "/usr/pkg/include" "/usr/include" "/usr/local/include")
111+
SET(CMAKE_LIBRARY_PATH "/usr/local/lib")
112+
INCLUDE_DIRECTORIES("/usr/pkg/include" "/usr/local/include")
105113

106114
ELSE()
107-
MESSAGE(FATAL_ERROR ${CMAKE_SYSTEM_NAME} " not supported (yet?)")
115+
MESSAGE(FATAL_ERROR ${CMAKE_SYSTEM_NAME} " not supported (yet?)")
108116

109117
ENDIF()
110118

@@ -296,7 +304,7 @@ ELSE()
296304
" Cannot find libglib-2.0!")
297305
ENDIF()
298306

299-
SET(SCTP_LIB ${SCTPSOCKET_LIB} ${SCTPLIB_LIB} ${GLIB_LIBRARIES})
307+
SET(SCTP_LIBRARY ${SCTPSOCKET_LIB} ${SCTPLIB_LIB} ${GLIB_LIBRARIES})
300308
ENDIF()
301309

302310
# ====== Graphics tools for icons and logo ==================================

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ ADD_EXECUTABLE(netperfmeter
8181
transfer.cc
8282
transfer.h
8383
)
84-
TARGET_LINK_LIBRARIES(netperfmeter ${BZ2_LIBRARY} ${SCTP_LIB} "${CMAKE_THREAD_LIBS_INIT}")
84+
TARGET_LINK_LIBRARIES(netperfmeter ${BZ2_LIBRARY} ${SCTP_LIBRARY} "${CMAKE_THREAD_LIBS_INIT}")
8585
INSTALL(TARGETS netperfmeter RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
8686
INSTALL(FILES netperfmeter.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
8787
INSTALL(FILES netperfmeter.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages)
@@ -168,7 +168,7 @@ ENDIF()
168168

169169

170170
# ADD_EXECUTABLE(t1 t1.cc assure.cc loglevel.cc tools.cc mutex.cc)
171-
# TARGET_LINK_LIBRARIES(t1 ${SCTP_LIB} "${CMAKE_THREAD_LIBS_INIT}")
171+
# TARGET_LINK_LIBRARIES(t1 ${SCTP_LIBRARY} "${CMAKE_THREAD_LIBS_INIT}")
172172

173173

174174
#############################################################################

0 commit comments

Comments
 (0)