delete useless file

delete useless file

--- cmake/FindCUTI.cmake
+++ cmake/FindCUTI.cmake
@@ -1,169 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2015 k-brac
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy
-#of this software and associated documentation files (the "Software"), to deal
-#in the Software without restriction, including without limitation the rights
-#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#copies of the Software, and to permit persons to whom the Software is
-#furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all
-#copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-#SOFTWARE.
-
-#minimal version for an acceptable XCode integration
-cmake_minimum_required (VERSION 3.2)
-
-#Options to configure cuti's back end and front end
-IF(WIN32 OR APPLE)
-  #Defaulted to cuti front and back end for windows and mac
-  set(CUTI_FRONT_END "CUTI" CACHE STRING "Select cuti's front end")
-  set(CUTI_BACK_END "CUTI" CACHE STRING "Select cuti's back end")
-ELSE()
-  #Defaulted to cppunit front and back end other platforms
-  set(CUTI_FRONT_END "CPPUNIT" CACHE STRING "Select cuti's front end")
-  set(CUTI_BACK_END "CPPUNIT" CACHE STRING "Select cuti's back end")
-ENDIF(WIN32 OR APPLE)
-
-option(CUTI_USE_LONG_MACRO_NAME "Select wether you want to use long macro names" OFF)
-
-set_property(CACHE CUTI_FRONT_END PROPERTY STRINGS "CUTI" "CPPUNIT")
-set_property(CACHE CUTI_BACK_END PROPERTY STRINGS "CUTI" "CPPUNIT")
-
-string(COMPARE EQUAL "${CUTI_FRONT_END}" "CUTI" USE_CUTI_FRONT_END)
-string(COMPARE EQUAL "${CUTI_BACK_END}" "CUTI" USE_CUTI_BACK_END)
-
-set(CUTI_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
-set(CUTI_INCLUDE_DIRS ${CUTI_ROOT_DIR}/include)
-
-get_filename_component(CUTI_INCLUDE ${CUTI_ROOT_DIR}/include/Cuti.h ABSOLUTE)
-
-#this is mandatory. Otherwise XCode crashes
-IF(APPLE)
-  set(MACOSX_BUNDLE_GUI_IDENTIFIER "$(PRODUCT_BUNDLE_IDENTIFIER)")
-ENDIF(APPLE)
-
-function(cuti_xctest_add_bundle target testee)
-  #creates a test bundle ${target} for the testee target
-  #uses ${ARGN} as list of source files for the test target
-  if(NOT XCTest_FOUND)
-    message(FATAL_ERROR "XCTest is required to create a XCTest Bundle.")
-  endif(NOT XCTest_FOUND)
-
-  if(NOT CMAKE_OSX_SYSROOT)
-    message(FATAL_ERROR "Adding XCTest bundles requires CMAKE_OSX_SYSROOT to be set.")
-  endif()
-
-  add_library(${target} MODULE ${ARGN})
-
-  set_target_properties(${target} PROPERTIES
-    BUNDLE TRUE
-    XCTEST TRUE
-    XCTEST_TESTEE ${testee})
-
-  target_link_libraries(${target} PRIVATE "-framework Foundation")
-  target_link_libraries(${target} PRIVATE ${XCTest_LIBRARIES})
-  target_include_directories(${target} PRIVATE ${XCTest_INCLUDE_DIRS})
-
-  # retrieve testee target type
-  if(NOT TARGET ${testee})
-    message(FATAL_ERROR "${testee} is not a target.")
-  endif()
-  get_property(_testee_type TARGET ${testee} PROPERTY TYPE)
-  get_property(_testee_framework TARGET ${testee} PROPERTY FRAMEWORK)
-  get_property(_testee_macosx_bundle TARGET ${testee} PROPERTY MACOSX_BUNDLE)
-
-  if(_testee_type STREQUAL "SHARED_LIBRARY" OR _testee_type STREQUAL "STATIC_LIBRARY" )
-    # testee is a Framework
-    target_link_libraries(${target} PRIVATE ${testee})
-  elseif(_testee_type STREQUAL "EXECUTABLE" AND _testee_macosx_bundle)
-    # testee is an App Bundle
-    add_dependencies(${target} ${testee})
-    if(XCODE)
-      set_target_properties(${target} PROPERTIES
-        XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)"
-        XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:${testee}>")
-    else(XCODE)
-      target_link_libraries(${target}
-        PRIVATE -bundle_loader $<TARGET_FILE:${testee}>)
-    endif(XCODE)
-  else()
-    message(FATAL_ERROR "Testee ${testee} is of unsupported type.")
-  endif()
-endfunction(cuti_xctest_add_bundle)
-
-function(cuti_creates_test_target target testee)
-#creates a test target for the testee target
-#uses ${ARGN} as list of source files for the test target
-
-  if(${USE_CUTI_BACK_END})
-    if(MSVC)
-      find_package(VisualStudio REQUIRED)
-      add_library(${target} SHARED ${ARGN} ${CUTI_INCLUDE} ${CUTI_PLUGIN_SRC})
-      target_include_directories(${target} PRIVATE ${MSVC_UNIT_TEST_DIR}/include)
-      target_compile_definitions(${target} PUBLIC -DCUTI_USES_MSVC_UNIT_BACKEND)
-    elseif(APPLE)
-      #integrate tests to XCode
-      find_package(XCTest REQUIRED)
-      cuti_xctest_add_bundle(${target} ${testee} ${CUTI_SOURCE} ${ARGN} ${CUTI_INCLUDE})
-      target_compile_definitions(${target} PUBLIC -DCUTI_USES_XCTEST_BACKEND)
-      set_source_files_properties(${ARGN} PROPERTIES COMPILE_FLAGS "-x objective-c++")
-    else()
-      message(FATAL_ERROR "There is no cuti backend for the selected platform")
-    endif()
-  else()
-    get_filename_component(CUTI_PLUGIN_SRC ${CUTI_ROOT_DIR}/src/UnitTestPlugin.cpp ABSOLUTE)
-    add_library(${target} SHARED ${ARGN} ${CUTI_INCLUDE} ${CUTI_PLUGIN_SRC})
-    target_compile_definitions(${target} PUBLIC "-DCPPUNIT_PLUGIN_EXPORT=__attribute__ ((visibility (\"default\")))" )
-    cuti_init_cppunit_libraries(${target})
-  endif()
-
-  if(NOT ${testee} STREQUAL "")
-    target_link_libraries(${target} PRIVATE debug ${CUTI_LIBRARIES_DEBUG} ${testee})
-    target_link_libraries(${target} PRIVATE optimized ${CUTI_LIBRARIES_RELEASE} ${testee})
-  endif()
-  target_include_directories(${target} PUBLIC ${CUTI_INCLUDE_DIRS})
-
-  if(${USE_CUTI_BACK_END})
-    if(${USE_CUTI_FRONT_END})
-      target_compile_definitions(${target} PUBLIC -DCUTI_FREE_STANDING)
-    else()
-      target_compile_definitions(${target} PUBLIC -DCUTI_CPPUNIT_COMPATABILITY)
-    endif()
-  else()
-    if(${USE_CUTI_FRONT_END})
-      target_compile_definitions(${target} PUBLIC -DCUTI_UNKNOWN)
-    else()
-      target_compile_definitions(${target} PUBLIC -DCUTI_NO_INTEGRATION)
-    endif()
-  endif()
-
-  if(${CUTI_USE_LONG_MACRO_NAME})
-    target_compile_definitions(${target} PRIVATE -DCUTI_USE_LONG_MACRO_NAME)
-  endif()
-
-endfunction(cuti_creates_test_target)
-
-function(cuti_init_cppunit_libraries target)
-    find_package(CppUnit REQUIRED)
-    #code to automatically declare a cpp unit test plugin
-    target_compile_definitions(${target} PUBLIC -DCUTI_USES_CPPUNIT_BACKEND)
-    target_compile_definitions(${target} PUBLIC -DCPPUNIT_DLL)
-    target_include_directories(${target} PUBLIC ${CPPUNIT_INCLUDE_DIRS})
-    if(WIN32)
-      set(CUTI_LIBRARIES_DEBUG ${CPPUNIT_LIBRARIES_DEBUG} PARENT_SCOPE)
-      set(CUTI_LIBRARIES_RELEASE ${CPPUNIT_LIBRARIES_RELEASE} PARENT_SCOPE)
-    else()
-      set(CUTI_LIBRARIES_DEBUG ${CPPUNIT_DYN_LIB_DEBUG} PARENT_SCOPE)
-      set(CUTI_LIBRARIES_RELEASE ${CPPUNIT_DYN_LIB_RELEASE} PARENT_SCOPE)
-    endif()
-endfunction(cuti_init_cppunit_libraries)


Gcov should be used as fallback for llvm-cov.

--- cmake/FindGcov.cmake
+++ cmake/FindGcov.cmake
@@ -46,7 +46,8 @@
 			# the suggested binary name with the compiler version.
 			string(REGEX MATCH "^[0-9]+.[0-9]+" LLVM_VERSION
 				"${CMAKE_${LANG}_COMPILER_VERSION}")
-			find_program(GCOV_BIN NAMES "llvm-cov-${LLVM_VERSION}" "llvm-cov")
+			find_program(GCOV_BIN NAMES "llvm-cov-${LLVM_VERSION}" "llvm-cov"
+				"gcov")
 			if (GCOV_BIN)
 				# set additional parameters
 				set(GCOV_${CMAKE_${LANG}_COMPILER_ID}_PARAMS "gcov" CACHE


Ogre header PATH_SUFFIXES ammended in FindOgre.cmake as Timotei suggested (thanks!)

--- cmake/FindOgre.cmake
+++ cmake/FindOgre.cmake
@@ -58,20 +58,20 @@
 )

 set(OGRE_PATH_SUFFIXES
-    ${OGRE_PATH_SUFFIXES} include OgreMain/include
+    ${OGRE_PATH_SUFFIXES} include include/OGRE OGRE OgreMain/include OgreMain/include/OGRE
 )

 # Find the Ogre include headers.
 find_path(OGRE_H_PATH
           NAMES Ogre.h
           PATHS ${OGRE_PREFIX_PATH}
-          PATH_SUFFIXES ${OGRE_PATH_SUFFIXES} OGRE)
+          PATH_SUFFIXES ${OGRE_PATH_SUFFIXES})

 # Also find the build settings Ogre header.
 find_path(OGRE_H_BUILD_SETTINGS_PATH
           NAMES OgreBuildSettings.h
           PATHS ${OGRE_PREFIX_PATH}
-          PATH_SUFFIXES ${OGRE_PATH_SUFFIXES} OGRE)
+          PATH_SUFFIXES ${OGRE_PATH_SUFFIXES})

 # Find the release and debug libraries.
 find_library(OGRE_LIB NAMES OgreMain


Bugfix for setup hook.

Bugfix for setup hook.

--- cmake/easytest.cmake
+++ cmake/easytest.cmake
@@ -203,7 +203,7 @@

 	# If a setup hook is defined, call it to set custom variables and reload all
 	# common keys.
-	if (DEFINED easytest_hook_setup)
+	if (COMMAND easytest_hook_setup)
 		easytest_hook_setup(${TEST_TARGET} ${BINARY_TARGET} "${CONFIG}"
 		                    ${MAIN_SOURCE})
 		easytest_get_common_keys(${MAIN_SOURCE})


Update to latest libprimesieve

Update to latest libprimesieve

--- lib/primesieve/cmake/multiarch_popcnt_bmi.cmake
+++ lib/primesieve/cmake/multiarch_popcnt_bmi.cmake
@@ -5,14 +5,20 @@
 set(CMAKE_REQUIRED_INCLUDES "${PROJECT_SOURCE_DIR}/include")

 check_cxx_source_compiles("
-    // We need to ensure this code snippet fails on non x64 CPUs
-    // (and not simply print a compiler warning).
     #if !defined(__x86_64__)
-        Error: not x86-64
+        Error: We need to ensure this code snippet fails on non x64
+               CPUs (and not simply print a compiler warning).
     #endif
     #if defined(__POPCNT__) && defined(__BMI__)
-        Error: multiarch_popcnt_bmi not needed
+        Error: multiarch_popcnt_bmi not needed!
     #endif
+    #if defined(__GNUC__)
+        #if __GNUC__ <= 5
+            Error: The linker does not support function multiversioning
+                   for shared libraries.
+        #endif
+    #endif
+
     #include <primesieve/intrinsics.hpp>
     #include <stdint.h>
     class PrimeGenerator {


remove space from name

remove space from name

--- superbuild/Projects/apple/nuclearRGG.bundle.cmake
+++ superbuild/Projects/apple/nuclearRGG.bundle.cmake
@@ -5,7 +5,7 @@
 include(nuclearRGG.bundle.common)

 #set a root folder inside the package
-set(Package_Folder "RGG Suite ${rgg_version_major}.${rgg_version_minor}.${rgg_version_patch}")
+set(Package_Folder "RGG_Suite_${rgg_version_major}.${rgg_version_minor}.${rgg_version_patch}")

 include(CPack)


ManageTarget: fix output

ManageTarget: fix output

--- Modules/ManageTarget.cmake
+++ Modules/ManageTarget.cmake
@@ -19,7 +19,7 @@
 IF(NOT DEFINED _MANAGE_TARGET_CMAKE_)
     SET(_MANAGE_TARGET_CMAKE_ "DEFINED")
     INCLUDE(ManageVariable)
-    MACRO(ADD_CUSTOM_TARGET_COMMAND target OUTPUT)
+    MACRO(ADD_CUSTOM_TARGET_COMMAND target)
 	SET(_validOptions "OUTPUT" "ALL" "COMMAND")
 	VARIABLE_PARSE_ARGN(_opt _validOptions ${ARGN})
 	IF(DEFINED _opt_ALL)
@@ -32,7 +32,7 @@
 	    COMMAND ${_opt_COMMAND}
 	    )

-	ADD_CUSTOM_COMMAND(OUTPUT ${_opt}
+	ADD_CUSTOM_COMMAND(OUTPUT ${_opt_OUTPUT}
 	    COMMAND ${_opt_COMMAND}
 	    )
     ENDMACRO(ADD_CUSTOM_TARGET_COMMAND)


Installing OIS dependency didn't work on RelWithDebInfo with MingW

--HG--
branch : v1-7

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -90,7 +90,9 @@
 	  endif ()
 	  if (MINGW)
 		install(FILES ${OIS_LIBRARY_DBG} DESTINATION lib/debug CONFIGURATIONS Debug)
+		install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/relwithdebinfo CONFIGURATIONS RelWithDebInfo)
 		install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/release CONFIGURATIONS Release)
+		install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
 	  endif ()
 	elseif(APPLE)
 	  if (EXISTS ${OGRE_DEP_DIR}/lib/debug/libOIS.a)


When the search path is required, search it as rooted and not-rooted.

--- CMake/Modules/FindDirectX.cmake
+++ CMake/Modules/FindDirectX.cmake
@@ -90,7 +90,7 @@
         if (CMAKE_HOST_WIN32)
             set (CMAKE_PREFIX_PATH ${MINGW_SYSROOT})
         endif ()
-        # MinGW does not need search paths as DirectX headers and libraries (when installed) are in its default search path
+        # MinGW does not usually need search paths as DirectX headers and libraries (when installed) are in its default search path
         # However, we do not explicitly unset the DIRECTX_INC_SEARCH_PATHS and DIRECTX_LIB_SEARCH_PATHS variables here, so module user could set these two variables externally when for some reasons the DirectX headers and libraries are not installed in MinGW default search path
     else ()
         set (D3DCOMPILER_NAMES d3dcompiler)
@@ -113,12 +113,12 @@
                 $ENV{DXSDK_DIR}/Lib)
         endif ()
     endif ()
