p/liberty
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: p:8822d06091942454324936329bfade6a47444d70
Branches Tags
p:master
p:c++
...
compare: p:d71c47f8ce7aecdc4856630e9d73a48912be68c1
Branches Tags
p:master
p:c++

2 Commits
8822d06091 ... d71c47f8ce

Author SHA1 Message Date
Přemysl Eric Janouch
d71c47f8ce
CMakeLists.txt: omit end{if,foreach} expressions 
Their usefulness was almost negative.
 2020-10-29 15:32:26 +01:00
Přemysl Eric Janouch
425ea57b17
CMakeLists.txt: clean up OpenBSD support 
A few things might have changed.
 2020-10-29 15:31:05 +01:00
1 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -6,7 +6,7 @@ if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
# -Wunused-function is pretty annoying here, as everything is static # -Wunused-function is pretty annoying here, as everything is static
set (wdisabled "-Wno-unused-function") set (wdisabled "-Wno-unused-function")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra ${wdisabled}") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra ${wdisabled}")
endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC) endif ()
# Dependencies # Dependencies
set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
@ -16,11 +16,9 @@ find_package (PkgConfig REQUIRED)
pkg_check_modules (libssl REQUIRED libssl libcrypto) pkg_check_modules (libssl REQUIRED libssl libcrypto)
if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD") if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
include_directories (/usr/local/include)
link_directories (/usr/local/lib)
# Our POSIX version macros make these undefined # Our POSIX version macros make these undefined
add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1) add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
endif ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD") endif ()
set (common_libraries ${libssl_LIBRARIES}) set (common_libraries ${libssl_LIBRARIES})
include_directories (${libssl_INCLUDE_DIRS}) include_directories (${libssl_INCLUDE_DIRS})
@ -32,8 +30,8 @@ foreach (extra iconv rt)
find_library (extra_lib_${extra} ${extra}) find_library (extra_lib_${extra} ${extra})
if (extra_lib_${extra}) if (extra_lib_${extra})
list (APPEND common_libraries ${extra}) list (APPEND common_libraries ${extra})
endif (extra_lib_${extra}) endif ()
endforeach (extra) endforeach ()
# Build some unit tests # Build some unit tests
include_directories (${PROJECT_SOURCE_DIR}) include_directories (${PROJECT_SOURCE_DIR})
@ -43,4 +41,4 @@ foreach (name liberty proto)
add_threads (test-${name}) add_threads (test-${name})
target_link_libraries (test-${name} ${common_libraries}) target_link_libraries (test-${name} ${common_libraries})
add_test (NAME test-${name} COMMAND test-${name}) add_test (NAME test-${name} COMMAND test-${name})
endforeach (name) endforeach ()