Upgrade CMake once again using reference submodule from app-templates

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

5 files changed, 4 insertions, 266 deletions

diff --git a/CAN-binder/CMakeLists.txt b/CAN-binder/CMakeLists.txt
index 38ac158f..c1dd040a 100644
--- a/CAN-binder/CMakeLists.txt
+++ b/CAN-binder/CMakeLists.txt
@@ -18,8 +18,8 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/etc/config.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/etc/macros.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/config.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/app-templates/cmake/macros.cmake)
 
 # Bindings to compile
 # --------------------
diff --git a/CAN-binder/conf.d/app-templates b/CAN-binder/conf.d/app-templates
new file mode 160000
+Subproject c6315b89558170864a04e9b56bcde72f4902d4c
diff --git a/CAN-binder/etc/config.cmake b/CAN-binder/conf.d/config.cmake
index cd1830d1..70732d4f 100644
--- a/CAN-binder/etc/config.cmake
+++ b/CAN-binder/conf.d/config.cmake
@@ -18,7 +18,7 @@
 
 # Project Info
 # ------------------
-set(NAME low-can-project)
+set(PROJECT_NAME low-can-project)
 set(VERSION "1.0")
 set(PROJECT_PRETTY_NAME "Low level CAN binding")
 set(PROJECT_DESCRIPTION "Expose CAN Low Level APIs through AGL Framework")
@@ -84,3 +84,4 @@ set(BINDINGS_INSTALL_PREFIX /opt )
 # Optional force binding Linking flag
 # ------------------------------------
 # set(BINDINGS_LINK_FLAG LinkOptions )