-    find_path (DIRECTX_INCLUDE_DIRS NAMES ${DIRECTX_HEADERS} PATHS ${DIRECTX_INC_SEARCH_PATHS} DOC "DirectX include directory")
+    find_path (DIRECTX_INCLUDE_DIRS NAMES ${DIRECTX_HEADERS} PATHS ${DIRECTX_INC_SEARCH_PATHS} DOC "DirectX include directory" CMAKE_FIND_ROOT_PATH_BOTH)
     if (DIRECTX_INCLUDE_DIRS)
         set (CMAKE_REQUIRED_INCLUDES ${DIRECTX_INCLUDE_DIRS})
         set (DIRECTX_LIBRARY_DIRS)
         set (DIRECT3D_LIBRARIES)
-        find_library (DIRECTX_D3DCOMPILER NAMES ${D3DCOMPILER_NAMES} PATHS ${DIRECTX_LIB_SEARCH_PATHS} DOC "DirectX d3dcompiler library")
+        find_library (DIRECTX_D3DCOMPILER NAMES ${D3DCOMPILER_NAMES} PATHS ${DIRECTX_LIB_SEARCH_PATHS} DOC "DirectX d3dcompiler library" CMAKE_FIND_ROOT_PATH_BOTH)
         if (DIRECTX_D3DCOMPILER)
             get_filename_component (NAME ${DIRECTX_D3DCOMPILER} NAME)
             string (REGEX REPLACE "^.*(d3dcompiler[_0-9]*).*$" \\1 D3DCOMPILER_LIB_NAME ${NAME})
@@ -134,7 +134,7 @@
             foreach (NAME ${D3DCOMPILER_LIB_NAME} ${DIRECT3D_LIB_NAMES})
                 string (REGEX REPLACE _[0-9]+$ "" BASE_NAME ${NAME})
                 string (TOUPPER ${BASE_NAME} UPCASE_NAME)
-                find_library (DIRECTX_${UPCASE_NAME} NAMES ${NAME} PATHS ${DIRECTX_LIB_SEARCH_PATHS} DOC "DirectX ${BASE_NAME} library")
+                find_library (DIRECTX_${UPCASE_NAME} NAMES ${NAME} PATHS ${DIRECTX_LIB_SEARCH_PATHS} DOC "DirectX ${BASE_NAME} library" CMAKE_FIND_ROOT_PATH_BOTH)
                 if (DIRECTX_${UPCASE_NAME})
                     get_filename_component (PATH ${DIRECTX_${UPCASE_NAME}} PATH)
                     list (APPEND DIRECTX_LIBRARY_DIRS ${PATH})      # All the libs should be found in a same place, but just in case


SVN_SILENT made messages (.desktop file)

--- vlc/vlc.desktop.cmake
+++ vlc/vlc.desktop.cmake
@@ -23,6 +23,7 @@
 Name[pa]=VLC
 Name[pt]=VLC
 Name[pt_BR]=VLC
+Name[ru]=VLC
 Name[sr]=ВЛЦ
 Name[sr@ijekavian]=ВЛЦ
 Name[sr@ijekavianlatin]=VLC
@@ -45,6 +46,7 @@
 Comment[pa]=ਫੋਨੋਨ VLC ਬੈਕਐਂਡ
 Comment[pt]=Infra-estrutura do VLC para o Phonon
 Comment[pt_BR]=Infraestrutura do VLC para o Phonon
+Comment[ru]=Механизм VLC для Phonon
 Comment[sr]=ВЛЦ као позадина Фонона
 Comment[sr@ijekavian]=ВЛЦ као позадина Фонона
 Comment[sr@ijekavianlatin]=VLC kao pozadina Phonona


Add new lib/version

Add new lib/version

--- cmake/configs/nuttx_nxphlite-v1_default.cmake
+++ cmake/configs/nuttx_nxphlite-v1_default.cmake
@@ -46,7 +46,7 @@
 # NOT Portable YET drivers/pwm_input
 	drivers/camera_trigger
 	drivers/bst
-	drivers/snapdragon_rc_pwm
+##TO FIT drivers/snapdragon_rc_pwm
 	drivers/lis3mdl
 	drivers/bmp280
 #No External SPI drivers/bma180
@@ -146,6 +146,7 @@
 	lib/terrain_estimation
 	lib/runway_takeoff
 	lib/tailsitter_recovery
+	lib/version
 	lib/DriverFramework/framework
 	platforms/nuttx


Log message when either bfd header or library is not found

--- Libs/Core/CMake/ctkMacroBFDCheck.cmake
+++ Libs/Core/CMake/ctkMacroBFDCheck.cmake
@@ -26,6 +26,9 @@
   IF(NOT WIN32)
     INCLUDE(CheckIncludeFile)
     CHECK_INCLUDE_FILE(bfd.h HAVE_BFD_HEADER)
+    IF(NOT HAVE_BFD_HEADER)
+      FILE(WRITE ${TestBFD_BUILD_LOG} "Could *NOT* find the required header file: bfd.h")
+    ENDIF()

     SET(BFD_LIBRARY_NAME libbfd.a)
     SET(TestBFD_LIBRARY_MODE STATIC)
@@ -35,6 +38,9 @@
     ENDIF()
     UNSET(BFD_LIBRARY CACHE)
     FIND_LIBRARY(BFD_LIBRARY ${BFD_LIBRARY_NAME})
+    IF(NOT BFD_LIBRARY)
+      FILE(WRITE ${TestBFD_BUILD_LOG} "Could *NOT* find the required bfd library: ${BFD_LIBRARY_NAME}")
+    ENDIF()

     IF(HAVE_BFD_HEADER AND BFD_LIBRARY)
       # make sure we can build with libbfd


Fix build of tests

Fix build of tests

--- Shared/CMake/JamomaUtilFunctions.cmake
+++ Shared/CMake/JamomaUtilFunctions.cmake
@@ -153,7 +153,6 @@
 function(addTestTarget)
 	if(NOT WIN32)
 		if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test.cpp)
-			file(GLOB TEST_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp)

 			if(APPLE AND NOT IS_EXTENSION AND STATIC_TESTING)
 				# i386


forgot to commit cvconfig.h.cmake

forgot to commit cvconfig.h.cmake

--- cvconfig.h.cmake
+++ cvconfig.h.cmake
@@ -172,6 +172,9 @@
 /* Compile for 'virtual' NVIDIA PTX architectures */
 #define CUDA_ARCH_PTX "${OPENCV_CUDA_ARCH_PTX}"

+/* NVIDIA GPU features are used */
+#define CUDA_ARCH_FEATURES "${OPENCV_CUDA_ARCH_FEATURES}"
+
 /* Create PTX or BIN for 1.0 compute capability */
 #cmakedefine CUDA_ARCH_BIN_OR_PTX_10


MInor FindScas cleanup

MInor FindScas cleanup

--- CMake/FindScas.cmake
+++ CMake/FindScas.cmake
@@ -16,14 +16,8 @@
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(SCAS DEFAULT_MSG SCAS_LIBRARIES SCAS_INCLUDES)

-if (SCAS_FOUND)
-    message (STATUS "Found components for Libticables")
-    message (STATUS "SCAS_INCLUDES = ${SCAS_INCLUDES}")
-    message (STATUS "SCAS_LIBRARIES = ${SCAS_LIBRARIES}")
-else (SCAS_FOUND)
-    if (SCAS_FIND_REQUIRED)
-        message (FATAL_ERROR "Could not find scas!")
-    endif (SCAS_FIND_REQUIRED)
-endif (SCAS_FOUND)
+if (NOT SCAS_FOUND AND SCAS_FIND_REQUIRED)
+    message (FATAL_ERROR "Could not find scas!")
+endif ()

 mark_as_advanced(SCAS_LIBRARIES SCAS_INCLUDES)


Add ${LIBGFLAGS_LIBRARY} to IMPORTED_LINK_INTERFACE_LIBRARIES of glog::glog (#9169)

Summary:
X-link: https://github.com/facebook/hhvm/pull/9169

Pull Request resolved: https://github.com/facebook/wangle/pull/208

X-link: https://github.com/facebookincubator/reindeer/pull/4

X-link: https://github.com/facebookincubator/velox/pull/2445

X-link: https://github.com/facebookincubator/hsthrift/pull/98

X-link: https://github.com/facebookincubator/katran/pull/171

X-link: https://github.com/facebookincubator/mvfst/pull/272

X-link: https://github.com/facebook/fboss/pull/118

X-link: https://github.com/facebookincubator/fizz/pull/81

X-link: https://github.com/facebookexperimental/eden/pull/127

X-link: https://github.com/facebook/sapling-staging/pull/7

X-link: https://github.com/facebookexperimental/edencommon/pull/4

X-link: https://github.com/facebookexperimental/rust-shed/pull/34

X-link: https://github.com/facebook/fbthrift/pull/521

X-link: https://github.com/facebook/watchman/pull/1055

X-link: https://github.com/facebook/folly/pull/1854

X-link: https://github.com/facebook/openr/pull/140

X-link: https://github.com/facebook/fb303/pull/31

Previously Folly provided a polyfill of the `GflagsFlagSaver` symbol, which was removed since https://github.com/facebook/folly/commit/4dadde1256f74e756510a499c86459967f78afb9. Therefore, `glog` should solve the `GflagsFlagSaver` symbol directly from `gflags`.

This diff added `gflags` libraries as a dependency of the CMake project `glog::glog` into `fbcode_builder`'s `FindGlog.cmake`, so that the `fbcode_builder` users will be able to automatically link with `gflags`.

Reviewed By: alexeyt

Differential Revision: D39220438

fbshipit-source-id: 485d67bfeace955f83a4961372680f12eb9cc1a5

--- build/fbcode_builder/CMake/FindGlog.cmake
+++ build/fbcode_builder/CMake/FindGlog.cmake
@@ -34,4 +34,10 @@
   add_library(glog::glog UNKNOWN IMPORTED)
   set_target_properties(glog::glog PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${GLOG_INCLUDE_DIRS}")
   set_target_properties(glog::glog PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C" IMPORTED_LOCATION "${GLOG_LIBRARIES}")
+
+  find_package(Gflags)
+  if(GFLAGS_FOUND)
+    message(STATUS "Found gflags as a dependency of glog::glog, include=${LIBGFLAGS_INCLUDE_DIR}, libs=${LIBGFLAGS_LIBRARY}")
+    set_target_properties(glog::glog PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES ${LIBGFLAGS_LIBRARY})
+  endif()
 endif()


remove comments

remove comments

--- SuperBuild/CMake/External_geos.cmake
+++ SuperBuild/CMake/External_geos.cmake
@@ -43,8 +43,6 @@
    LOG_INSTALL 1
    )

-# Patch still needed with version 3.6.1 to avoid error during CMake configuration
-# See https://trac.osgeo.org/geos/ticket/753
 SUPERBUILD_PATCH_SOURCE(GEOS)

 set(_SB_GEOS_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)


BUG : ITK repository broken, changed to github page

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -170,7 +170,7 @@
       ${${proj}_CMAKE_ADDITIONAL_OPTIONS}
     )
   ### --- End Project specific additions
-  set(${proj}_REPOSITORY ${git_protocol}://itk.org/ITK.git)
+  set(${proj}_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITK)
   set(${proj}_GIT_TAG 0cb4a4dea8070c8aff24e307eee104337a0783aa)
   set(ITK_VERSION_ID ITK-4.11)


PERF: jacobian performance advantages from itk

--- SuperBuild/External_ITKv5.cmake
+++ SuperBuild/External_ITKv5.cmake
@@ -148,7 +148,7 @@

   ### --- End Project specific additions
   set(${proj}_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITK.git)
-  set(${proj}_GIT_TAG e5520e9078ed0ca6085e1defccbd132d85ed49f7 ) ##
+  set(${proj}_GIT_TAG 8e821376ee7e19d81c29741acdc32bcda911eafc ) ## jacobian performance
   set(ITK_VERSION_ID ITK-5.0) ### NOTE: When updating GIT_TAG, also update ITK_VERSION_ID

   ExternalProject_Add(${proj}


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 12)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   22)
+SET(KWSYS_DATE_STAMP_DAY   23)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   08)
+SET(KWSYS_DATE_STAMP_DAY   09)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 01)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   12)
+SET(KWSYS_DATE_STAMP_DAY   13)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   23)
+SET(KWSYS_DATE_STAMP_DAY   24)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   05)
+SET(KWSYS_DATE_STAMP_DAY   06)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   14)
+SET(KWSYS_DATE_STAMP_DAY   15)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 04)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   14)
+SET(KWSYS_DATE_STAMP_DAY   15)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 08)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   03)
+SET(KWSYS_DATE_STAMP_DAY   04)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 12)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   24)
+SET(KWSYS_DATE_STAMP_DAY   25)


