From f34e55fe815220d3f1e89f5211154715cec84845 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Sun, 25 Mar 2012 13:51:59 +0200 Subject: [PATCH] cmake: minor: make whitespaces in cmake files consistent Make whitespaces in cmake files consistent. Signed-off-by: Daniel Borkmann --- src/ashunt/CMakeLists.txt | 2 -- src/bpfc/CMakeLists.txt | 3 --- src/curvetun/CMakeLists.txt | 4 ---- src/flowtop/CMakeLists.txt | 2 -- src/ifpps/CMakeLists.txt | 2 -- src/netsniff-ng/CMakeLists.txt | 2 -- src/trafgen/CMakeLists.txt | 2 -- 7 files changed, 17 deletions(-) diff --git a/src/ashunt/CMakeLists.txt b/src/ashunt/CMakeLists.txt index f54a66ef..7e7afd92 100644 --- a/src/ashunt/CMakeLists.txt +++ b/src/ashunt/CMakeLists.txt @@ -17,11 +17,9 @@ IF (LIBGEOIP_FOUND AND CMAKE_HAVE_PTHREAD_CREATE) ../mtrand.c ../ring_rx.c ../ashunt.c) - ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}" -DVERSION_STRING="${VERSION}" -DBUILD_STRING="${BUILD_STRING}") - TARGET_LINK_LIBRARIES(ashunt ${LIBGEOIP_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) POD2MAN(${CMAKE_SOURCE_DIR}/ashunt.c ashunt 8) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${EXECUTABLE_INSTALL_PATH}) diff --git a/src/bpfc/CMakeLists.txt b/src/bpfc/CMakeLists.txt index 5feb0a44..ddd082da 100644 --- a/src/bpfc/CMakeLists.txt +++ b/src/bpfc/CMakeLists.txt @@ -9,18 +9,15 @@ INCLUDE(Pod2Man) IF (FLEX_FOUND AND BISON_FOUND) FLEX_TARGET(BPF_LEXER ../bpf_lexer.l ${CMAKE_CURRENT_BINARY_DIR}/lex.yy.c) BISON_TARGET(BPF_PARSER ../bpf_parser.y ${CMAKE_CURRENT_BINARY_DIR}/bpf_parser.tab.c) - ADD_EXECUTABLE(${PROJECT_NAME} ../xmalloc.c ../xstring.c ../bpf.c ${FLEX_BPF_LEXER_OUTPUTS} ${BISON_BPF_PARSER_OUTPUT_SOURCE} ../bpfc.c) - ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}" -DVERSION_STRING="${VERSION}" -DBUILD_STRING="${BUILD_STRING}") - POD2MAN(${CMAKE_SOURCE_DIR}/bpfc.c bpfc 8) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${EXECUTABLE_INSTALL_PATH}) ELSE (FLEX_FOUND AND BISON_FOUND) diff --git a/src/curvetun/CMakeLists.txt b/src/curvetun/CMakeLists.txt index d4922a53..5662d60d 100644 --- a/src/curvetun/CMakeLists.txt +++ b/src/curvetun/CMakeLists.txt @@ -8,7 +8,6 @@ FIND_PACKAGE(Threads) FIND_PACKAGE(LibNaCl) IF (NACL_FOUND AND CMAKE_THREAD_LIBS_INIT) - ADD_EXECUTABLE(${PROJECT_NAME} ../xmalloc.c ../xio.c ../xsys.c @@ -25,16 +24,13 @@ IF (NACL_FOUND AND CMAKE_THREAD_LIBS_INIT) ../ct_server.c ../ct_client.c ../curvetun.c) - ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}" -DVERSION_STRING="${VERSION}" -DBUILD_STRING="${BUILD_STRING}") - INCLUDE_DIRECTORIES(${NACL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(curvetun ${NACL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) POD2MAN(${CMAKE_SOURCE_DIR}/curvetun.c curvetun 8) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${EXECUTABLE_INSTALL_PATH}) - ELSE (NACL_FOUND AND CMAKE_THREAD_LIBS_INIT) MESSAGE("NaCl was not found. Check if NACL_INCLUDE_DIR and NACL_LIB_DIR are properly set in nacl_path.cmake. Skipping ${PROJECT_NAME} build") ENDIF (NACL_FOUND AND CMAKE_THREAD_LIBS_INIT) diff --git a/src/flowtop/CMakeLists.txt b/src/flowtop/CMakeLists.txt index 916545b4..c07d6925 100644 --- a/src/flowtop/CMakeLists.txt +++ b/src/flowtop/CMakeLists.txt @@ -19,11 +19,9 @@ IF(CURSES_FOUND AND CMAKE_HAVE_PTHREAD_CREATE AND LIBGEOIP_FOUND AND LIBNETFILTE ../dissector.c ../tprintf.c ../flowtop.c) - ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}" -DVERSION_STRING="${VERSION}" -DBUILD_STRING="${BUILD_STRING}") - TARGET_LINK_LIBRARIES(flowtop ${CURSES_NCURSES_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${LIBNETFILTER_CONNTRACK_LIBRARY} ${LIBGEOIP_LIBRARY} ${LIBURCU_LIBRARY}) POD2MAN(${CMAKE_SOURCE_DIR}/flowtop.c flowtop 8) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${EXECUTABLE_INSTALL_PATH}) diff --git a/src/ifpps/CMakeLists.txt b/src/ifpps/CMakeLists.txt index 90554eba..b08b8f94 100644 --- a/src/ifpps/CMakeLists.txt +++ b/src/ifpps/CMakeLists.txt @@ -11,11 +11,9 @@ IF(CURSES_FOUND) ../xsys.c ../xstring.c ../ifpps.c) - ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}" -DVERSION_STRING="${VERSION}" -DBUILD_STRING="${BUILD_STRING}") - TARGET_LINK_LIBRARIES(ifpps ${CURSES_NCURSES_LIBRARY}) POD2MAN(${CMAKE_SOURCE_DIR}/ifpps.c ifpps 8) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${EXECUTABLE_INSTALL_PATH}) diff --git a/src/netsniff-ng/CMakeLists.txt b/src/netsniff-ng/CMakeLists.txt index 90c86cb6..77392b24 100644 --- a/src/netsniff-ng/CMakeLists.txt +++ b/src/netsniff-ng/CMakeLists.txt @@ -28,9 +28,7 @@ IF (CMAKE_HAVE_PTHREAD_CREATE) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE) - POD2MAN(${CMAKE_SOURCE_DIR}/netsniff-ng.c netsniff-ng 8) - TARGET_LINK_LIBRARIES(netsniff-ng ${CMAKE_THREAD_LIBS_INIT}) FILE(GLOB rules_files "../examples/bpfc/*.bpf") INSTALL(FILES ${rules_files} DESTINATION ${CONFIG_INSTALL_PATH}/rules/) diff --git a/src/trafgen/CMakeLists.txt b/src/trafgen/CMakeLists.txt index 6bd682ea..85bf36b8 100644 --- a/src/trafgen/CMakeLists.txt +++ b/src/trafgen/CMakeLists.txt @@ -12,10 +12,8 @@ ADD_EXECUTABLE(${PROJECT_NAME} ../xmalloc.c ../opt_memcpy.c ../ring_tx.c ../trafgen.c) - ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}" -DVERSION_STRING="${VERSION}" -DBUILD_STRING="${BUILD_STRING}") - POD2MAN(${CMAKE_SOURCE_DIR}/trafgen.c trafgen 8) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${EXECUTABLE_INSTALL_PATH}) -- 2.11.4.GIT