fix some minor errors in CMakeLists for Wamp generation

6 files changed, 55 insertions, 4 deletions

diff --git a/api/franca/.gitignore b/api/franca/.gitignore
new file mode 100644
index 0000000..26f4b86
--- /dev/null
+++ b/api/franca/.gitignore
@@ -0,0 +1,2 @@
+*.project
+/build
diff --git a/api/franca/CMakeLists.txt b/api/franca/CMakeLists.txt
new file mode 100644
index 0000000..27c5eec
--- /dev/null
+++ b/api/franca/CMakeLists.txt
@@ -0,0 +1,47 @@
+###########################################################################
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# Component Name: whole franca generation
+#
+# Author: Philippe Colliot
+#
+# Copyright (C) 2015, PCA Peugeot Citroen 
+# 
+# Note:
+# The current file is an adaptation of the example file
+# http://git.projects.genivi.org/?p=ipc/common-api-tools.git;a=blob;f=CommonAPI-Examples/E01HelloWorld/CMakeLists.txt
+#
+# License:
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# @licence end@
+###########################################################################
+
+cmake_minimum_required (VERSION 2.8.1)
+
+project(whole-franca)
+
+option(COMMONAPI_TOOL_GENERATOR
+       "Absolute path to CommonAPI code generator" "")
+option(COMMONAPI_DBUS_TOOL_GENERATOR
+       "Absolute path to CommonAPI-DBus code generator" "")
+option(COMMONAPI_WAMP_TOOL_GENERATOR
+       "Absolute path to CommonAPI-Wamp code generator" "")
+option(WITH_WAMP_GENERATION
+      "Generate Wamp files" OFF)
+
+get_directory_property(hasParent PARENT_DIRECTORY)
+
+if(hasParent) 
+    set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE)
+else()
+    set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen")
+endif()
+
+add_subdirectory(enhancedpositionservice)
+add_subdirectory(gnssservice)
+add_subdirectory(sensorsservice)
+
diff --git a/api/franca/gnssservice/CMakeLists.txt b/api/franca/gnssservice/CMakeLists.txt
index 9c9dffc..02a9caa 100644
--- a/api/franca/gnssservice/CMakeLists.txt
+++ b/api/franca/gnssservice/CMakeLists.txt
@@ -38,8 +38,8 @@ option(COMMONAPI_DBUS_TOOL_GENERATOR
        "Absolute path to CommonAPI-DBus code generator" "")
 option(COMMONAPI_WAMP_TOOL_GENERATOR
        "Absolute path to CommonAPI-Wamp code generator" "")
-option(WAMP_GENERATION
-       "Generate Wamp files" OFF)
+option(WITH_WAMP_GENERATION
+      "Generate Wamp files" OFF)
 
 set(COMMONAPI_FIDL_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
diff --git a/api/franca/sensorsservice/CMakeLists.txt b/api/franca/sensorsservice/CMakeLists.txt
index 8cd3aaa..2db8364 100644
--- a/api/franca/sensorsservice/CMakeLists.txt
+++ b/api/franca/sensorsservice/CMakeLists.txt
@@ -38,7 +38,7 @@ option(COMMONAPI_DBUS_TOOL_GENERATOR
        "Absolute path to CommonAPI-DBus code generator" "")
 option(COMMONAPI_WAMP_TOOL_GENERATOR
        "Absolute path to CommonAPI-Wamp code generator" "")
-option(WAMP_GENERATION
+option(WITH_WAMP_GENERATION
        "Generate Wamp files" OFF)
 
 set(COMMONAPI_FIDL_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
diff --git a/enhanced-position-service/franca/enhp-wamp/.gitignore b/enhanced-position-service/franca/enhp-wamp/.gitignore
index 5a59f21..aa2dd01 100644
--- a/enhanced-position-service/franca/enhp-wamp/.gitignore
+++ b/enhanced-position-service/franca/enhp-wamp/.gitignore
@@ -1,3 +1,5 @@
 /build
 /bin
+.cproject
+.project
 
diff --git a/enhanced-position-service/franca/enhp-wamp/CMakeLists.txt b/enhanced-position-service/franca/enhp-wamp/CMakeLists.txt
index fc960a9..3399a59 100644
--- a/enhanced-position-service/franca/enhp-wamp/CMakeLists.txt
+++ b/enhanced-position-service/franca/enhp-wamp/CMakeLists.txt
@@ -23,7 +23,7 @@ set(PROJECT_NAME_LIBRARY ${PROJECT_NAME}-wamp)
 
 message(STATUS ${PROJECT_NAME})
 
-option(WAMP_GENERATION
+option(WITH_WAMP_GENERATION
        "Generate Wamp files" ON)
 
 set(CMAKE_VERBOSE_MAKEFILE on)