Tweak InstallSymlink

Tweak InstallSymlink

--- InstallSymlink.cmake
+++ InstallSymlink.cmake
@@ -1,17 +1,18 @@

 # Creates a FROM->TO symlink during installation
-function(INSTALL_SYMLINK FROM TO)
+function(INSTALL_SYMLINK FROM TO COMPONENT)
   if (MSVC)
     install(CODE
       "get_filename_component(FROM_ABSOLUTE ${CMAKE_INSTALL_PREFIX}/${FROM}
          ABSOLUTE)
-       execute_process(COMMAND mlink \${FROM_ABSOLUTE} ${TO})")
+       execute_process(COMMAND mlink \${FROM_ABSOLUTE} ${TO})"
+      COMPONENT "${COMPONENT}")
   else()
     install(CODE
       "execute_process(COMMAND rm -f ${TO})
        get_filename_component(FROM_ABSOLUTE ${CMAKE_INSTALL_PREFIX}/${FROM}
          ABSOLUTE)
        execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-         \${FROM_ABSOLUTE} ${TO})")
+         \${FROM_ABSOLUTE} ${TO})" COMPONENT "${COMPONENT}")
   endif()
 endfunction()


cmake: set minimal CPU instruction to SSE3 (x64)

--- cmake/OpenCVCompilerOptimizations.cmake
+++ cmake/OpenCVCompilerOptimizations.cmake
@@ -243,7 +243,7 @@

   if(NOT DEFINED CPU_BASELINE)
     if(X86_64)
-      set(CPU_BASELINE "SSSE3" CACHE STRING "${HELP_CPU_BASELINE}")
+      set(CPU_BASELINE "SSE3" CACHE STRING "${HELP_CPU_BASELINE}")
     else()
       set(CPU_BASELINE "SSE2" CACHE STRING "${HELP_CPU_BASELINE}")
     endif()


Fixed missing project file error.

Fixed missing project file error.

--- cmake/modules/BuildGoogleBreakpad.cmake
+++ cmake/modules/BuildGoogleBreakpad.cmake
@@ -46,7 +46,7 @@
     breakpad
     patch_project_files
     DEPENDEES configure
-    DEPENDERS build build-crash-generation-client
+    DEPENDERS build build-common build-crash-generation-client
     WORKING_DIRECTORY <SOURCE_DIR>
     COMMAND cmake -DVCXPROJ_PATH=<SOURCE_DIR>/src/client/windows/common.vcxproj -P ${CMAKE_SCRIPT_PATH}/breakpad_VS_patch.cmake
     COMMAND cmake -DVCXPROJ_PATH=<SOURCE_DIR>/src/client/windows/handler/exception_handler.vcxproj -P ${CMAKE_SCRIPT_PATH}/breakpad_VS_patch.cmake


COMP: fix FindLibKML

COMP: fix FindLibKML

--- CMake/FindLibKML.cmake
+++ CMake/FindLibKML.cmake
@@ -49,7 +49,8 @@
                                     LIBKML_REGIONATOR_LIBRARY
                                     LIBKML_XSD_LIBRARY
                                     LIBKML_MINIZIP_LIBRARY )
-IF(LibKML_FOUND)
+
+IF(LIBKML_FOUND)
   SET(LIBKML_INCLUDE_DIRS ${LIBKML_INCLUDE_DIR})
   SET(LIBKML_LIBRARIES ${LIBKML_BASE_LIBRARY}
                        ${LIBKML_CONVENIENCE_LIBRARY}
@@ -58,4 +59,4 @@
                        ${LIBKML_REGIONATOR_LIBRARY}
                        ${LIBKML_XSD_LIBRARY}
                        ${LIBKML_MINIZIP_LIBRARY})
-ENDIF(LibKML_FOUND)
+ENDIF(LIBKML_FOUND)


Fixed Findparsical.

Fixed Findparsical.

--- src/Findparsical.cmake
+++ src/Findparsical.cmake
@@ -26,6 +26,6 @@

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
-  CLIBGAME
+  PARSICAL
   REQUIRED_VARS CLIBGAME_INCLUDE_DIR CLIBGAME_LIBRARY
 )


Update apriltags_driver to support CMake < 3.6.0

--- distro/superbuild/cmake/externals.cmake
+++ distro/superbuild/cmake/externals.cmake
@@ -551,7 +551,7 @@

   ExternalProject_Add(apriltags_driver
     GIT_REPOSITORY https://github.com/patmarion/apriltags_driver.git
-    GIT_TAG ad7db82
+    GIT_TAG fb0eff3
     CMAKE_CACHE_ARGS
       ${default_cmake_args}
     DEPENDS


Further extend windows cmake glob to exclude dequantize_op.cc. Change: 136515806

--- tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -90,8 +90,8 @@
       "${tensorflow_source_dir}/tensorflow/core/kernels/immutable_constant_op.h"
       "${tensorflow_source_dir}/tensorflow/core/kernels/sparse_matmul_op.cc"
       "${tensorflow_source_dir}/tensorflow/core/kernels/sparse_matmul_op.h"
-      "${tensorflow_source_dir}/tensorflow/core/kernels/quantiz*.h"
-      "${tensorflow_source_dir}/tensorflow/core/kernels/quantiz*.cc"
+      "${tensorflow_source_dir}/tensorflow/core/kernels/*quantiz*.h"
+      "${tensorflow_source_dir}/tensorflow/core/kernels/*quantiz*.cc"
   )
   list(REMOVE_ITEM tf_core_kernels_srcs ${tf_core_kernels_windows_exclude_srcs})
 endif(WIN32)


Fixed cmake module FindExpat.cmake

Fixed cmake module FindExpat.cmake

svn path=/trunk/KDE/kdenetwork/kopete/; revision=1201791

--- cmake/modules/FindExpat.cmake
+++ cmake/modules/FindExpat.cmake
@@ -10,7 +10,7 @@

 if ( EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY )
 	set ( EXPAT_FOUND true )
-else ( ILBC_INCLUDE_DIR AND ILBC_LIBRARY )
+else ( EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY )
 	find_path ( EXPAT_INCLUDE_DIR expat.h )
 	find_library ( EXPAT_LIBRARY NAMES expat )


Removed decimal version converter due to unexpectable versions

--- cMake/FindMatplotlib.cmake
+++ cMake/FindMatplotlib.cmake
@@ -7,8 +7,7 @@
 #  MATPLOTLIB_VERSION_MAJOR    - the major version number of matplotlib
 #  MATPLOTLIB_VERSION_MINOR    - the minor version number of matplotlib
 #  MATPLOTLIB_VERSION_PATCH    - the patch version number of matplotlib
-#  MATPLOTLIB_VERSION_DECIMAL  - e.g. version 1.1.1r is 10101
-#  MATPLOTLIB_PATH_DIRS     - path to the matplotlib include files
+#  MATPLOTLIB_PATH_DIRS        - path to the matplotlib include files

 IF(PYTHONINTERP_FOUND)
     # Try to import matplotlib into Python interpreter. Python
@@ -38,8 +37,6 @@
         list(GET _MATPLOTLIB_VERSION_LIST 0 MATPLOTLIB_VERSION_MAJOR)
         list(GET _MATPLOTLIB_VERSION_LIST 1 MATPLOTLIB_VERSION_MINOR)
         list(GET _MATPLOTLIB_VERSION_LIST 2 MATPLOTLIB_VERSION_PATCH)
-        math(EXPR MATPLOTLIB_VERSION_DECIMAL
-            "(${MATPLOTLIB_VERSION_MAJOR} * 10000) + (${MATPLOTLIB_VERSION_MINOR} * 100) + ${MATPLOTLIB_VERSION_PATCH}")
     ELSE()
         set(MATPLOTLIB_FOUND FALSE)
     ENDIF()


SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -25,7 +25,6 @@
 Name[eu]=VLC
 Name[fa]=وی‌ال‌سی (VLC)
 Name[fi]=VLC
-Name[fr]=VLC
 Name[ga]=VLC
 Name[gl]=VLC
 Name[hu]=VLC
@@ -73,7 +72,6 @@
 Comment[eu]=Phonon-en VLC bizkarraldekoa
 Comment[fa]=پسانه‌ی وی‌ال‌سی برای فنون (Phonon VLC backend)
 Comment[fi]=Phonon VLC -taustajärjestelmä
-Comment[fr]=Module VLC pour Phonon
 Comment[ga]=Inneall VLC Phonon
 Comment[gl]=Infraestrutura de VLC para Phonon
 Comment[hu]=Phonon VLC-backend


added version to installer name

added version to installer name

--- Win/projectDef.cmake
+++ Win/projectDef.cmake
@@ -93,6 +93,7 @@
     -dr INSTALLDIR      # Set the directory ID to put the files in
     )

+SET(FB_WIX_DEST ${FB_BIN_DIR}/${PLUGIN_NAME}/${CMAKE_CFG_INTDIR}/${PROJNAME}_${FBSTRING_PLUGIN_VERSION}.msi)
 add_wix_installer( ${PLUGIN_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}/Win/WiX/FBVLCInstaller.wxs
     PluginDLLGroup


Updated for the 5.7.0 Release

Updated for the 5.7.0 Release

svn path=/trunk/; revision=7182

--- cmake/modules/plplot_version.cmake
+++ cmake/modules/plplot_version.cmake
@@ -1,15 +1,15 @@
 # For now, must set this by hand before each release.  This value affects
 # at least the documentation build and perhaps other parts of the release.
-set(RELEASE_DATE "2006-05-15")
+set(RELEASE_DATE "2006-11-19")

 # Version data that need review and possible modification for each release.

-set(VERSION 5.6.1)
+set(VERSION 5.7.0)

 # CPack version numbers for release tarball name.
 set(CPACK_PACKAGE_VERSION_MAJOR 5)
-set(CPACK_PACKAGE_VERSION_MINOR 6)
-set(CPACK_PACKAGE_VERSION_PATCH 1)
+set(CPACK_PACKAGE_VERSION_MINOR 7)
+set(CPACK_PACKAGE_VERSION_PATCH 0)

 # PLplot library version information.


Fixed output directory for python bindings

--- tools/cmake/ANHPythonBinding.cmake
+++ tools/cmake/ANHPythonBinding.cmake
@@ -112,25 +112,27 @@
         LINK_DIRECTORIES(${ANHPYTHONLIB_ADDITIONAL_LIBRARY_DIRS})
     ENDIF()

+    # Create the Common library
+    ADD_LIBRARY(${name} MODULE ${ANHPYTHONLIB_SOURCES})
+
     if(WIN32)
-        set(BINDING_POSTFIX .pyd)
-		set(BINDING_PREFIX ../)
+        SET_TARGET_PROPERTIES(${name}
+            PROPERTIES OUTPUT_NAME py_${base_name}
+            LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/swgpy/${base_name}
+            LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/swgpy/${base_name}
+            PREFIX "../"
+            SUFFIX ".pyd"
+            FOLDER "python_bindings"
+        )
     else()
-        set(BINDING_POSTFIX ${CMAKE_SHARED_MODULE_SUFFIX})
-		set(BINDING_PREFIX "")
+        SET_TARGET_PROPERTIES(${name}
+            PROPERTIES OUTPUT_NAME py_${base_name}
+            LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/swgpy/${base_name}
+            PREFIX ""
+            FOLDER "python_bindings"
+        )
     endif()

-    # Create the Common library
-	ADD_LIBRARY(${name} MODULE ${ANHPYTHONLIB_SOURCES})
-	SET_TARGET_PROPERTIES(${name}
-		PROPERTIES OUTPUT_NAME py_${base_name}
-		LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/swgpy/${base_name}/
-		RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/swgpy/${base_name}
-		RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/swgpy/${base_name}
-		PREFIX "${BINDING_PREFIX}"
-		SUFFIX "${BINDING_POSTFIX}"
-		FOLDER "python_bindings"
-    )
     list(APPEND ANH_PYTHON_BINDINGS ${name})

     IF(_project_deps_list_length GREATER 0)


Disable ccache by default

Disable ccache by default

Several users build ROOT on machines that have $HOME in AFS,
which makes things slow and fills up space with ccache enabled,
since $CCACHE_DIR defaults to ~/.ccache.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -90,7 +90,7 @@
 ROOT_BUILD_OPTION(builtin_xxhash OFF "Build included xxHash library")
 ROOT_BUILD_OPTION(builtin_zlib OFF "Build included libz, or use system libz")
 ROOT_BUILD_OPTION(castor ON "CASTOR support, requires libshift from CASTOR >= 1.5.2")
-ROOT_BUILD_OPTION(ccache ON "Enable ccache usage for speeding up builds")
+ROOT_BUILD_OPTION(ccache OFF "Enable ccache usage for speeding up builds")
 ROOT_BUILD_OPTION(cefweb OFF "Chromium Embedded Framework web-based display")
 ROOT_BUILD_OPTION(clad ON "Enable clad, the cling automatic differentiation plugin.")
 ROOT_BUILD_OPTION(cling ON "Enable new CLING C++ interpreter")


Update Libevent release.

Update Libevent release.

--- cmake/projects/Libevent/hunter.cmake
+++ cmake/projects/Libevent/hunter.cmake
@@ -8,8 +8,8 @@
 hunter_add_version(
     PACKAGE_NAME Libevent
     VERSION "2.1.8"
-    URL "https://github.com/isaachier/libevent/archive/hunter-2.1.8-p1.tar.gz"
-    SHA1 "743ee49ede4a1cb2a1020e24ee9b1c061255d475")
+    URL "https://github.com/isaachier/libevent/archive/hunter-2.1.8-p2.tar.gz"
+    SHA1 "a82155f66165a46283682f8128d2afeb2c6c068c")

 hunter_pick_scheme(DEFAULT url_sha1_cmake)
 hunter_cacheable(Libevent)


