Deprecate cmake variables not useful

Mechanism to build 3rdparty external libs isn't unique
and should not be handled by app-templates

Change-Id: Ib8a030184820da6577fa37f74331aaf7d6155916
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/conf.d/app-templates b/conf.d/app-templates
index c881d86..dc4debf 160000 (submodule)
--- a/conf.d/app-templates
+++ b/conf.d/app-templates
@@ -1 +1 @@
-Subproject commit c881d86fc8852a2b2215856d3503aba192c0f4ee
+Subproject commit dc4debf13f6653163ea969ec57945edd9545c748

diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 4e2449c..8547d0a 100644 (file)
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -32,13 +32,6 @@ set(PROJECT_LANGUAGES,"C CXX")
 # relative to the root project directory
 set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
 
-# Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
-# but used and must be built and linked.
-# set(PROJECT_LIBDIR "libs")
-
-# Where are stored data for your application. Pictures, static resources must be placed in that folder.
-# set(PROJECT_RESOURCES "data")
-
 # Which directories inspect to find CMakeLists.txt target files
 # set(PROJECT_SRC_DIR_PATTERN "*")
 

diff --git a/libs/openxc-message-format/CMakeLists.txt b/libs/openxc-message-format/CMakeLists.txt
index f6964e8..31020b1 100644 (file)
--- a/libs/openxc-message-format/CMakeLists.txt
+++ b/libs/openxc-message-format/CMakeLists.txt
@@ -23,9 +23,9 @@ PROJECT_TARGET_ADD(openxc-message-format)
        # Define project Target
        add_library(${TARGET_NAME} STATIC 
                gen/cpp/openxc.pb.c
-               ${PROJECT_LIBDIR}/nanopb/pb_encode.c
-               ${PROJECT_LIBDIR}/nanopb/pb_decode.c
-               ${PROJECT_LIBDIR}/nanopb/pb_common.c)
+               ${CMAKE_CURRENT_SOURCE_DIR}/../nanopb/pb_encode.c
+               ${CMAKE_CURRENT_SOURCE_DIR}/../nanopb/pb_decode.c
+               ${CMAKE_CURRENT_SOURCE_DIR}/../nanopb/pb_common.c)
 
        # Binder exposes a unique public entry point
        SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES