CMakeLists.txt: omit end{if,foreach} expressions
Their usefulness was almost negative.
This commit is contained in:
parent
425ea57b17
commit
d71c47f8ce
|
@ -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)
|
||||||
|
@ -18,7 +18,7 @@ pkg_check_modules (libssl REQUIRED libssl libcrypto)
|
||||||
if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
|
if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
|
||||||
# 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})
|
||||||
|
@ -30,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})
|
||||||
|
@ -41,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 ()
|
||||||
|
|
Loading…
Reference in New Issue