px4_fmu-v2 re-enable CONSTRAINED_FLASH build

 - this limits console output at boot

--- boards/px4/fmu-v2/default.cmake
+++ boards/px4/fmu-v2/default.cmake
@@ -10,7 +10,7 @@
 	BOOTLOADER ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/extras/px4fmuv3_bl.bin
 	IO px4_io-v2_default
 	#TESTING
-	#CONSTRAINED_FLASH
+	CONSTRAINED_FLASH
 	#UAVCAN_INTERFACES 2

 	SERIAL_PORTS


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 03)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   09)
+SET(KWSYS_DATE_STAMP_DAY   10)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 05)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   29)
+SET(KWSYS_DATE_STAMP_DAY   30)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 08)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   09)
+SET(KWSYS_DATE_STAMP_DAY   10)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 08)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   03)
+SET(KWSYS_DATE_STAMP_DAY   04)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 01)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   09)
+SET(KWSYS_DATE_STAMP_DAY   10)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 11)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   07)
+SET(KWSYS_DATE_STAMP_DAY   08)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 06)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   08)
+SET(KWSYS_DATE_STAMP_DAY   09)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 01)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   11)
+SET(KWSYS_DATE_STAMP_DAY   12)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   17)
+SET(KWSYS_DATE_STAMP_DAY   18)


Removes gearshifftConfig.cmake.

Removes gearshifftConfig.cmake.

--- gearshifftConfig.cmake
+++ gearshifftConfig.cmake
@@ -1,2 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-


Fix for pthread for OS X

Fix for pthread for OS X

--- cmake/CompileOptions.cmake
+++ cmake/CompileOptions.cmake
@@ -210,6 +210,10 @@
             -Wno-pragmas
             -Wfloat-conversion
         >
+
+        $<$<PLATFORM_ID:"Darwin">:
+            -pthread
+        >
     )
 endif ()

@@ -221,7 +225,7 @@
 set(DEFAULT_LINKER_OPTIONS)

 # Use pthreads on linux and mingw
-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND "${CMAKE_SYSTEM_NAME}" MATCHES "Linux"))
     set(DEFAULT_LINKER_OPTIONS
         -pthread
     )


CMake: Fix creation of RPMs

CMake: Fix creation of RPMs

Signed-off-by: Paul Cercueil <73d292422978d45c9eeef455bb1b24a0db453722@analog.com>

--- cmake/LinuxPackaging.cmake
+++ cmake/LinuxPackaging.cmake
@@ -4,6 +4,7 @@

 FIND_PROGRAM(RPMBUILD_CMD rpmbuild)
 if (RPMBUILD_CMD)
+	set(CPACK_PACKAGE_RELOCATABLE OFF)
 	set(CPACK_GENERATOR ${CPACK_GENERATOR};RPM)
 endif()


cmake: fix incorrect usage of CACHE variables

* setting CACHE variable recursively will keep adding parameters on cmake
  re-runs
* updating cached value of CMAKE_C_FLAGS and friends breaks the whole
  logic of it being passed on from a user initially and then necessary
  flags added on top, specifically it circumvents the
  `set(CMAKE_C_FLAGS_SAVE "${CMAKE_C_FLAGS}")`
  `do_stuff()`
  `set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_SAVE}")`
  trick utilized in several places (e.g. in darktable) when cmake is
  re-run
* that still leaves a general problem of updating global variables from
  inside the library, probably it should be done only at the top level
  of application cmake files, not ad-hoc like that, instead targets and
  other modern cmake features should be used

--- cmake/compiler-flags.cmake
+++ cmake/compiler-flags.cmake
@@ -50,17 +50,13 @@
 # NOT CMAKE_STATIC_LINKER_FLAGS
 SET(CMAKE_SHARED_LINKER_FLAGS
     "${CMAKE_SHARED_LINKER_FLAGS} ${linkerflags}"
-    CACHE STRING "" FORCE )
+    )
 SET(CMAKE_EXE_LINKER_FLAGS
     "${CMAKE_EXE_LINKER_FLAGS} ${linkerflags}"
-    CACHE STRING "" FORCE )
+    )
 SET(CMAKE_MODULE_LINKER_FLAGS
     "${CMAKE_MODULE_LINKER_FLAGS} ${linkerflags}"
-    CACHE STRING "" FORCE )
-MARK_AS_ADVANCED(
-    CMAKE_SHARED_LINKER_FLAGS
-    CMAKE_EXE_LINKER_FLAGS
-    CMAKE_MODULE_LINKER_FLAGS )
+    )

 if(RAWSPEED_ENABLE_LTO)
   if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -78,30 +74,19 @@

   set(CMAKE_C_FLAGS
       "${CMAKE_C_FLAGS} ${lto_compile}"
-      CACHE STRING "Flags used by the C compiler during all builds."
-      FORCE )
+      )
   set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} ${lto_compile}"
-      CACHE STRING "Flags used by the C++ compiler during all builds."
-      FORCE )
+      )
   set(CMAKE_EXE_LINKER_FLAGS
       "${CMAKE_EXE_LINKER_FLAGS} ${lto_link}"
-      CACHE STRING "Flags used for linking binaries during all builds."
-      FORCE )
+      )
   set(CMAKE_SHARED_LINKER_FLAGS
       "${CMAKE_SHARED_LINKER_FLAGS} ${lto_link}"
-      CACHE STRING "Flags used by the shared libraries linker during all builds."
-      FORCE )
+      )
   set(CMAKE_MODULE_LINKER_FLAGS
       "${CMAKE_MODULE_LINKER_FLAGS} ${lto_link}"
-      CACHE STRING "Flags used by the module linker during all builds."
-      FORCE )
-  mark_as_advanced(
-      CMAKE_C_FLAGS
-      CMAKE_CXX_FLAGS
-      CMAKE_EXE_LINKER_FLAGS
-      CMAKE_SHARED_LINKER_FLAGS
-      CMAKE_MODULE_LINKER_FLAGS )
+      )
 endif()

 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")


Explain why we choose an old version of boost (#7967)

--- cmake/external/boost.cmake
+++ cmake/external/boost.cmake
@@ -15,6 +15,13 @@
 include(ExternalProject)

 set(BOOST_PROJECT       "extern_boost")
+# To release PaddlePaddle as a pip package, we have to follow the
+# manylinux1 standard, which features as old Linux kernels and
+# compilers as possible and recommends CentOS 5. Indeed, the earliest
+# CentOS version that works with NVIDIA CUDA is CentOS 6.  And a new
+# version of boost, say, 1.66.0, doesn't build on CentOS 6.  We
+# checked that the devtools package of CentOS 6 installs boost 1.41.0.
+# So we use 1.41.0 here.
 set(BOOST_VER           "1.41.0")
 set(BOOST_TAR           "boost_1_41_0")
 set(BOOST_URL           "http://paddlepaddledeps.s3-website-us-west-1.amazonaws.com/${BOOST_TAR}.tar.gz")


"change eigen mirror"

"change eigen mirror"

--- cmake/external/eigen.cmake
+++ cmake/external/eigen.cmake
@@ -21,11 +21,12 @@
     ExternalProject_Add(
         extern_eigen3
         ${EXTERNAL_PROJECT_LOG_ARGS}
-        GIT_REPOSITORY  "https://github.com/RLovelett/eigen.git"
+        GIT_REPOSITORY  "https://github.com/eigenteam/eigen-git-mirror"
         # eigen on cuda9.1 missing header of math_funtions.hpp
         # https://stackoverflow.com/questions/43113508/math-functions-hpp-not-found-when-using-cuda-with-eigen
         GIT_TAG         917060c364181f33a735dc023818d5a54f60e54c
         PREFIX          ${EIGEN_SOURCE_DIR}
+        DOWNLOAD_NAME   "eigen"
         UPDATE_COMMAND  ""
         CONFIGURE_COMMAND ""
         BUILD_COMMAND     ""


[cmake] Support Gentoo install for z3

[cmake] Support Gentoo install for z3

Add the 'z3' subdirectory to the list of possible path suffixes for
libz3 header search. The z3 headers are installed in /usr/include/z3
on Gentoo.

Differential Revision: https://reviews.llvm.org/D31756

git-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@299813 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/FindZ3.cmake
+++ cmake/modules/FindZ3.cmake
@@ -1,5 +1,5 @@
 find_path(Z3_INCLUDE_DIR NAMES z3.h
-   PATH_SUFFIXES libz3
+   PATH_SUFFIXES libz3 z3
    )

 find_library(Z3_LIBRARIES NAMES z3 libz3


If CMAKE_INSTALL_PREFIX is different to the prefix used to install octave, then make sure .oct files go in ${CMAKE_INSTALL_LIBDIR}/octave , i.e. in a library directory rather than a data directory. They are binary files so should not live under CMAKE_INSTALL_DATADIR.

svn path=/trunk/; revision=12621

--- cmake/modules/octave.cmake
+++ cmake/modules/octave.cmake
@@ -277,7 +277,7 @@

   # Transform OCTAVE_OCT_DIR if prefixes not the same.
   if(NOT CMAKE_INSTALL_PREFIX STREQUAL "${OCTAVE_PREFIX}")
-    set(OCTAVE_OCT_DIR ${PLPLOT_OCTAVE_DIR})
+    set(OCTAVE_OCT_DIR ${CMAKE_INSTALL_LIBDIR}/octave)
   endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "${OCTAVE_PREFIX}")
   message(STATUS "OCTAVE_OCT_DIR = ${OCTAVE_OCT_DIR}")


using static boost for windows

using static boost for windows

git-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@946 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_find_boost.cmake
+++ cmake/pcl_find_boost.cmake
@@ -1,8 +1,8 @@
 # Find and set Boost flags

-if(NOT PCL_SHARED_LIBS)
+if(NOT PCL_SHARED_LIBS OR WIN32)
     set(Boost_USE_STATIC_LIBS ON)
-endif(NOT PCL_SHARED_LIBS)
+endif(NOT PCL_SHARED_LIBS OR WIN32)

 find_package(Boost 1.40.0 COMPONENTS system filesystem thread date_time)


Quote paths. Fixes #187

Quote paths. Fixes #187

--- cmake_toolchain/vita.cmake
+++ cmake_toolchain/vita.cmake
@@ -121,13 +121,13 @@
     add_custom_target(${target}
       ALL
       DEPENDS ${self_outfile}
-      COMMAND ${CMAKE_COMMAND} -E copy ${self_outfile} ${target}
+      COMMAND ${CMAKE_COMMAND} -E copy "${self_outfile}" "${target}"
     )
   else()
     add_custom_target(${target}-self
       ALL
       DEPENDS ${self_outfile}
-      COMMAND ${CMAKE_COMMAND} -E copy ${self_outfile} ${target}
+      COMMAND ${CMAKE_COMMAND} -E copy "${self_outfile}" "${target}"
       BYPRODUCTS ${target}
     )
   endif()
@@ -205,11 +205,11 @@
     COMMAND ${VITA_LIBS_GEN} ${VITA_LIBS_GEN_FLAGS} ${target_yml} ${CMAKE_CURRENT_BINARY_DIR}/${target-dir}
     COMMAND make -C ${CMAKE_CURRENT_BINARY_DIR}/${target-dir}
     COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_CURRENT_BINARY_DIR}/${target-dir}/${stub_lib}
-      ${CMAKE_CURRENT_BINARY_DIR}/${stub_lib}
+      "${CMAKE_CURRENT_BINARY_DIR}/${target-dir}/${stub_lib}"
+      "${CMAKE_CURRENT_BINARY_DIR}/${stub_lib}"
     COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_CURRENT_BINARY_DIR}/${target-dir}/${stub_weak_lib}
-      ${CMAKE_CURRENT_BINARY_DIR}/${stub_weak_lib}
+      "${CMAKE_CURRENT_BINARY_DIR}/${target-dir}/${stub_weak_lib}"
+      "${CMAKE_CURRENT_BINARY_DIR}/${stub_weak_lib}"
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${target-dir}.yml
     COMMENT "Building stubs ${target-dir}"
   )
