diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-05 10:59:12 +0200 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-05 10:59:12 +0200 |
commit | 2b6134b5cf6515ceb096a8d490382642eaf20a9a (patch) | |
tree | 9a08587804215e1f9047bd7d770d7a1da87b7c72 /templates/service | |
parent | a02d416c7e199a58dd75b7ec2a9ca45643ec393b (diff) |
Update CMakeLists files tree and organization
Separation between project CMake file and Target CMake files.
Adding LINK_FLAGS missing for bindings and following sources files rename operations.
Change-Id: I664d20f84fd6a528fb2b057981e3ef9a4243c10d
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'templates/service')
-rw-r--r-- | templates/service/CMakeLists.txt | 15 | ||||
-rw-r--r-- | templates/service/binding/CMakeLists.txt | 37 |
2 files changed, 38 insertions, 14 deletions
diff --git a/templates/service/CMakeLists.txt b/templates/service/CMakeLists.txt index a0faf48..bbdab76 100644 --- a/templates/service/CMakeLists.txt +++ b/templates/service/CMakeLists.txt @@ -21,20 +21,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3) include(${CMAKE_CURRENT_SOURCE_DIR}/etc/config.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/etc/macros.cmake) -# Add target to project dependency list -PROJECT_TARGET_ADD(service-example) - - # Define project Targets - add_library(${TARGET_NAME} MODULE - binding/xxxxxx-service-binding.c - ) - - # Binder exposes a unique public entry point - SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES - PREFIX "" - LABELS "BINDING" - OUTPUT_NAME ${TARGET_NAME}) +project_subdirs_add() project_targets_populate() - project_package_build() diff --git a/templates/service/binding/CMakeLists.txt b/templates/service/binding/CMakeLists.txt new file mode 100644 index 0000000..bd422b5 --- /dev/null +++ b/templates/service/binding/CMakeLists.txt @@ -0,0 +1,37 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Romain Forlot <romain.forlot@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Add target to project dependency list +PROJECT_TARGET_ADD(xxx-service) + + # Define project Targets + add_library(${TARGET_NAME} MODULE + ${TARGET_NAME}-hat.c + ${TARGET_NAME}-cb.c + ) + + # Binder exposes a unique public entry point + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + PREFIX "afs-" + LABELS "BINDING" + LINK_FLAGS ${BINDINGS_LINK_FLAG} + OUTPUT_NAME ${TARGET_NAME}) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} + ${link_libraries})
\ No newline at end of file |