Full cmake build in progress (to be completed!)

3 files changed, 30 insertions, 175 deletions

diff --git a/api/map-viewer/CMakeLists.txt b/api/map-viewer/CMakeLists.txt
index 7f93d58..a45dbbf 100644
--- a/api/map-viewer/CMakeLists.txt
+++ b/api/map-viewer/CMakeLists.txt
@@ -23,55 +23,17 @@ message(STATUS "generation of DBus files for map-viewer")
 find_program(XSLTPROC xsltproc REQUIRED)
 find_program(DBUSXML2CPP dbusxx-xml2cpp REQUIRED)
 
-set(cmake_create_dir cmake -E make_directory)
-
-set(API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-execute_process(
-	WORKING_DIRECTORY ${API_DIR}
-        COMMAND ${cmake_create_dir} include
-)
-
-set(TARGET_GENERATED_API_DIR ${API_DIR}/include)
-
-file (GLOB XML_TO_DBUS_PROXY 
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-mapviewer-configuration.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-mapviewer-mapviewercontrol.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-mapviewer-session.xml
-)
-foreach (RAW_FILE ${XML_TO_DBUS_PROXY})
-	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
-		execute_process(
-			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
-			execute_process(
-				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
-			)
-		endif()
-	endif()
-endforeach()
-
-file (GLOB XML_TO_DBUS_ADAPTOR
+file (GLOB XML_TO_DBUS 
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-mapviewer-configuration.xml
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-mapviewer-mapviewercontrol.xml
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-mapviewer-session.xml
 )
-foreach (RAW_FILE ${XML_TO_DBUS_ADAPTOR})
+foreach (RAW_FILE ${XML_TO_DBUS})
 	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
-		execute_process(
-			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
-			execute_process(
-				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
-			)
-		endif()
-	endif()
+	execute_process(
+		COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${CMAKE_CURRENT_BINARY_DIR}/${FILE}_proxy.h  
+		COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${CMAKE_CURRENT_BINARY_DIR}/${FILE}_adaptor.h  
+	)
 endforeach()
 
 file (GLOB XML_TO_DBUS_CONSTANT
@@ -79,17 +41,8 @@ file (GLOB XML_TO_DBUS_CONSTANT
 )
 foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT})
 	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
-		execute_process(
-			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-			COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
-			execute_process(
-				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-				COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
-			)
-		endif()
-	endif()
+	execute_process(
+		OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h
+		COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
+	)
 endforeach()
diff --git a/api/navigation-core/CMakeLists.txt b/api/navigation-core/CMakeLists.txt
index 5b8ac55..694b17d 100644
--- a/api/navigation-core/CMakeLists.txt
+++ b/api/navigation-core/CMakeLists.txt
@@ -23,41 +23,7 @@ message(STATUS "generation of DBus files for navigation-core")
 find_program(XSLTPROC xsltproc REQUIRED)
 find_program(DBUSXML2CPP dbusxx-xml2cpp REQUIRED)
 
-set(cmake_create_dir cmake -E make_directory)
-
-set(API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-execute_process(
-	WORKING_DIRECTORY ${API_DIR}
-        COMMAND ${cmake_create_dir} include
-)
-
-set(TARGET_GENERATED_API_DIR ${API_DIR}/include)
-
-file (GLOB XML_TO_DBUS_PROXY 
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-configuration.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-guidance.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-locationinput.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-mapmatchedposition.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-routing.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-session.xml
-)
-foreach (RAW_FILE ${XML_TO_DBUS_PROXY})
-	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
-		execute_process(
-			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
-			execute_process(
-				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
-			)
-		endif()
-	endif()
-endforeach()
-
-file (GLOB XML_TO_DBUS_ADAPTOR
+file (GLOB XML_TO_DBUS 
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-configuration.xml
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-guidance.xml
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-locationinput.xml
@@ -65,19 +31,12 @@ file (GLOB XML_TO_DBUS_ADAPTOR
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-routing.xml
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-navigationcore-session.xml
 )
-foreach (RAW_FILE ${XML_TO_DBUS_ADAPTOR})
+foreach (RAW_FILE ${XML_TO_DBUS})
 	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
-		execute_process(
-			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
-			execute_process(
-				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
-			)
-		endif()
-	endif()
+	execute_process(
+		COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${CMAKE_CURRENT_BINARY_DIR}/${FILE}_proxy.h  
+		COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${CMAKE_CURRENT_BINARY_DIR}/${FILE}_adaptor.h  
+	)
 endforeach()
 
 file (GLOB XML_TO_DBUS_CONSTANT
@@ -85,17 +44,8 @@ file (GLOB XML_TO_DBUS_CONSTANT
 )
 foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT})
 	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
-		execute_process(
-			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-			COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
-			execute_process(
-				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-				COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
-			)
-		endif()
-	endif()
+	execute_process(
+		OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h
+		COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
+	)
 endforeach()
diff --git a/api/poi-service/CMakeLists.txt b/api/poi-service/CMakeLists.txt
index a631dde..12c93e8 100644
--- a/api/poi-service/CMakeLists.txt
+++ b/api/poi-service/CMakeLists.txt
@@ -23,57 +23,18 @@ message(STATUS "generation of DBus files for poi-service")
 find_program(XSLTPROC xsltproc REQUIRED)
 find_program(DBUSXML2CPP dbusxx-xml2cpp REQUIRED)
 
-set(cmake_create_dir cmake -E make_directory)
-
-set(API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-execute_process(
-	WORKING_DIRECTORY ${API_DIR}
-        COMMAND ${cmake_create_dir} include
-)
-
-set(TARGET_GENERATED_API_DIR ${API_DIR}/include)
-
-file (GLOB XML_TO_DBUS_PROXY 
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-poiservice-contentaccessmodule.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-poiservice-poicontentaccess.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-poiservice-poisearch.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-poiservice-configuration.xml
-)
-foreach (RAW_FILE ${XML_TO_DBUS_PROXY})
-	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
-		execute_process(
-			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
-			execute_process(
-				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
-			)
-		endif()
-	endif()
-endforeach()
-
-file (GLOB XML_TO_DBUS_ADAPTOR
+file (GLOB XML_TO_DBUS 
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-poiservice-contentaccessmodule.xml
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-poiservice-poicontentaccess.xml
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-poiservice-poisearch.xml
 	${CMAKE_CURRENT_SOURCE_DIR}/genivi-poiservice-configuration.xml
 )
-foreach (RAW_FILE ${XML_TO_DBUS_ADAPTOR})
+foreach (RAW_FILE ${XML_TO_DBUS})
 	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
-		execute_process(
-			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
-			execute_process(
-				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
-			)
-		endif()
-	endif()
+	execute_process(
+		COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${CMAKE_CURRENT_BINARY_DIR}/${FILE}_proxy.h  
+		COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${CMAKE_CURRENT_BINARY_DIR}/${FILE}_adaptor.h  
+	)
 endforeach()
 
 file (GLOB XML_TO_DBUS_CONSTANT
@@ -81,17 +42,8 @@ file (GLOB XML_TO_DBUS_CONSTANT
 )
 foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT})
 	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
-		execute_process(
-			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-			COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
-			execute_process(
-				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-				COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
-			)
-		endif()
-	endif()
+	execute_process(
+		OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h
+		COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
+	)
 endforeach()