[Issue JdeRobot#485] Updates files according to master branch

lr-morales · Jul 30, 2016 · 0c30d52 · 0c30d52
1 parent bae96bd
commit 0c30d52
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2,518 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -180,17 +180,15 @@ list_subdirectories2( LIST_TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/ 1)
 FOREACH (currentBin ${LIST_DRIVERS})
     if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/${currentBin}/${currentBin})
         INSTALL (PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/${currentBin}/${currentBin} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin OPTIONAL COMPONENT core)
-    endif()
-    if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/src/drivers/${currentBin}/${currentBin})
+    else()
         INSTALL (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/drivers/${currentBin}/${currentBin} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin OPTIONAL COMPONENT core)
     endif()
 ENDFOREACH(currentBin)
 
 FOREACH (currentBin ${LIST_TOOLS})
     if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/${currentBin}/${currentBin})
         INSTALL (PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/src/toolss/${currentBin}/${currentBin} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin OPTIONAL COMPONENT core)
-    endif()
-    if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/src/tools/${currentBin}/${currentBin})
+    else()
         INSTALL (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/tools/${currentBin}/${currentBin} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin OPTIONAL COMPONENT core)
     endif()
 ENDFOREACH(currentBin)
@@ -272,8 +270,8 @@ SET (CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
 
 # CPack version numbers for release tarball name.
 SET (CPACK_PACKAGE_VERSION_MAJOR 5)
-SET (CPACK_PACKAGE_VERSION_MINOR 3)
-SET (CPACK_PACKAGE_VERSION_PATCH 3)
+SET (CPACK_PACKAGE_VERSION_MINOR 4)
+SET (CPACK_PACKAGE_VERSION_PATCH 0)
 SET (CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})