@@ -321,13 +321,13 @@
     add_custom_target(${target}
       ALL
       DEPENDS ${vpk_outfile}
-      COMMAND ${CMAKE_COMMAND} -E copy ${vpk_outfile} ${target}
+      COMMAND ${CMAKE_COMMAND} -E copy "${vpk_outfile}" "${target}"
     )
   else()
     add_custom_target(${target}-vpk
       ALL
       DEPENDS ${vpk_outfile}
-      COMMAND ${CMAKE_COMMAND} -E copy ${vpk_outfile} ${target}
+      COMMAND ${CMAKE_COMMAND} -E copy "${vpk_outfile}" "${target}"
       BYPRODUCTS ${target}
     )
   endif()


improved a bit the testsuite script

improved a bit the testsuite script

--- test/testsuite.cmake
+++ test/testsuite.cmake
@@ -158,7 +158,7 @@

 # this is the initial cache to use for the binary tree, be careful to escape
 # any quotes inside of this string if you use it
-if(WIN32)
+if(WIN32 AND NOT CYGWIN)
   #message(SEND_ERROR "win32")
   set(CTEST_CMAKE_COMMAND "${CTEST_CMAKE_COMMAND} -G \"NMake Makefiles\" -DCMAKE_MAKE_PROGRAM=nmake")
   SET (CTEST_INITIAL_CACHE "
@@ -168,21 +168,12 @@
     BUILDNAME:STRING=${EIGEN_BUILD_STRING}
     SITE:STRING=${EIGEN_SITE}
   ")
-else(WIN32)
+else(WIN32 AND NOT CYGWIN)
   SET (CTEST_INITIAL_CACHE "
     BUILDNAME:STRING=${EIGEN_BUILD_STRING}
     SITE:STRING=${EIGEN_SITE}
   ")
-endif(WIN32)
-
-# MAKECOMMAND:STRING=nmake -i
-# CMAKE_MAKE_PROGRAM:FILEPATH=make
-# CMAKE_GENERATOR:INTERNAL=Makefiles
-SET (CTEST_INITIAL_CACHE "
-  BUILDNAME:STRING=opensuse-11_1-x86_64-${EIGEN_CXX}
-  SITE:STRING=pc-gael
-  CVSCOMMAND:FILEPATH=/usr/bin/svn"
-)
+endif(WIN32 AND NOT CYGWIN)

 # set any extra environment variables to use during the execution of the script here:


libjansson fix

libjansson fix

--- libjansson.cmake
+++ libjansson.cmake
@@ -10,7 +10,7 @@
 include (ExternalSource)
 include (BuildSupport)

-external_source (libjansson
+external_git_pro (libjansson
   HEAD
   git://github.com/akheron/jansson.git
   )


Add more valgrind tooling targets for tests

Not all of the tools are out of the experimental state in valgrind yet.
The experimental tools are not given with their "exp-" prefixes on the
expectation that they will someday no longer be experimental. Manual
testing can be done by editing the file.

--- cmake/test.cmake
+++ cmake/test.cmake
@@ -50,9 +50,14 @@
   endif (VISTK_VALGRIND_USE_SUPPRESSIONS)

   add_custom_target(valgrind)
+  add_custom_target(cachegrind)
   add_custom_target(callgrind)
   add_custom_target(helgrind)
-  add_custom_target(ptrcheck)
+  add_custom_target(drd)
+  add_custom_target(massif)
+  add_custom_target(dhat)
+  add_custom_target(sgcheck)
+  add_custom_target(bbv)
 endif (VALGRIND_EXECUTABLE)

 find_program(GPROF_EXECUTABLE gprof)
@@ -77,17 +82,32 @@
   endif (NOT WIN32)
   if (VALGRIND_EXECUTABLE)
     add_custom_target(valgrind-${testname})
+    add_custom_target(cachegrind-${testname})
     add_custom_target(callgrind-${testname})
     add_custom_target(helgrind-${testname})
-    add_custom_target(ptrcheck-${testname})
+    add_custom_target(drd-${testname})
+    add_custom_target(massif-${testname})
+    add_custom_target(dhat-${testname})
+    add_custom_target(sgcheck-${testname})
+    add_custom_target(bbv-${testname})
     add_dependencies(valgrind
       valgrind-${testname})
+    add_dependencies(cachegrind
+      cachegrind-${testname})
     add_dependencies(callgrind
       callgrind-${testname})
     add_dependencies(helgrind
       helgrind-${testname})
-    add_dependencies(ptrcheck
-      ptrcheck-${testname})
+    add_dependencies(drd
+      drd-${testname})
+    add_dependencies(massif
+      massif-${testname})
+    add_dependencies(dhat
+      dhat-${testname})
+    add_dependencies(sgcheck
+      sgcheck-${testname})
+    add_dependencies(bbv
+      bbv-${testname})
   endif (VALGRIND_EXECUTABLE)
   if (GPROF_EXECUTABLE)
     add_custom_target(gprof-${testname})
@@ -147,6 +167,22 @@
       COMMENT "Running valgrind on test \"${testname}\" instance \"${instance}\"")
     add_dependencies(valgrind-${testname}
       valgrind-${testname}-${instance})
+    add_custom_target(cachegrind-${testname}-${instance})
+    add_custom_command(
+      TARGET  cachegrind-${testname}-${instance}
+      COMMAND "${VALGRIND_EXECUTABLE}"
+              --tool=cachegrind
+              --log-file="${EXECUTABLE_OUTPUT_PATH}/cachegrind.log.${testname}.${instance}"
+              --cachegrind-out-file="${EXECUTABLE_OUTPUT_PATH}/cachegrind.out.${testname}.${instance}"
+              ${TEST_RUNNER}
+              "${EXECUTABLE_OUTPUT_PATH}/test-${testname}"
+              ${instance}
+              ${ARGN}
+      WORKING_DIRECTORY
+              "${TEST_WORKING_DIRECTORY}"
+      COMMENT "Running cachegrind on test \"${testname}\" instance \"${instance}\"")
+    add_dependencies(cachegrind-${testname}
+      cachegrind-${testname}-${instance})
     add_custom_target(callgrind-${testname}-${instance})
     add_custom_command(
       TARGET  callgrind-${testname}-${instance}
@@ -179,21 +215,85 @@
       COMMENT "Running helgrind on test \"${testname}\" instance \"${instance}\"")
     add_dependencies(helgrind-${testname}
       helgrind-${testname}-${instance})
-    add_custom_target(ptrcheck-${testname}-${instance})
-    add_custom_command(
-      TARGET  ptrcheck-${testname}-${instance}
-      COMMAND "${VALGRIND_EXECUTABLE}"
-              --tool=exp-ptrcheck
-              --log-file="${EXECUTABLE_OUTPUT_PATH}/ptrcheck.log.${testname}.${instance}"
-              ${TEST_RUNNER}
-              "${EXECUTABLE_OUTPUT_PATH}/test-${testname}"
-              ${instance}
-              ${ARGN}
-      WORKING_DIRECTORY
-              "${TEST_WORKING_DIRECTORY}"
-      COMMENT "Running ptrcheck on test \"${testname}\" instance \"${instance}\"")
-    add_dependencies(ptrcheck-${testname}
-      ptrcheck-${testname}-${instance})
+    add_custom_target(drd-${testname}-${instance})
+    add_custom_command(
+      TARGET  drd-${testname}-${instance}
+      COMMAND "${VALGRIND_EXECUTABLE}"
+              --tool=drd
+              --log-file="${EXECUTABLE_OUTPUT_PATH}/drd.log.${testname}.${instance}"
+              ${TEST_RUNNER}
+              "${EXECUTABLE_OUTPUT_PATH}/test-${testname}"
+              ${instance}
+              ${ARGN}
+      WORKING_DIRECTORY
+              "${TEST_WORKING_DIRECTORY}"
+      COMMENT "Running drd on test \"${testname}\" instance \"${instance}\"")
+    add_dependencies(drd-${testname}
+      drd-${testname}-${instance})
+    add_custom_target(massif-${testname}-${instance})
+    add_custom_command(
+      TARGET  massif-${testname}-${instance}
+      COMMAND "${VALGRIND_EXECUTABLE}"
+              --tool=massif
+              --stacks=yes
+              --log-file="${EXECUTABLE_OUTPUT_PATH}/massif.log.${testname}.${instance}"
+              --massif-out-file="${EXECUTABLE_OUTPUT_PATH}/massif.out.${testname}.${instance}"
+              ${TEST_RUNNER}
+              "${EXECUTABLE_OUTPUT_PATH}/test-${testname}"
+              ${instance}
+              ${ARGN}
+      WORKING_DIRECTORY
+              "${TEST_WORKING_DIRECTORY}"
+      COMMENT "Running massif on test \"${testname}\" instance \"${instance}\"")
+    add_dependencies(massif-${testname}
+      massif-${testname}-${instance})
+    add_custom_target(dhat-${testname}-${instance})
+    add_custom_command(
+      TARGET  dhat-${testname}-${instance}
+      COMMAND "${VALGRIND_EXECUTABLE}"
+              --tool=dhat
+              --log-file="${EXECUTABLE_OUTPUT_PATH}/dhat.log.${testname}.${instance}"
+              ${TEST_RUNNER}
+              "${EXECUTABLE_OUTPUT_PATH}/test-${testname}"
+              ${instance}
+              ${ARGN}
+      WORKING_DIRECTORY
+              "${TEST_WORKING_DIRECTORY}"
+      COMMENT "Running dhat on test \"${testname}\" instance \"${instance}\"")
+    add_dependencies(dhat-${testname}
+      dhat-${testname}-${instance})
+    add_custom_target(sgcheck-${testname}-${instance})
+    add_custom_command(
+      TARGET  sgcheck-${testname}-${instance}
+      COMMAND "${VALGRIND_EXECUTABLE}"
+              --tool=sgcheck
+              --log-file="${EXECUTABLE_OUTPUT_PATH}/sgcheck.log.${testname}.${instance}"
+              ${TEST_RUNNER}
+              "${EXECUTABLE_OUTPUT_PATH}/test-${testname}"
+              ${instance}
+              ${ARGN}
+      WORKING_DIRECTORY
+              "${TEST_WORKING_DIRECTORY}"
+      COMMENT "Running sgcheck on test \"${testname}\" instance \"${instance}\"")
+    add_dependencies(sgcheck-${testname}
+      sgcheck-${testname}-${instance})
+    add_custom_target(bbv-${testname}-${instance})
+    add_custom_command(
+      TARGET  bbv-${testname}-${instance}
+      COMMAND "${VALGRIND_EXECUTABLE}"
+              --tool=bbv
+              --log-file="${EXECUTABLE_OUTPUT_PATH}/bbv.log.${testname}.${instance}"
+              --bb-log-file="${EXECUTABLE_OUTPUT_PATH}/bbv.bb.out.${testname}.${instance}"
+              --pc-log-file="${EXECUTABLE_OUTPUT_PATH}/bbv.pc.log.${testname}.${instance}"
+              ${TEST_RUNNER}
+              "${EXECUTABLE_OUTPUT_PATH}/test-${testname}"
+              ${instance}
+              ${ARGN}
+      WORKING_DIRECTORY
+              "${TEST_WORKING_DIRECTORY}"
+      COMMENT "Running bbv on test \"${testname}\" instance \"${instance}\"")
+    add_dependencies(bbv-${testname}
+      bbv-${testname}-${instance})
   endif (VALGRIND_EXECUTABLE)
   if (GPROF_EXECUTABLE)
     set(real_command


return type of METIS_PartGraphKway wrong

--- config/cmake/modules/FindMETIS.cmake
+++ config/cmake/modules/FindMETIS.cmake
@@ -33,7 +33,7 @@
        * J = partitioning;

     idx_t ncon = 1;
-    idx_t err;
+    int err;
     idx_t options[40];

     METIS_SetDefaultOptions(options);


fix fmtFiles regex

fix fmtFiles regex

* issue https://github.com/smanders/externpro/issues/258
* CMake Regular Expressions https://cmake.org/cmake/help/v3.12/command/string.html#regular-expressions
> "Note that two backslashes (`\\1`) are required in CMake code to get a backslash through argument parsing."

--- modules/xpfunmac.cmake
+++ modules/xpfunmac.cmake
@@ -1077,8 +1077,7 @@
         xpGlobFiles(repoFiles ${item} *)
       endforeach()
       set(fmtFiles ${repoFiles})
-      list(FILTER fmtFiles INCLUDE REGEX "^.*\.(c|h|cpp|hpp|cu|cuh|proto)$")
-      list(FILTER fmtFiles EXCLUDE REGEX "^.*\.crtoolrc$") # CMake was erroneously matching .crtoolrc
+      list(FILTER fmtFiles INCLUDE REGEX "^.*\\.(c|h|cpp|hpp|cu|cuh|proto)$")
       foreach(item ${XP_SOURCE_DIR_IGNORE})
         xpGlobFiles(ignoreFiles ${item} *)
       endforeach()


remove unused cmake function/macro xpParentListAppend

see issue https://github.com/smanders/externpro/issues/151#issuecomment-341847020

--- modules/xpfunmac.cmake
+++ modules/xpfunmac.cmake
@@ -761,11 +761,6 @@
   set(${_ret} ${CFG_FLAGS} PARENT_SCOPE)
 endfunction()

-macro(xpParentListAppend parentList items)
-  list(APPEND ${parentList} ${items})
-  set(${parentList} ${${parentList}} PARENT_SCOPE)
-endmacro()
-
 function(xpGitIgnoredDirs var dir)
   if(NOT GIT_FOUND)
     include(FindGit)


Hack fix for build failing on MinGW due to -include Precompiled.h option included multiple times for the generated Lua API .cpp files without a space in between.

--- CMake/Modules/Urho3D-CMake-common.cmake
+++ CMake/Modules/Urho3D-CMake-common.cmake
@@ -554,7 +554,7 @@
                 if (FILE MATCHES \\.cpp$)
                     get_property (NO_PCH SOURCE ${FILE} PROPERTY NO_PCH)
                     if (NOT NO_PCH)
-                        set_property (SOURCE ${FILE} APPEND_STRING PROPERTY COMPILE_FLAGS "-include ${HEADER_FILENAME}")
+                        set_property (SOURCE ${FILE} APPEND_STRING PROPERTY COMPILE_FLAGS " -include ${HEADER_FILENAME}")
                     endif ()
                 endif ()
             endforeach ()


Fix test case setup. Only add test case when URHO3D_TESTING is enabled.

--- CMake/Modules/Urho3D-CMake-common.cmake
+++ CMake/Modules/Urho3D-CMake-common.cmake
@@ -1097,16 +1097,18 @@

 # Macro for setting up a test case
 macro (setup_test)
-    cmake_parse_arguments (ARG "" "NAME" "OPTIONS" ${ARGN})
-    if (NOT ARG_NAME)
-        set (ARG_NAME ${TARGET_NAME})
-    endif ()
-    list (APPEND ARG_OPTIONS -timeout ${URHO3D_TEST_TIMEOUT})
-    math (EXPR EMRUN_TIMEOUT "2 * ${URHO3D_TEST_TIMEOUT}")
-    if (EMSCRIPTEN)
-        add_test (NAME ${ARG_NAME} COMMAND ${EMRUN} --browser ${EMSCRIPTEN_EMRUN_BROWSER} --timeout ${EMRUN_TIMEOUT} --timeout_returncode 1 --kill_exit ${TARGET_NAME}.html ${ARG_OPTIONS} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-    else ()
-        add_test (NAME ${ARG_NAME} COMMAND ${TARGET_NAME} ${ARG_OPTIONS})
+    if (URHO3D_TESTING)
+        cmake_parse_arguments (ARG "" "NAME" "OPTIONS" ${ARGN})
+        if (NOT ARG_NAME)
+            set (ARG_NAME ${TARGET_NAME})
+        endif ()
+        list (APPEND ARG_OPTIONS -timeout ${URHO3D_TEST_TIMEOUT})
+        if (EMSCRIPTEN)
+            math (EXPR EMRUN_TIMEOUT "2 * ${URHO3D_TEST_TIMEOUT}")
+            add_test (NAME ${ARG_NAME} COMMAND ${EMRUN} --browser ${EMSCRIPTEN_EMRUN_BROWSER} --timeout ${EMRUN_TIMEOUT} --timeout_returncode 1 --kill_exit ${TARGET_NAME}.html ${ARG_OPTIONS} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+        else ()
+            add_test (NAME ${ARG_NAME} COMMAND ${TARGET_NAME} ${ARG_OPTIONS})
+        endif ()
     endif ()
 endmacro ()


bugfix in signing MSI installer

bugfix in signing MSI installer

--- common/cmake/package.cmake
+++ common/cmake/package.cmake
@@ -173,7 +173,7 @@
     SET(CPACK_WIX_UPGRADE_GUID "331BD5A9-DAD6-486B-A435-18AAB80${EMBREE_VERSION_MAJOR}0000") # upgrade as long as major version is the same
     SET(CPACK_WIX_CMAKE_PACKAGE_REGISTRY TRUE)
     IF (EMBREE_TESTING_PACKAGE)
-      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_win.bat ${CMAKE_BUILD_TYPE} ${CPACK_PACKAGE_FILE_NAME}.exe ${EMBREE_SIGN_FILE})
+      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_win.bat ${CMAKE_BUILD_TYPE} ${CPACK_PACKAGE_FILE_NAME}.msi ${EMBREE_SIGN_FILE})
     ENDIF()
   ELSE()
     SET(CPACK_GENERATOR ZIP)


Use zlib from tiledb-deps-mirror with fallback (#3375)

Part of SC-11085

--- cmake/Modules/FindZlib_EP.cmake
+++ cmake/Modules/FindZlib_EP.cmake
@@ -83,7 +83,9 @@

     ExternalProject_Add(ep_zlib
       PREFIX "externals"
-      URL "https://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib1211.zip"
+      URL
+        "https://github.com/TileDB-Inc/tiledb-deps-mirror/releases/download/2.10-deps/zlib1211.zip"
+        "https://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib1211.zip"
       URL_HASH SHA1=bccd93ad3cee39c3d08eee68d45b3e11910299f2
       DOWNLOAD_NAME "zlib1211.zip"
       CMAKE_ARGS


disable warning 4251

disable warning 4251

--- cmake/PlatformWindowsMSVC.cmake
+++ cmake/PlatformWindowsMSVC.cmake
@@ -20,7 +20,7 @@

 set(WIN32_COMPILE_FLAGS
-    "/nologo /Zc:wchar_t /Zc:forScope /GL /GF /GR /GS- /Zi /fp:precise /MP /W3 "
+    "/nologo /Zc:wchar_t /Zc:forScope /GL /GF /GR /GS- /Zi /fp:precise /MP /W3 /wd4251"
     # nologo       -> no logo
     # Zc:wchar_t   -> treat wchar_t as built-in type: yes
     # Zc:forScope  -> force conformance in for loop scope: Yes


Add config_libarchive function to cmake environment.

Patch 2:
Add the include folder by default.

Change-Id: I5b172308cd60c03f45b3a70158f62a8cfff78320
Reviewed-on: https://gerrit.mozy.lab.emc.com/115740
Reviewed-by: Neo Liu <d34675d02e14a392b4878427f0b205622944a3ed@emc.com>

--- cmake/configureThirdParty.cmake
+++ cmake/configureThirdParty.cmake
@@ -233,3 +233,28 @@
         find_package(LibLZMA)
     endif()
 endmacro()
+
+macro(config_libarchive version)
+
+    set(LIBARCHIVE_VERSION ${version})
+    set(LIBARCHIVE_ROOT ${THIRDPARTY_LIB_ROOT}/libarchive/libarchive-${LIBARCHIVE_VERSION})
+    set(LIBARCHIVE_INCLUDE_DIR ${LIBARCHIVE_ROOT}/include)
+
+    if (MSVC)
+        include_directories (SYSTEM ${LIBARCHIVE_INCLUDE_DIR})
+
+        determine_compiler_and_arch()
+
+        if (${ARCH} MATCHES "x64")
+            set(LIBARCHIVE_LIBRARIES ${LIBARCHIVE_ROOT}/lib64-msvc-${VS_VERSION}/archive_static.lib)
+        elseif (${ARCH} MATCHES "x86")
+            set(LIBARCHIVE_LIBRARIES ${LIBARCHIVE_ROOT}/lib-msvc-${VS_VERSION}/archive_static.lib)
+        endif()
+    elseif(CMAKE_HOST_APPLE)
+        include_directories (SYSTEM ${LIBARCHIVE_INCLUDE_DIR})
+
+        set(LIBARCHIVE_LIBRARIES ${LIBARCHIVE_ROOT}/lib/libarchive.a)
+    else()
+        find_package(LibArchive)
+    endif()
+endmacro()


Use FIND_PACKAGE_HANDLE_STANDARD_ARGS

Use FIND_PACKAGE_HANDLE_STANDARD_ARGS

svn path=/trunk/KDE/kdenetwork/cmake/modules/FindDecibel.cmake; revision=713886

--- cmake/modules/FindDecibel.cmake
+++ cmake/modules/FindDecibel.cmake
@@ -39,18 +39,7 @@

 set(DECIBEL_LIBRARIES ${QT_TAPIOCA_LIBRARY})

-if (DECIBEL_INCLUDES AND DECIBEL_LIBRARIES)
-   set(DECIBEL_FOUND TRUE)
-endif (DECIBEL_INCLUDES AND DECIBEL_LIBRARIES)
-
-if (DECIBEL_FOUND)
-  if (NOT Decibel_FIND_QUIETLY)
-    message(STATUS "Found Decibel: ${DECIBEL_LIBRARIES}")
-  endif (NOT Decibel_FIND_QUIETLY)
-else (DECIBEL_FOUND)
-  if (Decibel_FIND_REQUIRED)
-    message(FATAL_ERROR "Could NOT find Decibel")
-  endif (Decibel_FIND_REQUIRED)
-endif (DECIBEL_FOUND)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Decibel DEFAULT_MSG DECIBEL_INCLUDES DECIBEL_LIBRARIES )

 MARK_AS_ADVANCED(QT_TAPIOCA_INCLUDE_DIR QT_TAPIOCA_LIBRARY)


Removed unnecessary changes.

Removed unnecessary changes.

--- cmake_modules/ZorbaModule.cmake
+++ cmake_modules/ZorbaModule.cmake
@@ -518,10 +518,8 @@
     ELSE (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
       # Copy jar to jars/ directory and add relative path to classpath file
       GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
-      IF (WIN32)
-        ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" ""
-	  "${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
-      ENDIF (WIN32)
+      ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" ""
+        "${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
       FILE (APPEND "${_CP_FILE}" "${_output_filename}\n")
     ENDIF (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)


fix cmake if() consistency

fix cmake if() consistency

--- cmakemodules/script_xsens.cmake
+++ cmakemodules/script_xsens.cmake
@@ -8,7 +8,7 @@
 	set(DEFAULT_BUILD_MT4 "OFF")
 	if (HAVE_WINUSB_H AND NOT MINGW)
 		set(DEFAULT_BUILD_MT4 "ON")
-	endif (HAVE_WINUSB_H)
+	endif ()
 else()
 	set(DEFAULT_BUILD_MT4 "OFF")
 	if (PKG_CONFIG_FOUND)
@@ -16,13 +16,13 @@
 		PKG_CHECK_MODULES(PKG_LIBUDEV  QUIET libudev)
 		if(PKG_LIBUSB10_FOUND AND PKG_LIBUDEV_FOUND)
 			set(DEFAULT_BUILD_MT4 "ON")
-		endif(PKG_LIBUSB10_FOUND AND PKG_LIBUDEV_FOUND)
+		endif()

 		if (PKG_LIBUDEV_FOUND)
 			set(CMAKE_MRPT_HAS_LIBUDEV 1)
 			set(CMAKE_MRPT_HAS_LIBUDEV_SYSTEM 1)
-		endif (PKG_LIBUDEV_FOUND)
-	endif (PKG_CONFIG_FOUND)
+		endif ()
+	endif ()
 endif()
 set(BUILD_XSENS "${DEFAULT_BUILD_MT4}" CACHE BOOL "Build xSens 4th generation libraries (interface 4th generation xSens MT* devices)")

@@ -32,7 +32,7 @@
 	set(BUILD_XSENS OFF CACHE BOOL "Build xSens 4th generation libraries (interface 4th generation xSens MT* devices)" FORCE)
 	# Warning msg:
 	message(STATUS "*Warning*: Disabling XSens MT4 due to lack of required libs (libusb1.0 & libudev)")
-endif ("${DEFAULT_BUILD_MT4}" STREQUAL "OFF" AND BUILD_XSENS)
+endif ()

 # checks for MT4:
 if (BUILD_XSENS)
@@ -47,9 +47,9 @@
 		if(PKG_LIBUSB10_FOUND)
 			# Perfect, we have libusb-1.0
 			set(XSENS4_LIBS ${XSENS4_LIBS} ${PKG_LIBUDEV_LIBRARIES})
-		else(PKG_LIBUSB10_FOUND)
+		else()
 			message(SEND_ERROR "BUILD_XSENS requires libusb-1.0. Install it or disable BUILD_XSENS")
-		endif(PKG_LIBUSB10_FOUND)
+		endif()

 		# In Linux: libdev
 		if (PKG_LIBUDEV_FOUND)


Update linux configuration (#4052)

Update linux configuration (#4052)


Move use of option values after call to ROOT_APPLY_OPTIONS()

Option values *must not be used* before calling the function
ROOT_APPLY_OPTIONS(). This function is responsible for setting
all values using the defaults and what was passed on the command
line, so values before the call are not what the user asked for.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -328,13 +328,13 @@
 #---webgui by default always build together with root7-----------------------------------------
 set(webgui_defvalue ${root7_defvalue})

+#---Define at moment the options with the selected default values-----------------------------
+ROOT_APPLY_OPTIONS()
+
 #---roottest option implies testing
 if(roottest OR rootbench)
   set(testing ON CACHE BOOL "" FORCE)
 endif()
-
-#---Define at moment the options with the selected default values-----------------------------
-ROOT_APPLY_OPTIONS()

 if(root7)
   if(NOT CMAKE_CXX_STANDARD)


RootBuildOptions.cmake: make tmva-gpu OFF by default

Since CUDA has special requirements for the compiler and C++ standard,
we should require users to enable this by hand to avoid unnecessary
configuration failures with recent compilers or because CUDA has no
support for C++17.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -155,7 +155,7 @@
 ROOT_BUILD_OPTION(thread ON "Enable support for multi-threading (cannot be disabled)")
 ROOT_BUILD_OPTION(tmva ON "Build TMVA multi variate analysis library")
 ROOT_BUILD_OPTION(tmva-cpu ON "Build TMVA with CPU support for deep learning (requires BLAS)")
-ROOT_BUILD_OPTION(tmva-gpu ON "Build TMVA with GPU support for deep learning (requries CUDA)")
+ROOT_BUILD_OPTION(tmva-gpu OFF "Build TMVA with GPU support for deep learning (requries CUDA)")
 ROOT_BUILD_OPTION(tmva-pymva ON "Enable support for Python in TMVA (requires numpy)")
 ROOT_BUILD_OPTION(tmva-rmva OFF "Enable support for R in TMVA")
 ROOT_BUILD_OPTION(unuran OFF "Enable support for UNURAN (package for generating non-uniform random numbers)")


RootBuildOptions.cmake: remove logic that breaks default settings

Before calling ROOT_APPLY_OPTIONS(), no options are set yet, which
means the else() is always taken here, turning off all tmva components
unless one specifies -Dtmva=ON on the CMake command line.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -184,21 +184,6 @@
   set(pch_defvalue OFF)
 endif(runtime_cxxmodules)

-#--- TMVA --------------------------------------------------------------------------------------
-# User can specify either old name or new name for enabling rmva
-if (tmva)
-  if (r OR tmva-rmva)
-    set(r ON)
-    set(tmva-rmva ON)
-  endif()
-else()
-  set(tmva-cpu OFF CACHE BOOL "Disabled because tmva is disabled (${tmva-cpu_description})" FORCE)
-  set(tmva-gpu OFF CACHE BOOL "Disabled because tmva is disabled (${tmva-gpu_description})" FORCE)
-  set(tmva-rmva OFF CACHE BOOL "Disabled because tmva is disabled (${tmva-rmva_description})" FORCE)
-  set(tmva-pymva OFF CACHE BOOL "Disabled because tmva is disabled (${tmva-pymva_description})" FORCE)
-endif()
-
-
 #--- Compression algorithms in ROOT-------------------------------------------------------------
 set(compression_default "zlib" CACHE STRING "Default compression algorithm (zlib (default), lz4, or lzma)")
 string(TOLOWER "${compression_default}" compression_default)


Use cocoa as default only with Clang on MacOSX > 10.7

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -54,12 +54,13 @@
 elseif(APPLE)
   execute_process(COMMAND sw_vers "-productVersion" COMMAND cut -d . -f 1-2
                   OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(x11_defvalue OFF)
   set(memstat_defvalue ON)
   set(explicitlink_defvalue ON)
-  if(MACOSX_VERSION VERSION_GREATER 10.7)
+  if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
+    set(x11_defvalue OFF)
     set(cocoa_defvalue ON)
   else()
+    set(x11_defvalue ON)
     set(cocoa_defvalue OFF)
   endif()
   set(davix_defvalue OFF)


Make 'freetype' package cacheable

Make 'freetype' package cacheable

--- cmake/projects/freetype/hunter.cmake
+++ cmake/projects/freetype/hunter.cmake
@@ -5,6 +5,7 @@
 endif()

 include(hunter_add_version)
+include(hunter_cacheable)
 include(hunter_download)
 include(hunter_pick_scheme)

@@ -20,4 +21,5 @@
 )

 hunter_pick_scheme(DEFAULT url_sha1_cmake)
+hunter_cacheable(freetype)
 hunter_download(PACKAGE_NAME freetype)


Wrong assumption on cmake copy

Wrong assumption on cmake copy

--- CI/main_packages.cmake
+++ CI/main_packages.cmake
@@ -39,7 +39,8 @@
 set ( PROJECT_SOURCE_DIR "${CTEST_SOURCE_DIRECTORY}" )

 # Copy back xdk for RUN_PATH reason
-file ( COPY "${OTB_SOURCE_DIR}/install" DESTINATION "${CI_ROOT_DIR}/xdk")
+# We might want to change the name of artifact in main_superbuild
+file ( COPY "${OTB_SOURCE_DIR}/install/xdk" DESTINATION "${CI_ROOT_DIR}/xdk")
 # Packages case:
 # SUPERBUILD_BINARY_DIR this is needed for OTB_BINARY_DIR, not sure we need it
 # SUPERBUILD_INSTALL_DIR do we need it? it seems so... We will set it to anything


COMP: no need to add OSGEO4W_INCLUDE in find_path, this is done by FindOSGeo4W (actually the OSGEO4W_INCLUDE var is not even defined anymore)

--- CMake/ImportGdal.cmake
+++ CMake/ImportGdal.cmake
@@ -64,7 +64,7 @@
   MATH(EXPR GDAL_NUM_VERSION "((${GDAL_VERSION_MAJOR})*100+${GDAL_VERSION_MINOR})*100+${GDAL_VERSION_PATCH}")

   # Find geotiff headers
-  FIND_PATH(GEOTIFF_INCLUDE_DIRS geotiff.h ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include/geotiff /usr/include/libgeotiff)
+  FIND_PATH(GEOTIFF_INCLUDE_DIRS geotiff.h ${GDAL_INCLUDE_DIR} /usr/include/geotiff /usr/include/libgeotiff)
   MARK_AS_ADVANCED(GEOTIFF_INCLUDE_DIRS)
   IF (NOT GEOTIFF_INCLUDE_DIRS)
   MESSAGE(FATAL_ERROR
@@ -72,7 +72,7 @@
   ENDIF (NOT GEOTIFF_INCLUDE_DIRS)

   # Find tiff headers
-  FIND_PATH(TIFF_INCLUDE_DIRS tiffio.h ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include)
+  FIND_PATH(TIFF_INCLUDE_DIRS tiffio.h ${GDAL_INCLUDE_DIR} /usr/include)
   MARK_AS_ADVANCED(TIFF_INCLUDE_DIRS)
   IF (NOT TIFF_INCLUDE_DIRS)
   MESSAGE(FATAL_ERROR
@@ -80,7 +80,7 @@
   ENDIF (NOT TIFF_INCLUDE_DIRS)

   # Find jpeg headers
-  FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include)
+  FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h ${GDAL_INCLUDE_DIR} /usr/include)
   MARK_AS_ADVANCED(JPEG_INCLUDE_DIRS)
   IF (NOT JPEG_INCLUDE_DIRS)
   MESSAGE(FATAL_ERROR
@@ -89,7 +89,7 @@
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIRS})

   # Find ogr headers
-  FIND_PATH(OGR_INCLUDE_DIRS ogrsf_frmts.h ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include)
+  FIND_PATH(OGR_INCLUDE_DIRS ogrsf_frmts.h ${GDAL_INCLUDE_DIR} /usr/include)
   MARK_AS_ADVANCED(OGR_INCLUDE_DIRS)
   IF (NOT OGR_INCLUDE_DIRS)
   MESSAGE(FATAL_ERROR


Fix comments in find script

Fix comments in find script

--- template-config.cmake
+++ template-config.cmake
@@ -4,8 +4,8 @@
 # TEMPLATE_LIBRARIES
 # TEMPLATE_INCLUDES

-# TEMPLATE_FIBLIB_LIBRARIES
 # TEMPLATE_FIBLIB_LIBRARY
+# TEMPLATE_FIBLIB_LIBRARY_RELEASE
 # TEMPLATE_FIBLIB_LIBRARY_DEBUG
 # TEMPLATE_FIBLIB_INCLUDE_DIR


use find_package(GTK2) instead of pkg-config to find GTK2

* continue to use pkg-config to find GTK3 (there is no FindGTK3.cmake provided by cmake)
* the FindGTK2.cmake appears to find all the correct gtk2 libraries
* using pkg-config to find GTK2 resulted in differences between CentOS 6 and 7
* issue https://github.com/smanders/externpro/issues/210#issuecomment-414741525

--- projects/use/usexp-wxwidgets-config.cmake
+++ projects/use/usexp-wxwidgets-config.cmake
@@ -89,16 +89,29 @@
     OUTPUT_VARIABLE wxbasename OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
     )
   if(wxbasename MATCHES wx_gtk)
-    find_package(PkgConfig)
-    pkg_check_modules(GTK REQUIRED gtk+-@GTK_VER@.0)
-    if(GTK_FOUND)
-      list(APPEND ${PRJ}_INCLUDE_DIR ${GTK_INCLUDE_DIRS})
-      set(_wx_core_libs ${GTK_LIBRARIES})
+    if(@GTK_VER@ EQUAL 2)
+      # NOTE: previously used pkg-config to find GTK2 and GTK3...
+      # but hit an issue building externpro on CentOS 6 and using that build of
+      # externpro for another project building on CentOS 7: pkg-config with GTK2
+      # didn't return gthread-2.0 and resulted in a link error
+      # libwx_gtk2u_core-3.1.a(corelib_gtk_app.o): undefined reference to symbol 'g_thread_init'
+      # //lib64/libgthread-2.0.so.0: error adding symbols: DSO missing from command line
+      find_package(GTK2 REQUIRED)
+      if(GTK2_FOUND)
+        list(APPEND ${PRJ}_INCLUDE_DIR ${GTK2_INCLUDE_DIRS})
+        set(_wx_core_libs ${GTK2_TARGETS})
+      endif()
+    else()
+      find_package(PkgConfig)
+      pkg_check_modules(GTK REQUIRED gtk+-@GTK_VER@.0)
+      if(GTK_FOUND)
+        list(APPEND ${PRJ}_INCLUDE_DIR ${GTK_INCLUDE_DIRS})
+        set(_wx_core_libs ${GTK_LIBRARIES})
+      endif()
     endif()
     checkLibraryConcat(X11 XGetWindowAttributes _wx_core_libs)
     checkLibraryConcat(Xxf86vm XF86VidModeGetAllModeLines _wx_core_libs)
     checkLibraryConcat(SM SmcOpenConnection _wx_core_libs)
-    # -lgthread-2.0 # TODO: determine if needed and detect appropriately
   endif()
   set(_wx_adv_deps core)
   set(_wx_aui_deps adv html)


Makefile: Adjustments for vectorization

Makefile: Adjustments for vectorization

--- tests/Makefile.cmake
+++ tests/Makefile.cmake
@@ -3,7 +3,7 @@
 COMPILER       ?= $(HIPACC_DIR)/bin/hipacc
 COMMON_INC     ?= -I@OPENCV_INCLUDE_DIRS@ \
                   -I$(TEST_CASE)
-COMPILER_INC   ?= -std=c++11 $(COMMON_INC) \
+COMPILER_INC   ?= $(COMMON_INC) \
                   -I`@CLANG_EXECUTABLE@ -print-file-name=include` \
                   -I`@LLVM_CONFIG_EXECUTABLE@ --includedir` \
                   -I`@LLVM_CONFIG_EXECUTABLE@ --includedir`/c++/v1 \
@@ -51,6 +51,8 @@
 HIPACC_EXPLORE?=off
 HIPACC_TIMING?=off
 HIPACC_TARGET?=Fermi-20
+HIPACC_VEC_WIDTH?=16
+HIPACC_VEC_IS?=sse2

 HIPACC_OPTS=-target $(HIPACC_TARGET)
@@ -68,6 +70,7 @@
 endif
 ifdef HIPACC_VEC
     HIPACC_OPTS+= -vectorize $(HIPACC_VEC)
+    HIPACC_WFV+= -v -v-w $(HIPACC_VEC_WIDTH) -i-s $(HIPACC_VEC_IS)
 endif
 ifdef HIPACC_CONFIG
     HIPACC_OPTS+= -use-config $(HIPACC_CONFIG)
@@ -89,15 +92,15 @@

 cpu:
 	@echo 'Executing Hipacc Compiler for C++:'
-	$(COMPILER) $(TEST_CASE)/main.cpp $(MYFLAGS) $(COMPILER_INC) -emit-cpu $(HIPACC_OPTS) -o main.cc
+	$(COMPILER) $(COMPILER_INC) $(MYFLAGS) -emit-cpu $(HIPACC_WFV) -o main.cc $(TEST_CASE)/main.cpp
 	@echo 'Compiling C++ file using c++:'
-	$(CC_CC) -I$(HIPACC_DIR)/include $(COMMON_INC) $(MYFLAGS) $(OFLAGS) -o main_cpu main.cc $(CC_LINK)
+	$(CC_CC) -I$(HIPACC_DIR)/include $(COMMON_INC) $(MYFLAGS) $(OFLAGS) -m$(HIPACC_VEC_IS) -o main_cpu main.cc $(CC_LINK)
 	@echo 'Executing C++ binary'
 	./main_cpu

 cuda:
 	@echo 'Executing Hipacc Compiler for CUDA:'
-	$(COMPILER) $(TEST_CASE)/main.cpp $(MYFLAGS) $(COMPILER_INC) -emit-cuda $(HIPACC_OPTS) -o main.cu
+	$(COMPILER) $(COMPILER_INC) $(MYFLAGS) -emit-cuda $(HIPACC_OPTS) -o main.cu $(TEST_CASE)/main.cpp
 	@echo 'Compiling CUDA file using nvcc:'
 	$(CU_CC) -I$(HIPACC_DIR)/include $(COMMON_INC) $(MYFLAGS) $(OFLAGS) -o main_cuda main.cu $(CU_LINK)
 	@echo 'Executing CUDA binary'
@@ -105,7 +108,7 @@

 opencl-acc opencl-cpu opencl-gpu:
 	@echo 'Executing Hipacc Compiler for OpenCL:'
-	$(COMPILER) $(TEST_CASE)/main.cpp $(MYFLAGS) $(COMPILER_INC) -emit-$@ $(HIPACC_OPTS) -o main.cc
+	$(COMPILER) $(COMPILER_INC) $(MYFLAGS) -emit-$@ $(HIPACC_OPTS) -o main.cc $(TEST_CASE)/main.cpp
 	@echo 'Compiling OpenCL file using c++:'
 	$(CL_CC) -I$(HIPACC_DIR)/include $(COMMON_INC) $(MYFLAGS) $(OFLAGS) -o main_opencl main.cc $(CL_LINK)
 ifneq ($(HIPACC_TARGET),Midgard)
@@ -116,7 +119,7 @@
 filterscript renderscript:
 	rm -f *.rs *.fs
 	@echo 'Executing Hipacc Compiler for $@:'
-	$(COMPILER) $(TEST_CASE)/main.cpp $(MYFLAGS) $(COMPILER_INC) -emit-$@ $(HIPACC_OPTS) -o main.cc
+	$(COMPILER) $(COMPILER_INC) $(MYFLAGS) -emit-$@ $(HIPACC_OPTS) -o main.cc $(TEST_CASE)/main.cpp
 	mkdir -p build_$@
 ifeq ($(call ifge, $(RS_TARGET_API), 19), true) # build using ndk-build
 	rm -rf build_$@/*


build: Added -pedantic-errors.

build: Added -pedantic-errors.

--- cmake/Modules/DefineCompilerFlags.cmake
+++ cmake/Modules/DefineCompilerFlags.cmake
@@ -9,7 +9,7 @@
     #
     if (${CMAKE_C_COMPILER_ID} MATCHES GNU)
         # add -Wconversion ?
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")


No need to parse the gcov file for the standard library furnished with XCode.

--- cmake/OpenMACoverallsCustomTarget.cmake
+++ cmake/OpenMACoverallsCustomTarget.cmake
@@ -11,7 +11,7 @@
     COMMAND ${CMAKE_COMMAND}
       -DCOVERAGE_SRC_PATH="${PROJECT_SOURCE_DIR}/modules"
       -DCOVERAGE_SRC_EXCLUDED=".*_p.h::.*test.*::.*bindings.*::.*plugins.*"
-      -DCOVERAGE_BIN_EXCLUDED=".*3rdparty.*"
+      -DCOVERAGE_BIN_EXCLUDED=".*3rdparty.*::.*Xcode.*"
       -DCOVERALLS_OUTPUT_FILE="${COVERALLS_FILE}"
       -DCOV_PATH="${PROJECT_BINARY_DIR}"
       -DPROJECT_ROOT="${PROJECT_SOURCE_DIR}"


- Fix regression introduced on commit:
948259e3244d9e39387a2c0734cc990aa833469c

With the introduction of cmake module FindGit on OSVR, it breaks cmake 3.2.0. We don't need to specify the absolute path of this module as the search function will find it by itself.

Discussed with:	rpavlik
Review:		https://github.com/OSVR/OSVR-Core/pull/452

--- cmake/cmake-3.2.0-modules/FindGit.cmake
+++ cmake/cmake-3.2.0-modules/FindGit.cmake
@@ -100,7 +100,6 @@
 # Handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if
 # all listed variables are TRUE

-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 find_package_handle_standard_args(Git
                                   REQUIRED_VARS GIT_EXECUTABLE
                                   VERSION_VAR GIT_VERSION_STRING)


Tweak commentary.

Tweak commentary.

Tweak style using the newly defined GNAT_SHARED_LINKER and
GNAT_EXECUTABLE_BUILDER.

svn path=/trunk/; revision=7410

--- cmake/modules/CMakeAdaInformation.cmake
+++ cmake/modules/CMakeAdaInformation.cmake
@@ -118,18 +118,18 @@
 # <CMAKE_RANLIB>

-# create a Ada shared library
+# create an Ada shared library
 IF(NOT CMAKE_Ada_CREATE_SHARED_LIBRARY)
   SET(CMAKE_Ada_CREATE_SHARED_LIBRARY
-      "<CMAKE_Ada_COMPILER> <CMAKE_SHARED_LIBRARY_Ada_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Ada_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+      "${GNAT_SHARED_LINKER} <CMAKE_SHARED_LIBRARY_Ada_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Ada_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
 ENDIF(NOT CMAKE_Ada_CREATE_SHARED_LIBRARY)

-# create a Ada shared module just copy the shared library rule
+# create an Ada shared module just copy the shared library rule
 IF(NOT CMAKE_Ada_CREATE_SHARED_MODULE)
   SET(CMAKE_Ada_CREATE_SHARED_MODULE ${CMAKE_Ada_CREATE_SHARED_LIBRARY})
 ENDIF(NOT CMAKE_Ada_CREATE_SHARED_MODULE)

-# create a Ada static library
+# create an Ada static library
 IF(NOT CMAKE_Ada_CREATE_STATIC_LIBRARY)
   SET(CMAKE_Ada_CREATE_STATIC_LIBRARY
       "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "
@@ -139,15 +139,13 @@
 # compile a Ada file into an object file
 IF(NOT CMAKE_Ada_COMPILE_OBJECT)
   SET(CMAKE_Ada_COMPILE_OBJECT
-    "<CMAKE_Ada_COMPILER> <FLAGS> -o <OBJECT> -c <SOURCE>")
+    "<CMAKE_Ada_COMPILER> <FLAGS> -c <SOURCE> -o <OBJECT>
+    ")
 ENDIF(NOT CMAKE_Ada_COMPILE_OBJECT)

-# Assumption:
-# The programme gnatmake is assumed available since gnatgcc has already
-# been proved to be available.
-# Constraints:
-# gnatmake is required to do the binding and linking of Ada executables,
-# and it requires a source file name which is constructed from
+# Constraints:  GNAT_EXECUTABLE_BUILDER = gnatmake
+# is required to do the compile+bind+link of
+# Ada executables, and it requires a source file name which is constructed from
 # <TARGET>.adb.  The source file arguments of add_executable are
 # all compiled by the above rule (which must remain that form since it
 # is also used to compile objects for Ada libraries), but the results are
@@ -169,13 +167,14 @@

 # In sum, you have to be careful of your target name, the nominal source file
 # name has to be compilable, but otherwise it is ignored, and you must specify
-# the required -aI and other gnatmake options using LINK_FLAGS specified
-# with set_target_properties.  However, so long as you pay attention to these
+# the required -aI and other CMAKE_Ada_COMPILER = gnatmake options
+# using LINK_FLAGS specified with set_target_properties.
+# However, so long as you pay attention to these
 # constraints, add_executable should work for the Ada language.

 IF(NOT CMAKE_Ada_LINK_EXECUTABLE)
   SET(CMAKE_Ada_LINK_EXECUTABLE
-    "gnatmake <FLAGS> <CMAKE_Ada_LINK_FLAGS> <LINK_FLAGS> <TARGET>.adb -largs <LINK_LIBRARIES>")
+    "${GNAT_EXECUTABLE_BUILDER} <FLAGS> <CMAKE_Ada_LINK_FLAGS> <LINK_FLAGS> <TARGET>.adb -largs <LINK_LIBRARIES>")
 ENDIF(NOT CMAKE_Ada_LINK_EXECUTABLE)

 IF(CMAKE_Ada_STANDARD_LIBRARIES_INIT)


Don't destroy existing CMAKE_FLAGS environment variables if already set for unix-likes

--- cmake_scripts/default_build_setup.cmake
+++ cmake_scripts/default_build_setup.cmake
@@ -28,7 +28,7 @@

 if (UNIX)
     # flags apply for both Linux and OSX!
-    set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra $")
     if (DISABLE_CXX11_ABI)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
     endif()
@@ -43,7 +43,7 @@
         set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "--coverage")
     endif()
 else()
-    set(CMAKE_CXX_FLAGS "/W3 /EHsc -DNOMINMAX")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /EHsc -DNOMINMAX")
     set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
     set(CMAKE_CXX_FLAGS_RELEASE "/MT")
 endif()


dist: make check-uptodate depend on check-typekit-uptodate

Otherwise, the generated project will build even though a regeneration
is needed

--- lib/orogen/templates/config/Base.cmake
+++ lib/orogen/templates/config/Base.cmake
@@ -60,11 +60,12 @@
 INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}/<%= Generation::AUTOMATIC_AREA_NAME %>)
 INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR})

+<% if component.typekit %>
 # Take care of the typekit
-<% if component.typekit %>
 ADD_SUBDIRECTORY( ${CMAKE_SOURCE_DIR}/<%= Generation::AUTOMATIC_AREA_NAME %>/typekit )
 INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/<%= Generation::AUTOMATIC_AREA_NAME %>/typekit")
 INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/<%= Generation::AUTOMATIC_AREA_NAME %>/typekit/types")
+add_dependencies(check-uptodate check-typekit-uptodate)
 <% end %>

 # Take care of the task library


with a binutils that does not know XGETBV we rather disable AVX altogether

fixes 487

--- cmake/VcMacros.cmake
+++ cmake/VcMacros.cmake
@@ -149,6 +149,9 @@
          if(_as_version VERSION_LESS "2.18.93")
             UserWarning("Your binutils is too old (${_as_version}). Some optimizations of Vc will be disabled.")
             add_definitions(-DVC_NO_XGETBV) # old assembler doesn't know the xgetbv instruction
+            set(Vc_AVX_INTRINSICS_BROKEN true)
+            set(Vc_XOP_INTRINSICS_BROKEN true)
+            set(Vc_FMA4_INTRINSICS_BROKEN true)
          endif()
       endif()
    endif(APPLE)


specify c99 standard

specify c99 standard

--- cmake/compiler.cmake
+++ cmake/compiler.cmake
@@ -2,8 +2,10 @@

 if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_Fortran_FLAGS_INIT "-fopenmp -Wall -Wextra -Wconversion -std=f2008 -pedantic")
+  set(CMAKE_C_FLAGS_INIT "-Wall -std=c99")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
   set(CMAKE_Fortran_FLAGS_INIT "-openmp -stand f08")
+  set(CMAKE_C_FLAGS_INIT "-std=c99")
 endif()

 set(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--as-needed")


COMP: fix depends of DempsterShafer

COMP: fix depends of DempsterShafer

--- Modules/Learning/DempsterShafer/otb-module.cmake
+++ Modules/Learning/DempsterShafer/otb-module.cmake
@@ -9,7 +9,7 @@
     OTBVectorDataBase
     OTBImageBase
     OTBVectorDataManipulation
-    OTBLearningBase
+    OTBSupervised
     OTBCommon
     OTBMathParser
     OTBFuzzy


Minor style fixes

Minor style fixes

--- PolysquareCommon.cmake
+++ PolysquareCommon.cmake
@@ -8,18 +8,9 @@

 include (CMakeParseArguments)

-option (POLYSQUARE_USE_STRICT_COMPILER "Make compiler warnings errors" ON)
-option (POLYSQUARE_BUILD_TESTS "Build tests" ON)
-option (POLYSQUARE_USE_VERAPP
-        "Check source files for style compliance with vera++" ON)
-option (POLYSQUARE_USE_CPPCHECK
-        "Perform simple static analysis for known bad practices" ON)
-option (POLYSQUARE_USE_PRECOMPILED_HEADERS
-        "Generate precompiled headers for targets where appropriate" ON)
-option (POLYSQUARE_GENERATE_UNITY_BUILD_TARGETS
-        "Generate single-source-file build targets, invoked with target_unity" ON)
-
 function (polysquare_compiler_bootstrap)
+
+    option (POLYSQUARE_USE_STRICT_COMPILER "Make compiler warnings errors" ON)

     set (WERROR)

@@ -47,6 +38,11 @@

 macro (polysquare_cotire_bootstrap COMMON_UNIVERSAL_CMAKE_DIR)

+    option (POLYSQUARE_USE_PRECOMPILED_HEADERS
+            "Generate precompiled headers for targets where appropriate" ON)
+    option (POLYSQUARE_GENERATE_UNITY_BUILD_TARGETS
+            "Generate single-source-file targets, invoked with target_unity" ON)
+
     if (POLYSQUARE_USE_PRECOMPILED_HEADERS OR
         POLYSQUARE_GENERATE_UNITY_BUILD_TARGETS)

@@ -73,6 +69,9 @@

 macro (polysquare_cppcheck_bootstrap)

+    option (POLYSQUARE_USE_CPPCHECK
+            "Perform simple static analysis for known bad practices" ON)
+
     if (POLYSQUARE_USE_CPPCHECK)

         find_program (CPPCHECK_EXECUTABLE cppcheck)
@@ -116,6 +115,9 @@
 endfunction (polysquare_cppcheck_complete_scanning)

 macro (polysquare_vera_bootstrap COMMON_UNIVERSAL_CMAKE_DIR BINARY_DIR)
+
+    option (POLYSQUARE_USE_VERAPP
+            "Check source files for style compliance with vera++" ON)

     if (POLYSQUARE_USE_VERAPP)

@@ -203,6 +205,8 @@

 macro (polysquare_gmock_bootstrap COMMON_UNIVERSAL_CMAKE_DIR)

+    option (POLYSQUARE_BUILD_TESTS "Build tests" ON)
+
     if (POLYSQUARE_BUILD_TESTS)

         set (GMOCK_CMAKE_DIRECTORY
@@ -340,7 +344,8 @@

             endif (CHECKS_UNUSED_CHECK_GROUP)

-            set (INCDIRS ${CHECKS_INTERNAL_INCLUDE_DIRS} ${CHECKS_EXTERNAL_INCLUDE_DIRS})
+            set (INCDIRS ${CHECKS_INTERNAL_INCLUDE_DIRS}
+                         ${CHECKS_EXTERNAL_INCLUDE_DIRS})
             set (SOURCES ${TARGET_SOURCES})
             set (CHECKGEN ${CHECK_GENERATED_UNUSED_OPTION})


Use relative dir for the CBSE target

Use relative dir for the CBSE target

--- cmake/DaemonCBSE.cmake
+++ cmake/DaemonCBSE.cmake
@@ -69,7 +69,8 @@
                 "${output}"
                 "${definition}"
     )
-    string(REPLACE "/" "-" new_target ${definition})
+    string(REPLACE ${CMAKE_SOURCE_DIR}/ "" rel_path ${definition})
+    string(REPLACE "/" "-" new_target ${rel_path})
     add_custom_target(${new_target} ALL
         DEPENDS ${GENERATED_CBSE}
     )