Add Travis apps build to stage 2

MRPT · Mar 27, 2018 · d5c0d67 · d5c0d67
1 parent 9013eb4
commit d5c0d67
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ env:
 
 jobs:
   include:
-    - stage: Core Build Stage 1
+    - stage: Build Stage 1
       env: STAGE=1 TASK="build" DEPS="full" BUILD_TARGET="mrpt-hmtslam"
       compiler: gcc
     - env: STAGE=1 TASK="build" DEPS="full" BUILD_TARGET="mrpt-hmtslam"
@@ -29,23 +29,30 @@ jobs:
       compiler: gcc
     - env: STAGE=1 TASK="build" DEPS="minimal" BUILD_TARGET="mrpt-hmtslam"
       compiler: gcc
-    - stage: Core Build Examples
-      env: STAGE=2 TASK="build" DEPS="full" BUILD_TARGET="examples"
+    - stage: Tests, Examples, apps
+      env: STAGE=2 TASK="test" DEPS="full"
+      compiler: gcc
+    - env: STAGE=2 TASK="test" DEPS="full"
+      compiler: clang
+    - env: STAGE=2 TASK="test" DEPS="headless"
+      compiler: gcc
+    - env: STAGE=2 TASK="test" DEPS="minimal"
+      compiler: gcc
+    - env: STAGE=2 TASK="build" DEPS="full" BUILD_TARGET="examples"
       compiler: gcc
     - env: STAGE=2 TASK="build" DEPS="full" BUILD_TARGET="examples"
       compiler: clang
     - env: STAGE=2 TASK="build" DEPS="headless" BUILD_TARGET="examples"
       compiler: gcc
     - env: STAGE=2 TASK="build" DEPS="minimal" BUILD_TARGET="examples"
       compiler: gcc
-    - stage: Core Build Tests Examples
-      env: STAGE=2 TASK="test" DEPS="full"
+    - env: STAGE=2 TASK="build" DEPS="full" BUILD_TARGET="apps"
       compiler: gcc
-    - env: STAGE=2 TASK="test" DEPS="full"
+    - env: STAGE=2 TASK="build" DEPS="full" BUILD_TARGET="apps"
       compiler: clang
-    - env: STAGE=2 TASK="test" DEPS="headless"
+    - env: STAGE=2 TASK="build" DEPS="headless" BUILD_TARGET="apps"
       compiler: gcc
-    - env: STAGE=2 TASK="test" DEPS="minimal"
+    - env: STAGE=2 TASK="build" DEPS="minimal" BUILD_TARGET="apps"
       compiler: gcc
     - stage: Extended Builds and Tests
       language: python

diff --git a/cmakemodules/DeclareAppDependencies.cmake b/cmakemodules/DeclareAppDependencies.cmake
@@ -1,9 +1,13 @@
 # Declares the dependencies of an application:
 # Usage: DeclareAppDependencies( appTargetName [mrpt-xxx [mrpt-yyy] ...] )
 #
+add_custom_target(apps ALL)
+
 macro(DeclareAppDependencies name)
+	add_dependencies(apps ${name})
+
 	# Set app names:
-		set_target_properties(${name} PROPERTIES FOLDER "applications")
+	set_target_properties(${name} PROPERTIES FOLDER "applications")
 
 	# set deps:
 	set(ALL_DEPS "")