From 593170c453c3ea75a92ab8066003029f3396bd50 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Wed, 24 May 2017 17:35:53 +0200
Subject: Cmake WIP

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

# Conflicts:
#	CAN-binder/conf.d/default
---
 CAN-binder/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CAN-binder/CMakeLists.txt')

diff --git a/CAN-binder/CMakeLists.txt b/CAN-binder/CMakeLists.txt
index c1dd040a..5fbeb193 100644
--- a/CAN-binder/CMakeLists.txt
+++ b/CAN-binder/CMakeLists.txt
@@ -19,7 +19,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/config.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/app-templates/cmake/macros.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/default/cmake/common.cmake)
 
 # Bindings to compile
 # --------------------
-- 
cgit 1.2.3-korg