From 77c849c2bd9acd95033a7243ed630234a584fc3a Mon Sep 17 00:00:00 2001 From: Christian Muck Date: Mon, 13 Feb 2012 21:27:25 +0100 Subject: Update project structure --- src/adaptor/CMakeLists.txt | 6 ------ src/console/CMakeLists.txt | 6 ------ src/daemon/CMakeLists.txt | 3 --- src/examples/CMakeLists.txt | 9 --------- src/lib/CMakeLists.txt | 7 +------ src/system/CMakeLists.txt | 3 --- src/tests/CMakeLists.txt | 24 ------------------------ 7 files changed, 1 insertion(+), 57 deletions(-) (limited to 'src') diff --git a/src/adaptor/CMakeLists.txt b/src/adaptor/CMakeLists.txt index a07bcbb..8a04377 100755 --- a/src/adaptor/CMakeLists.txt +++ b/src/adaptor/CMakeLists.txt @@ -37,17 +37,11 @@ set(dlt_adaptor_stdin_SRCS dlt-adaptor-stdin) add_executable(dlt-adaptor-stdin ${dlt_adaptor_stdin_SRCS}) -IF(GPROF_DLT_ADAPTOR) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_ADAPTOR) target_link_libraries(dlt-adaptor-stdin dlt) set_target_properties(dlt-adaptor-stdin PROPERTIES LINKER_LANGUAGE C) set(dlt_adaptor_udp_SRCS dlt-adaptor-udp) add_executable(dlt-adaptor-udp ${dlt_adaptor_udp_SRCS}) -IF(GPROF_DLT_ADAPTOR) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_ADAPTOR) target_link_libraries(dlt-adaptor-udp dlt) set_target_properties(dlt-adaptor-udp PROPERTIES LINKER_LANGUAGE C) diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt index 6de6723..6cc03ac 100755 --- a/src/console/CMakeLists.txt +++ b/src/console/CMakeLists.txt @@ -37,17 +37,11 @@ set(dlt_convert_SRCS dlt-convert) add_executable(dlt-convert ${dlt_convert_SRCS} ${dlt_most_SRCS}) -IF(GPROF_DLT_CONSOLE) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_CONSOLE) target_link_libraries(dlt-convert dlt ${EXPAT_LIBRARIES}) set_target_properties(dlt-convert PROPERTIES LINKER_LANGUAGE C) set(dlt_receive_SRCS dlt-receive) add_executable(dlt-receive ${dlt_receive_SRCS} ${dlt_most_SRCS}) -IF(GPROF_DLT_CONSOLE) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_CONSOLE) target_link_libraries(dlt-receive dlt ${EXPAT_LIBRARIES}) set_target_properties(dlt-receive PROPERTIES LINKER_LANGUAGE C) diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 921f2d3..5ae1a14 100755 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -37,9 +37,6 @@ set(dlt_daemon_SRCS dlt-daemon dlt_daemon_common ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_offline_trace.c) add_executable(dlt-daemon ${dlt_daemon_SRCS}) -IF(GPROF_DLT_DAEMON) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_DAEMON) target_link_libraries(dlt-daemon rt ${CMAKE_THREAD_LIBS_INIT}) install(TARGETS dlt-daemon diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt index 47bb505..be538db 100755 --- a/src/examples/CMakeLists.txt +++ b/src/examples/CMakeLists.txt @@ -37,25 +37,16 @@ set(dlt_example_user_SRCS dlt-example-user) add_executable(dlt-example-user ${dlt_example_user_SRCS}) -IF(GPROF_DLT_EXAMPLES) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_EXAMPLES) target_link_libraries(dlt-example-user dlt) set_target_properties(dlt-example-user PROPERTIES LINKER_LANGUAGE C) set(dlt_example_user_func_SRCS dlt-example-user-func) add_executable(dlt-example-user-func ${dlt_example_user_func_SRCS}) -IF(GPROF_DLT_EXAMPLES) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_EXAMPLES) target_link_libraries(dlt-example-user-func dlt) set_target_properties(dlt-example-user-func PROPERTIES LINKER_LANGUAGE C) set(dlt_example_filetransfer_SRCS dlt-example-filetransfer) add_executable( dlt-example-filetransfer ${dlt_example_filetransfer_SRCS}) -IF(GPROF_DLT_EXAMPLES) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_EXAMPLES) target_link_libraries(dlt-example-filetransfer dlt ) set_target_properties(dlt-example-filetransfer PROPERTIES LINKER_LANGUAGE C) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index a916683..db87b65 100755 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -38,14 +38,9 @@ set(dlt_LIB_SRCS dlt_user dlt_client dlt_filetransfer ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c) add_library(dlt ${dlt_LIB_SRCS}) - -IF(GPROF_DLT_LIB) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_LIB) - target_link_libraries(dlt rt ${CMAKE_THREAD_LIBS_INIT}) -set_target_properties(dlt PROPERTIES VERSION ${PRINT_MAJOR_VERSION}.${PRINT_MINOR_VERSION}.${PRINT_PATCH_LEVEL} SOVERSION ${PRINT_MAJOR_VERSION}) +set_target_properties(dlt PROPERTIES VERSION ${DLT_VERSION} SOVERSION ${DLT_MAJOR_VERSION}) install(TARGETS dlt LIBRARY DESTINATION lib diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index 9b3fc1d..5524316 100755 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -37,9 +37,6 @@ set(dlt_system_SRCS dlt-system dlt-system-log) add_executable(dlt-system ${dlt_system_SRCS}) -IF(GPROF_DLT_SYSTEM) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_SYSTEM) target_link_libraries(dlt-system dlt) set_target_properties(dlt-system PROPERTIES LINKER_LANGUAGE C) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index a9add6e..4e21b32 100755 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -37,65 +37,41 @@ set(dlt_test_multi_process_SRCS dlt-test-multi-process) add_executable(dlt-test-multi-process ${dlt_test_multi_process_SRCS}) -IF(GPROF_DLT_TESTS) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_TESTS) target_link_libraries(dlt-test-multi-process dlt) set_target_properties(dlt-test-multi-process PROPERTIES LINKER_LANGUAGE C) set(dlt_test_multi_process_client_SRCS dlt-test-multi-process-client) add_executable(dlt-test-multi-process-client ${dlt_test_multi_process_client_SRCS}) -IF(GPROF_DLT_TESTS) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_TESTS) target_link_libraries(dlt-test-multi-process-client dlt) set_target_properties(dlt-test-multi-process-client PROPERTIES LINKER_LANGUAGE C) set(dlt_test_user_SRCS dlt-test-user) add_executable(dlt-test-user ${dlt_test_user_SRCS}) -IF(GPROF_DLT_TESTS) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_TESTS) target_link_libraries(dlt-test-user dlt) set_target_properties(dlt-test-user PROPERTIES LINKER_LANGUAGE C) set(dlt_test_client_SRCS dlt-test-client) add_executable(dlt-test-client ${dlt_test_client_SRCS}) -IF(GPROF_DLT_TESTS) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_TESTS) target_link_libraries(dlt-test-client dlt) set_target_properties(dlt-test-client PROPERTIES LINKER_LANGUAGE C) set(dlt_test_stress_user_SRCS dlt-test-stress-user) add_executable(dlt-test-stress-user ${dlt_test_stress_user_SRCS}) -IF(GPROF_DLT_TESTS) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_TESTS) target_link_libraries(dlt-test-stress-user dlt) set_target_properties(dlt-test-stress-user PROPERTIES LINKER_LANGUAGE C) set(dlt_test_stress_client_SRCS dlt-test-stress-client) add_executable(dlt-test-stress-client ${dlt_test_stress_client_SRCS}) -IF(GPROF_DLT_TESTS) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_TESTS) target_link_libraries(dlt-test-stress-client dlt) set_target_properties(dlt-test-stress-client PROPERTIES LINKER_LANGUAGE C) set(dlt_test_stress_SRCS dlt-test-stress) add_executable(dlt-test-stress ${dlt_test_stress_SRCS}) -IF(GPROF_DLT_TESTS) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_TESTS) target_link_libraries(dlt-test-stress dlt) set_target_properties(dlt-test-stress PROPERTIES LINKER_LANGUAGE C) set(dlt_test_filetransfer_SRCS dlt-test-filetransfer) add_executable(dlt-test-filetransfer ${dlt_test_filetransfer_SRCS}) -IF(GPROF_DLT_TESTS) - SET(CMAKE_C_FLAGS "-pg") -ENDIF(GPROF_DLT_TESTS) target_link_libraries(dlt-test-filetransfer dlt) set_target_properties(dlt-test-filetransfer PROPERTIES LINKER_LANGUAGE C) -- cgit v1.2.1