+
diff --git a/CAN-binder/etc/export.map b/CAN-binder/etc/export.map
deleted file mode 100644
index ee2f4133..00000000
--- a/CAN-binder/etc/export.map
+++ /dev/null
@@ -1 +0,0 @@
-{ global: afbBindingV*; local: *; };
diff --git a/CAN-binder/etc/macros.cmake b/CAN-binder/etc/macros.cmake
deleted file mode 100644
index 8eed237e..00000000
--- a/CAN-binder/etc/macros.cmake
+++ /dev/null
@@ -1,262 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-# contrib: 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.
-###########################################################################
-
-
-#--------------------------------------------------------------------------
-#  WARNING:
-#     Do not change this cmake template
-#     Customise your preferences in "./etc/config.cmake"
-#--------------------------------------------------------------------------
-
-
-# Generic useful macro
-# -----------------------
-macro(PROJECT_TARGET_ADD TARGET_NAME)
-	set_property( GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME})
-	set(TARGET_NAME ${TARGET_NAME})
-endmacro(PROJECT_TARGET_ADD)
-
-# Check GCC minimal version version
-if (gcc_minimal_version)
-   message ("-- Check gcc_minimal_version (found gcc version ${CMAKE_C_COMPILER_VERSION})  (found g++ version ${CMAKE_CXX_COMPILER_VERSION})")
-if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${gcc_minimal_version} OR CMAKE_C_COMPILER_VERSION VERSION_LESS ${gcc_minimal_version})
-    message(FATAL_ERROR "**** FATAL: Require at least gcc-${gcc_minimal_version} please set CMAKE_C[XX]_COMPILER")
-endif()
-endif(gcc_minimal_version)
-
-macro(defstr name value)
-	add_definitions(-D${name}=${value})
-endmacro(defstr)
-
-# WGT packaging
-macro(project_targets_populate)
-	add_custom_target(MAIN_POPULATE)
-	get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
-	foreach(TARGET ${PROJECT_TARGETS})
-		get_target_property(T ${TARGET} LABELS)
-		if(T)
-			# Declaration of a custom command that will populate widget tree with the target
-			set(POPULE_WIDGET_TARGET "project_populate_${TARGET}")
-
-			get_target_property(P ${TARGET} PREFIX)
-			get_target_property(BD ${TARGET} BINARY_DIR)
-			get_target_property(OUT ${TARGET} OUTPUT_NAME)
-
-			if(P MATCHES "NOTFOUND$")
-				if (${T} STREQUAL "BINDING")
-					set(P "lib")
-				else()
-					set(P "")
-				endif()
-			endif()
-
-			if(${T} STREQUAL "BINDING")
-				add_custom_command(OUTPUT ${WIDGET_LIBDIR}/${P}${TARGET}.so
-					DEPENDS ${TARGET}
-					COMMAND mkdir -p ${WIDGET_LIBDIR}
-					COMMAND cp ${BD}/${P}${OUT}.so ${WIDGET_LIBDIR}
-				)
-				add_custom_target(${POPULE_WIDGET_TARGET} DEPENDS ${WIDGET_LIBDIR}/${P}${TARGET}.so)
-				add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET})
-			elseif(${T} STREQUAL "EXECUTABLE")
-				add_custom_command(OUTPUT ${WIDGET_BINDIR}/${P}${TARGET}
-					DEPENDS ${TARGET}
-					COMMAND mkdir -p ${WIDGET_BINDIR}
-					COMMAND cp ${BD}/${P}${OUT} ${WIDGET_BINDIR}
-				)
-				add_custom_target(${POPULE_WIDGET_TARGET} DEPENDS ${WIDGET_BINDIR}/${P}${TARGET})
-				add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET})
-			elseif(${T} STREQUAL "HTDOCS")
-				add_custom_command(OUTPUT ${WIDGET_HTTPDIR}
-					DEPENDS ${TARGET}
-					COMMAND cp -r ${BD}/${P}${OUT} ${WIDGET_HTTPDIR}
-					)
-					add_custom_target(${POPULE_WIDGET_TARGET} DEPENDS ${WIDGET_HTTPDIR})
-					add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET})
-			elseif(${T} STREQUAL "DATA")
-				add_custom_command(OUTPUT ${WIDGET_DATADIR}
-					DEPENDS ${TARGET}
-					COMMAND cp -r ${BD}/${P}${OUT} ${WIDGET_DATADIR}
-					)
-					add_custom_target(${POPULE_WIDGET_TARGET} DEPENDS ${WIDGET_HTTPDIR})
-					add_dependencies(MAIN_POPULATE ${POPULE_WIDGET_TARGET})
-			endif(${T} STREQUAL "BINDING")
-#		elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")
-#					MESSAGE(WARNING "This target, ${TARGET}, will be not be included in the package.")
-		endif()
-	endforeach()
-endmacro(project_targets_populate)
-
-macro(project_package_build)
-		if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_WGT_DIR}/config.xml.in OR NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_WGT_DIR}/${PROJECT_ICON}.in)
-			MESSAGE(FATAL_ERROR "Missing mandatory files: you need config.xml.in and ${PROJECT_ICON}.in files in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_WGT_DIR} folder.")
-		endif()
-
-		if(NOT EXISTS ${WIDGET_DIR}/config.xml.in OR NOT EXISTS ${WIDGET_DIR}/${PROJECT_ICON}.in)
-			configure_file(${PROJECT_WGT_DIR}/config.xml.in ${WIDGET_DIR}/config.xml)
-			file(COPY ${PROJECT_WGT_DIR}/${PROJECT_ICON}.in DESTINATION ${WIDGET_DIR}/${PROJECT_ICON})
-		endif(NOT EXISTS ${WIDGET_DIR}/config.xml.in OR NOT EXISTS ${WIDGET_DIR}/${PROJECT_ICON}.in)
-
-		file(GLOB PROJECT_CONF_FILES "${PROJECT_WGT_DIR}/etc/*")
-		if(${PROJECT_CONF_FILES})
-			file(COPY "${PROJECT_WGT_DIR}/etc/*" DESTINATION ${WIDGET_ETCDIR}/)
-		endif(${PROJECT_CONF_FILES})
-
-		add_custom_command(OUTPUT ${PROJECT_NAME}.wgt
-			DEPENDS ${PROJECT_TARGETS}
-			COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt ${WIDGET_DIR}
-		)
-		
-		add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt)
-		add_dependencies(widget MAIN_POPULATE)
-		set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.wgt")
-
-		if(WIDGET_MESSAGE)
-		add_custom_command(TARGET widget
-			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${WIDGET_MESSAGE}")
-		endif()
-endmacro(project_package_build)
-
-macro(project_subdirs_add)
-	if(${ARGV0})
-		file(GLOB filelist "${ARGV0}")
-	else()
-		file(GLOB filelist "*")
-	endif(${ARGV0})
-
-	foreach(filename ${filelist})
-		if(EXISTS "${filename}/CMakeLists.txt")
-			add_subdirectory(${filename})
-		endif(EXISTS "${filename}/CMakeLists.txt")
-	endforeach()
-endmacro(project_subdirs_add)
-
-set(CMAKE_BUILD_TYPE Debug CACHE STRING "the type of build")
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMP0048 1)
-
-# Include project configuration
-# ------------------------------
-project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES})
-set(PROJECT_WGT_DIR "packaging/wgt" CACHE PATH "Subpath to the widget directory")
-set(PROJECT_LIBDIR "libs" CACHE PATH "Subpath to libraries")
-set(PROJECT_RESOURCES "data" CACHE PATH "Subpath to data")
-
-INCLUDE(FindPkgConfig)
-INCLUDE(CheckIncludeFiles)
-INCLUDE(CheckLibraryExists)
-INCLUDE(GNUInstallDirs)
-
-# Default compilation options
-############################################################################
-link_libraries(-Wl,--as-needed -Wl,--gc-sections)
-add_compile_options(-Wall -Wextra -Wconversion)
-add_compile_options(-Wno-unused-parameter) # frankly not using a parameter does it care?
-add_compile_options(-Wno-sign-compare -Wno-sign-conversion)
-add_compile_options(-Werror=maybe-uninitialized)
-add_compile_options(-Werror=implicit-function-declaration)
-add_compile_options(-ffunction-sections -fdata-sections)
-add_compile_options(-fPIC)
-add_compile_options(-g)
-
-set(CMAKE_C_FLAGS_PROFILING   "-g -O2 -pg -Wp,-U_FORTIFY_SOURCE" CACHE STRING "Flags for profiling")
-set(CMAKE_C_FLAGS_DEBUG       "-g -O2 -ggdb -Wp,-U_FORTIFY_SOURCE" CACHE STRING "Flags for debugging")
-set(CMAKE_C_FLAGS_RELEASE     "-O2" CACHE STRING "Flags for releasing")
-set(CMAKE_C_FLAGS_CCOV        "-g -O2 --coverage" CACHE STRING "Flags for coverage test")
-
-set(CMAKE_CXX_FLAGS_PROFILING    "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
-set(CMAKE_CXX_FLAGS_DEBUG        "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
-set(CMAKE_CXX_FLAGS_RELEASE      "-g -O2")
-set(CMAKE_CXX_FLAGS_CCOV "-g -O2 --coverage")
-
-set(CMAKE_INSTALL_PREFIX      "${CMAKE_SOURCE_DIR}/Install" CACHE PATH "The path where to install")
-
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable]
-set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON CACHE BOOLEAN "Flag for using prefix path")
-
-# Loop on required package and add options
-foreach (PKG_CONFIG ${PKG_REQUIRED_LIST})
-	PKG_CHECK_MODULES(${PKG_CONFIG} REQUIRED ${PKG_CONFIG})
-
-	INCLUDE_DIRECTORIES(${${PKG_CONFIG}_INCLUDE_DIRS})
-	list (APPEND link_libraries ${${PKG_CONFIG}_LIBRARIES})
-	add_compile_options (${${PKG_CONFIG}_CFLAGS})
-endforeach(PKG_CONFIG)
-
-# Optional LibEfence Malloc debug library
-IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
-CHECK_LIBRARY_EXISTS(efence malloc "" HAVE_LIBEFENCE)
-IF(HAVE_LIBEFENCE)
-	MESSAGE(STATUS "Linking with ElectricFence for debugging purposes...")
-	SET(libefence_LIBRARIES "-lefence")
-	list (APPEND link_libraries ${libefence_LIBRARIES})
-ENDIF(HAVE_LIBEFENCE)
-ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)
-
-# set default include directories
-INCLUDE_DIRECTORIES(${EXTRA_INCLUDE_DIRS})
-
-# If no install dir try to guess some smart default
-if(BINDINGS_INSTALL_PREFIX)
-	set(BINDINGS_INSTALL_DIR ${BINDINGS_INSTALL_PREFIX}/${PROJECT_NAME})
-else()
-	set(BINDINGS_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME})
-endif()
-
-# Define a default package directory
-if(WIDGET_PREFIX)
-	set(WIDGET_DIR ${WIDGET_PREFIX}/package)
-else()
-	set(WIDGET_DIR ${CMAKE_CURRENT_BINARY_DIR}/package)
-endif()
-
-# and their subsequent subdir
-set(WIDGET_BINDIR ${WIDGET_DIR}/bin)
-set(WIDGET_ETCDIR ${WIDGET_DIR}/etc)
-set(WIDGET_LIBDIR ${WIDGET_DIR}/lib)
-set(WIDGET_HTTPDIR ${WIDGET_DIR}/htdocs)
-set(WIDGET_DATADIR ${WIDGET_DIR}/data)
-
-# Default Linkflag
-if(NOT BINDINGS_LINK_FLAG)
-	set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/etc/export.map")
-endif()
-
-# Add a dummy target to enable global dependency order
-# -----------------------------------------------------
-if(EXTRA_DEPENDENCIES_ORDER)
-	set(DEPENDENCIES_TARGET ${PROJECT_NAME}_extra_dependencies)
-	add_custom_target(${DEPENDENCIES_TARGET} ALL
-		DEPENDS ${EXTRA_DEPENDENCY_ORDER}
-	)
-endif()
-
-# Print developer helper message when build is done
-# -------------------------------------------------------
-macro(project_closing_msg)
-	get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
-	if(CLOSING_MESSAGE AND PROJECT_TARGETS)
-		add_custom_target(${PROJECT_NAME}_build_done ALL
-			COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
-		)
-		 add_dependencies(${PROJECT_NAME}_build_done
-		 	${DEPENDENCIES_TARGET}  ${PROJECT_TARGETS})
-	endif()
-endmacro()