diff --git a/TODO.t2t b/TODO.t2t index 0037bac..c23d476 100644 --- a/TODO.t2t +++ b/TODO.t2t @@ -56,7 +56,11 @@ Work to do in OwlPS - Add option dump-configuration (displays the config & exits). - CMake: - - installation targets + - check dependencies to external libraries + - handle doc/ + - generate Positioner's doc out of the source tree + - use the installation prefix as search prefix for configuration files + in Listener, Aggregator and Positioner - Support string-based positioning requests diff --git a/libowlps-client/CMakeLists.txt b/libowlps-client/CMakeLists.txt index 12371e8..7ad50cc 100644 --- a/libowlps-client/CMakeLists.txt +++ b/libowlps-client/CMakeLists.txt @@ -9,3 +9,9 @@ set_target_properties( ) target_link_libraries(libowlps-client.so libowlps.so) target_link_libraries(libowlps-client.a libowlps.a) +install( + TARGETS libowlps-client.so libowlps-client.a + DESTINATION lib) +install( + FILES owlps-client.h + DESTINATION include) diff --git a/libowlps-resultreader/CMakeLists.txt b/libowlps-resultreader/CMakeLists.txt index 157d6db..2a50d76 100644 --- a/libowlps-resultreader/CMakeLists.txt +++ b/libowlps-resultreader/CMakeLists.txt @@ -9,11 +9,20 @@ set_target_properties( ) target_link_libraries(libowlps-resultreader.so libowlps.so) target_link_libraries(libowlps-resultreader.a libowlps.a) +install( + TARGETS libowlps-resultreader.so libowlps-resultreader.a + DESTINATION lib) add_executable(owlps-resultreader-udp owlps-resultreader-udp.c) target_link_libraries(owlps-resultreader-udp libowlps.so libowlps-resultreader.so) +install( + TARGETS owlps-resultreader-udp + DESTINATION bin) +install( + FILES owlps-resultreader.h + DESTINATION include) add_executable(owlps-resultreader-udp.semistatic EXCLUDE_FROM_ALL owlps-resultreader-udp.c) diff --git a/libowlps/CMakeLists.txt b/libowlps/CMakeLists.txt index 7255025..79d9350 100644 --- a/libowlps/CMakeLists.txt +++ b/libowlps/CMakeLists.txt @@ -7,3 +7,9 @@ set_target_properties( SOVERSION 3 VERSION 3.1 ) +install( + TARGETS libowlps.so libowlps.a + DESTINATION lib) +install( + FILES owlps.h + DESTINATION include) diff --git a/owlps-aggregator/CMakeLists.txt b/owlps-aggregator/CMakeLists.txt index 16ab1c4..c16881a 100644 --- a/owlps-aggregator/CMakeLists.txt +++ b/owlps-aggregator/CMakeLists.txt @@ -4,6 +4,9 @@ add_executable(owlps-aggregatord owlps-aggregatord.c) target_link_libraries(owlps-aggregatord libowlps.so ${EXTRA_LIBS}) +install( + TARGETS owlps-aggregatord + DESTINATION bin) add_executable(owlps-aggregatord.semistatic EXCLUDE_FROM_ALL owlps-aggregatord.c) diff --git a/owlps-client/CMakeLists.txt b/owlps-client/CMakeLists.txt index b165ec4..2bb1ecd 100644 --- a/owlps-client/CMakeLists.txt +++ b/owlps-client/CMakeLists.txt @@ -19,6 +19,9 @@ if (OWLPS_CLIENT_RECEIVES_POSITION) target_link_libraries(owlps-client libowlps-resultreader.so) endif() +install( + TARGETS owlps-client + DESTINATION bin) add_executable(owlps-client.semistatic EXCLUDE_FROM_ALL owlps-client.c) diff --git a/owlps-listener/CMakeLists.txt b/owlps-listener/CMakeLists.txt index 2f8bb54..0dca3f4 100644 --- a/owlps-listener/CMakeLists.txt +++ b/owlps-listener/CMakeLists.txt @@ -37,6 +37,9 @@ target_link_libraries(owlps-listenerd libowlps.so libowlps-client.so ${EXTRA_LIBS}) +install( + TARGETS owlps-listenerd + DESTINATION bin) add_executable(owlps-listenerd.semistatic EXCLUDE_FROM_ALL owlps-listenerd.c) diff --git a/owlps-positioner/CMakeLists.txt b/owlps-positioner/CMakeLists.txt index 9c0bb3e..64fc70c 100644 --- a/owlps-positioner/CMakeLists.txt +++ b/owlps-positioner/CMakeLists.txt @@ -67,6 +67,9 @@ add_executable(owlps-positionerd target_link_libraries(owlps-positionerd libowlps.so ${EXTRA_LIBS}) +install( + TARGETS owlps-positionerd + DESTINATION bin) add_executable(owlps-positionerd.semistatic EXCLUDE_FROM_ALL ${OWLPS_POSITIONER_SRC_FILES}) diff --git a/owlps-udp-to-http/CMakeLists.txt b/owlps-udp-to-http/CMakeLists.txt index 1e1ea3a..5b45d7e 100644 --- a/owlps-udp-to-http/CMakeLists.txt +++ b/owlps-udp-to-http/CMakeLists.txt @@ -5,6 +5,9 @@ target_link_libraries(owlps-udp-to-http libowlps.so libowlps-resultreader.so ${EXTRA_LIBS}) +install( + TARGETS owlps-udp-to-http + DESTINATION bin) add_executable(owlps-udp-to-http.semistatic EXCLUDE_FROM_ALL owlps-udp-to-http.c)