Bugfix: Also rename variables in DEAL_II_ADD_TEST

git-svn-id: 59f82343654cec32357d3b049d399063e4e4cfc7@30553 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/macros/macro_deal_ii_add_test.cmake
+++ deal.II/cmake/macros/macro_deal_ii_add_test.cmake
@@ -30,10 +30,10 @@
 #
 # The following variables must be set:
 #
-# DEAL_II_TEST_DIFF
+# TEST_DIFF
 #   - specifying the executable and command line of the diff command to use
 #
-# DEAL_II_TEST_TIME_LIMIT
+# TEST_TIME_LIMIT
 #   - specifying the maximal wall clock time in seconds a test is allowed
 #     to run
 #
@@ -122,8 +122,7 @@

       ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
         COMMAND
-          # TODO: Refactor...
-          ${DEAL_II_TEST_DIFF}
+          ${TEST_DIFF}
             ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
             ${_comparison}
             > ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
@@ -154,7 +153,7 @@
         )
       SET_TESTS_PROPERTIES(${_category}/${_test} PROPERTIES
         LABEL "${_category}"
-        TIMEOUT ${DEAL_II_TEST_TIME_LIMIT}
+        TIMEOUT ${TEST_TIME_LIMIT}
         )

     ENDIF()


added hack to resolve msg generators from wet since rospack does not find them yet

--- core/roslang/cmake/roslang.cmake
+++ core/roslang/cmake/roslang.cmake
@@ -20,6 +20,19 @@
   endif(${_l}_CMAKE)
 endforeach(_l)

+# Hack to resolve languages from wet which rospack does not support yet
+find_package(catkin REQUIRED COMPONENTS genmsg)
+foreach(_l ${CATKIN_MESSAGE_GENERATORS})
+  string(REPLACE "gen" "ros" _l ${_l})
+  rosbuild_find_ros_package(${_l})
+  if(${_l}_PACKAGE_PATH)
+    set(_cmake_fragment ${${_l}_PACKAGE_PATH}/rosbuild/${_l}.cmake)
+    if(EXISTS ${_cmake_fragment})
+      list(APPEND _cmake_fragments ${_cmake_fragment})
+    endif()
+  endif(${_l}_PACKAGE_PATH)
+endforeach(_l)
+
 # Now include them all
 foreach(_f ${_cmake_fragments})
   if(NOT EXISTS ${_f})


[FIX] Build System: removed duplicated git_wc_info macro

--- util/cmake/FindSeqAn.cmake
+++ util/cmake/FindSeqAn.cmake
@@ -395,23 +395,6 @@

   message (STATUS "  Determined version is ${SEQAN_VERSION_STRING}")
 endif (NOT DEFINED SEQAN_VERSION_STRING)
-
-
-macro(GIT_WC_INFO dir prefix)
-
-  execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=7 HEAD
-    WORKING_DIRECTORY ${dir}
-    ERROR_QUIET
-    OUTPUT_VARIABLE ${prefix}_WC_REVISION
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --simplify-by-decoration --pretty=%ai
-    WORKING_DIRECTORY ${dir}
-    ERROR_QUIET
-    OUTPUT_VARIABLE ${prefix}_WC_LAST_CHANGED_DATE
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-endmacro(GIT_WC_INFO)

 # ----------------------------------------------------------------------------
 # Determine and set SEQAN_DATE and SEQAN_REVISION variables.


omnibus-f4sd cmake config: minor cleanup

--- cmake/configs/nuttx_omnibus-f4sd_default.cmake
+++ cmake/configs/nuttx_omnibus-f4sd_default.cmake
@@ -18,19 +18,12 @@
 	#drivers/blinkm
 	#drivers/camera_trigger
 	drivers/gps
-	#drivers/irlock
-	#drivers/mkblctrl
-	#drivers/oreoled
-	#drivers/pca9685
-	#drivers/pwm_input
 	drivers/px4flow
 	drivers/px4fmu
 	drivers/rgbled
 	drivers/stm32
 	#drivers/stm32/adc
 	#drivers/stm32/tone_alarm
-	#drivers/tap_esc
-	#drivers/vmount
 	modules/sensors

 	#
@@ -38,8 +31,7 @@
 	#
 	systemcmds/bl_update
 	systemcmds/config
-	#systemcmds/dumpfile
-	#systemcmds/esc_calib
+	systemcmds/esc_calib
 	systemcmds/hardfault_log
 	systemcmds/led_control
 	systemcmds/mixer
@@ -50,7 +42,7 @@
 	systemcmds/perf
 	systemcmds/pwm
 	systemcmds/reboot
-	#systemcmds/sd_bench
+	systemcmds/sd_bench
 	systemcmds/top
 	systemcmds/topic_listener
 	systemcmds/tune_control
@@ -80,7 +72,6 @@
 	modules/load_mon
 	modules/mavlink
 	modules/navigator
-	#modules/uavcan

 	#
 	# Estimation modules
@@ -89,7 +80,6 @@
 	modules/ekf2
 	modules/landing_target_estimator
 	modules/local_position_estimator
-	#modules/position_estimator_inav
 	modules/wind_estimator

 	#
@@ -107,7 +97,6 @@
 	# Logging
 	#
 	modules/logger
-	modules/sdlog2

 	#
 	# Library modules


Update FindTBB to use clear var names and to find version info.

--- FindTBB/FindTBB.cmake
+++ FindTBB/FindTBB.cmake
@@ -7,15 +7,23 @@
 #
 #  TBB_FOUND - system has TBB
 #  TBB_INCLUDE_DIRS - the TBB include directories
-#  TBB_LIBRARIES - link these to use TBB
+#  TBB_LIBRARIES - TBB libraries to be lined, doesn't include malloc or
+#                  malloc proxy
+#
+#  TBB_VERSION_MAJOR - Major Product Version Number
+#  TBB_VERSION_MINOR - Minor Product Version Number
+#  TBB_INTERFACE_VERSION - Engineering Focused Version Number
+#  TBB_COMPATIBLE_INTERFACE_VERSION - The oldest major interface version
+#                                     still supported. This uses the engineering
+#                                     focused interface version numbers.
 #
 #  TBB_MALLOC_FOUND - system has TBB malloc library
-#  TBB_MALLOC_INCLUDE_DIRS
-#  TBB_MALLOC_LIBRARIES
+#  TBB_MALLOC_INCLUDE_DIRS - the TBB malloc include directories
+#  TBB_MALLOC_LIBRARIES - The TBB malloc libraries to be lined
 #
 #  TBB_MALLOC_PROXY_FOUND - system has TBB malloc proxy library
-#  TBB_MALLOC_PROXY_INCLUDE_DIRS
-#  TBB_MALLOC_PROXY_LIBRARIES
+#  TBB_MALLOC_PROXY_INCLUDE_DIRS = the TBB malloc proxy include directories
+#  TBB_MALLOC_PROXY_LIBRARIES - The TBB malloc proxy libraries to be lined
 #
 #
 # This module reads hints about search locations from variables:
@@ -54,6 +62,50 @@
 #  FindTBB helper functions and macros
 #

+#===============================================
+# Create search paths based on prefix path
+#===============================================
+macro(create_search_paths PREFIX)
+  foreach(dir ${${PREFIX}_PREFIX_PATH})
+    set(${PREFIX}_INC_SEARCH_PATH ${${PREFIX}_INC_SEARCH_PATH}
+      ${dir}/include ${dir}/Include ${dir}/include/${PREFIX})
+    set(${PREFIX}_LIB_SEARCH_PATH ${${PREFIX}_LIB_SEARCH_PATH}
+      ${dir}/lib ${dir}/Lib ${dir}/lib/${PREFIX} ${dir}/Libs)
+  endforeach(dir)
+endmacro(create_search_paths)
+
+#===============================================
+# Do the final processing for the package find.
+#===============================================
+macro(findpkg_finish PREFIX)
+  # skip if already processed during this run
+  if (NOT ${PREFIX}_FOUND)
+    if (${PREFIX}_INCLUDE_DIR AND ${PREFIX}_LIBRARY)
+      set(${PREFIX}_FOUND TRUE)
+      set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIR})
+      set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARY})
+    else ()
+      if (${PREFIX}_FIND_REQUIRED AND NOT ${PREFIX}_FIND_QUIETLY)
+        message(FATAL_ERROR "Required library ${PREFIX} not found.")
+      endif ()
+    endif ()
+
+   #mark the following variables as internal variables
+   mark_as_advanced(${PREFIX}_INCLUDE_DIR
+                    ${PREFIX}_LIBRARY
+                    ${PREFIX}_LIBRARY_DEBUG
+                    ${PREFIX}_LIBRARY_RELEASE)
+  endif ()
+endmacro(findpkg_finish)
+
+#===============================================
+# Generate debug names from given RELEASEease names
+#===============================================
+macro(get_debug_names PREFIX)
+  foreach(i ${${PREFIX}})
+    set(${PREFIX}_DEBUG ${${PREFIX}_DEBUG} ${i}d ${i}D ${i}_d ${i}_D ${i}_debug ${i})
+  endforeach(i)
+endmacro(get_debug_names)

 #===============================================
 # See if we have env vars to help us find tbb
@@ -67,90 +119,18 @@
 endmacro(getenv_path)

 #===============================================
-# clear vars if the user changes them
-#===============================================
-macro(clear_if_changed TESTVAR)
-  # test against internal check variable
-  # HACK: Apparently, adding a variable to the cache cleans up the list
-  # a bit. We need to also remove any empty strings from the list, but
-  # at the same time ensure that we are actually dealing with a list.
-  list(APPEND ${TESTVAR} "")
-  list(REMOVE_ITEM ${TESTVAR} "")
-  if (NOT "${${TESTVAR}}" STREQUAL "${${TESTVAR}_INT_CHECK}")
-    message(STATUS "${TESTVAR} changed.")
-    foreach(var ${ARGN})
-      set(${var} "NOTFOUND" CACHE STRING "x" FORCE)
-    endforeach(var)
-  endif ()
-  set(${TESTVAR}_INT_CHECK ${${TESTVAR}} CACHE INTERNAL "x" FORCE)
-endmacro(clear_if_changed)
-
-#===============================================
-# Generate debug names from given release names
-#===============================================
-macro(get_debug_names PREFIX)
-  foreach(i ${${PREFIX}})
-    set(${PREFIX}_DBG ${${PREFIX}_DBG} ${i}d ${i}D ${i}_d ${i}_D ${i}_debug ${i})
-  endforeach(i)
-endmacro(get_debug_names)
-
-
-#===============================================
-# Couple a set of release AND debug libraries
+# Couple a set of RELEASEease AND debug libraries
 #===============================================
 macro(make_library_set PREFIX)
-  if (${PREFIX}_REL AND ${PREFIX}_DBG)
-    set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
-  elseif (${PREFIX}_REL)
-    set(${PREFIX} ${${PREFIX}_REL})
-  elseif (${PREFIX}_DBG)
-    set(${PREFIX} ${${PREFIX}_DBG})
+  if (${PREFIX}_RELEASE AND ${PREFIX}_DEBUG)
+    set(${PREFIX} optimized ${${PREFIX}_RELEASE} debug ${${PREFIX}_DEBUG})
+  elseif (${PREFIX}_RELEASE)
+    set(${PREFIX} ${${PREFIX}_RELEASE})
+  elseif (${PREFIX}_DEBUG)
+    set(${PREFIX} ${${PREFIX}_DEBUG})
   endif ()
 endmacro(make_library_set)

-#===============================================
-# Do the final processing for the package find.
-#===============================================
-macro(create_search_paths PREFIX)
-  foreach(dir ${${PREFIX}_PREFIX_PATH})
-    set(${PREFIX}_INC_SEARCH_PATH ${${PREFIX}_INC_SEARCH_PATH}
-      ${dir}/include ${dir}/Include ${dir}/include/${PREFIX} ${dir}/Headers)
-    set(${PREFIX}_LIB_SEARCH_PATH ${${PREFIX}_LIB_SEARCH_PATH}
-      ${dir}/lib ${dir}/Lib ${dir}/lib/${PREFIX} ${dir}/Libs)
-    set(${PREFIX}_BIN_SEARCH_PATH ${${PREFIX}_BIN_SEARCH_PATH}
-      ${dir}/bin)
-  endforeach(dir)
-  if(ANDROID)
-    set(${PREFIX}_LIB_SEARCH_PATH ${${PREFIX}_LIB_SEARCH_PATH} ${OGRE_DEPENDENCIES_DIR}/lib/${ANDROID_ABI})
-  endif()
-  set(${PREFIX}_FRAMEWORK_SEARCH_PATH ${${PREFIX}_PREFIX_PATH})
-endmacro(create_search_paths)
-
-#===============================================
-# Do the final processing for the package find.
-#===============================================
-macro(findpkg_finish PREFIX)
-  # skip if already processed during this run
-  if (NOT ${PREFIX}_FOUND)
-    if (${PREFIX}_INCLUDE_DIR AND ${PREFIX}_LIBRARY)
-      set(${PREFIX}_FOUND TRUE)
-      set(${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIR})
-      set(${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARY})
-      if (NOT ${PREFIX}_FIND_QUIETLY)
-        message(STATUS "Found ${PREFIX}: ${${PREFIX}_LIBRARIES}")
-      endif ()
-    else ()
-      if (NOT ${PREFIX}_FIND_QUIETLY)
-        message(STATUS "Could not locate ${PREFIX}")
-      endif ()
-      if (${PREFIX}_FIND_REQUIRED)
-        message(FATAL_ERROR "Required library ${PREFIX} not found! Install the library (including dev packages) and try again. If the library is already installed, set the missing variables manually in cmake.")
-      endif ()
-    endif ()
-
-    mark_as_advanced(${PREFIX}_INCLUDE_DIR ${PREFIX}_LIBRARY ${PREFIX}_LIBRARY_REL ${PREFIX}_LIBRARY_DBG ${PREFIX}_LIBRARY_FWK)
-  endif ()
-endmacro(findpkg_finish)

 #=============================================================================
 #  Now to actually find TBB
@@ -158,20 +138,14 @@

 # Get path, convert backslashes as ${ENV_${var}}
 getenv_path(TBB_ROOT)
-
-# get the arch, only used by windows
-set(TBB_ARCH_PLATFORM $ENV{TBB_ARCH_PLATFORM})
-
 # construct search paths
 set(TBB_PREFIX_PATH ${TBB_ROOT} ${ENV_TBB_ROOT})
-
-# redo search if prefix path changed
-clear_if_changed(
-  TBB_PREFIX_PATH
-  TBB_LIBRARY_REL
-  TBB_LIBRARY_DBG
-  TBB_INCLUDE_DIR
-  )
+create_search_paths(TBB)
+
+# get the arch, only used by windows
+if($ENV{TBB_ARCH_PLATFORM})
+    set(TBB_ARCH_PLATFORM $ENV{TBB_ARCH_PLATFORM})
+endif()

 # For Windows, let's assume that the user might be using the precompiled
 # TBB packages from the main website. These use a rather awkward directory
@@ -224,60 +198,86 @@

 find_path(TBB_INCLUDE_DIR
           NAMES tbb/tbb.h
-          HINTS ${TBB_PREFIX_PATH}
-         )
-
-find_library(TBB_LIBRARY_REL
+          PATHS ${TBB_INC_SEARCH_PATH})
+
+find_library(TBB_LIBRARY_RELEASE
              NAMES ${TBB_LIBRARY_NAMES}
-             HINTS ${TBB_PREFIX_PATH}
-             )
-
-find_library(TBB_LIBRARY_DBG
-             NAMES ${TBB_LIBRARY_NAMES_DBG}
-             HINTS ${TBB_PREFIX_PATH})
-
+             PATHS ${TBB_LIB_SEARCH_PATH})
+find_library(TBB_LIBRARY_DEBUG
+             NAMES ${TBB_LIBRARY_NAMES_DEBUG}
+             PATHS ${TBB_LIB_SEARCH_PATH})
 make_library_set(TBB_LIBRARY)
+
 findpkg_finish(TBB)

+#if we haven't found TBB no point on going any further
 if (NOT TBB_FOUND)
   return()
 endif ()

-
+#=============================================================================
 # Look for TBB's malloc package
 set(TBB_MALLOC_LIBRARY_NAMES tbbmalloc)
 get_debug_names(TBB_MALLOC_LIBRARY_NAMES)

 find_path(TBB_MALLOC_INCLUDE_DIR
           NAMES tbb/tbb.h
-          PATHS ${TBB_PREFIX_PATH})
-
-find_library(TBB_MALLOC_LIBRARY_REL
+          PATHS ${TBB_INC_SEARCH_PATH})
+
+find_library(TBB_MALLOC_LIBRARY_RELEASE
              NAMES ${TBB_MALLOC_LIBRARY_NAMES}
-             PATHS ${TBB_PREFIX_PATH})
-
-find_library(TBB_MALLOC_LIBRARY_DBG
-             NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG}
-             PATHS ${TBB_PREFIX_PATH})
-
+             PATHS ${TBB_LIB_SEARCH_PATH})
+find_library(TBB_MALLOC_LIBRARY_DEBUG
+             NAMES ${TBB_MALLOC_LIBRARY_NAMES_DEBUG}
+             PATHS ${TBB_LIB_SEARCH_PATH})
 make_library_set(TBB_MALLOC_LIBRARY)
+
 findpkg_finish(TBB_MALLOC)

+#=============================================================================
 # Look for TBB's malloc proxy package
 set(TBB_MALLOC_PROXY_LIBRARY_NAMES tbbmalloc_proxy)
 get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES)

 find_path(TBB_MALLOC_PROXY_INCLUDE_DIR
           NAMES tbb/tbbmalloc_proxy.h
-          PATHS ${TBB_PREFIX_PATH})
-
-find_library(TBB_MALLOC_PROXY_LIBRARY_REL
+          PATHS ${TBB_INC_SEARCH_PATH})
+
+find_library(TBB_MALLOC_PROXY_LIBRARY_RELEASE
              NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES}
-             PATHS ${TBB_PREFIX_PATH})
-
-find_library(TBB_MALLOC_PROXY_LIBRARY_DBG
-             NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG}
-             PATHS ${TBB_PREFIX_PATH})
-
+             PATHS ${TBB_LIB_SEARCH_PATH})
+find_library(TBB_MALLOC_PROXY_LIBRARY_DEBUG
+             NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DEBUG}
+             PATHS ${TBB_LIB_SEARCH_PATH})
 make_library_set(TBB_MALLOC_PROXY_LIBRARY)
+
 findpkg_finish(TBB_MALLOC_PROXY)
+
+
+#=============================================================================
+#parse all the version numbers from tbb
+if(NOT TBB_VERSION)
+
+ #only read the start of the file
+ file(READ
+      "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h"
+      TBB_VERSION_CONTENTS
+      LIMIT 2048)
+
+  string(REGEX REPLACE
+    ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1"
+    TBB_VERSION_MAJOR "${TBB_VERSION_CONTENTS}")
+
+  string(REGEX REPLACE
+    ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1"
+    TBB_VERSION_MINOR "${TBB_VERSION_CONTENTS}")
+
+  string(REGEX REPLACE
+        ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1"
+        TBB_INTERFACE_VERSION "${TBB_VERSION_CONTENTS}")
+
+  string(REGEX REPLACE
+        ".*#define TBB_COMPATIBLE_INTERFACE_VERSION ([0-9]+).*" "\\1"
+        TBB_COMPATIBLE_INTERFACE_VERSION "${TBB_VERSION_CONTENTS}")
+
+endif()


[FIX] make static inclusion of lpthread work on bsd

--- util/cmake/seqan-config.cmake
+++ util/cmake/seqan-config.cmake
@@ -296,13 +296,17 @@

 if ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") OR (${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") OR (${CMAKE_SYSTEM_NAME} STREQUAL "GNU"))
   set (SEQAN_LIBRARIES ${SEQAN_LIBRARIES} rt)
+endif ()
+
+if (UNIX AND NOT APPLE)
   if ((CMAKE_CXX_FLAGS MATCHES "-static") OR (SEQAN_CXX_FLAGS MATCHES "-static") OR (CMAKE_EXE_LINKER_FLAGS MATCHES "-static"))
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
   else ()
     set (SEQAN_LIBRARIES ${SEQAN_LIBRARIES} pthread)
   endif ()
-elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") OR (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD"))
-  set (SEQAN_LIBRARIES ${SEQAN_LIBRARIES} pthread)
+endif ()
+
+if ((${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") OR (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD"))
   set (SEQAN_DEFINITIONS ${SEQAN_DEFINITIONS} "-D_GLIBCXX_USE_C99=1")
 endif ()


MinGW now has a new dependency DLL that must be included in the installation

--- win/installer.nsi.cmake
+++ win/installer.nsi.cmake
@@ -108,6 +108,7 @@
   File "${APP_SHORTNAME}.exe"

   File "${QT_DLL_DIR}\mingwm10.dll"
+  File "${QT_DLL_DIR}\libgcc_s_dw2-1.dll"

   File "qt.conf"
   File "${QT_DLL_DIR}\QtCore4.dll"
@@ -147,6 +148,7 @@
   Delete "$INSTDIR\${APP_SHORTNAME}.exe"

   Delete "$INSTDIR\mingwm10.dll"
+  Delete "$INSTDIR\libgcc_s_dw2-1.dll"

   Delete "$INSTDIR\qt.conf"
   Delete "$INSTDIR\QtCore4.dll"


fix CMake syntax

fix CMake syntax

--- fastrtps_cmake_module/cmake/Modules/FindFastRTPS.cmake
+++ fastrtps_cmake_module/cmake/Modules/FindFastRTPS.cmake
@@ -45,4 +45,4 @@
 endif()

 find_path(FastRTPS_INCLUDE_DIR
-    NAMES fastrtps/
+    NAMES fastrtps/)


cmake: test format options together

cmake: test format options together

Fixes: #47588

Use `check_set_compiler_property(... "SHELL:-Wformat -W<format-option>")`
to ensure that compiler options requiring `-Wformat` to work properly
are tested with said option.

Signed-off-by: Torsten Rasmussen <a7c5b1d5a1f41fce6edfa3f7c2392ae0c59deafe@nordicsemi.no>

--- cmake/compiler/gcc/compiler_flags.cmake
+++ cmake/compiler/gcc/compiler_flags.cmake
@@ -28,9 +28,8 @@
 # GCC Option standard warning base in Zephyr
 check_set_compiler_property(PROPERTY warning_base
     -Wall
-    -Wformat
-    -Wformat-security
-    -Wno-format-zero-length
+    "SHELL:-Wformat -Wformat-security"
+    "SHELL:-Wformat -Wno-format-zero-length"
     -Wno-main
 )


added a hint that find the installed version of gtest over a one in /usr/lib

--- src/CMake/Findcycluscore.cmake
+++ src/CMake/Findcycluscore.cmake
@@ -39,6 +39,7 @@
   HINTS "${CYCLUS_ROOT_DIR}" "${CYCLUS_ROOT_DIR}/cyclus"
   /usr/local/cyclus /opt/local/cyclus
   PATH_SUFFIXES cyclus/share share)
+MESSAGE(STATUS "CYCLUS_CORE_SHARE_DIR Found : ${CYCLUS_CORE_SHARE_DIR}")

 # Look for the library
 FIND_LIBRARY(CYCLUS_CORE_LIBRARY NAMES cycluscore
@@ -46,13 +47,16 @@
   /usr/local/cyclus/lib /usr/local/cyclus
   /opt/local /opt/local/cyclus
   PATH_SUFFIXES cyclus/lib lib)
+MESSAGE(STATUS "CYCLUS_CORE_LIBRARY Found : ${CYCLUS_CORE_LIBRARY}")

 # Look for the library
 FIND_LIBRARY(CYCLUS_GTEST_LIBRARY NAMES gtest
   HINTS "${CYCLUS_ROOT_DIR}" "${CYCLUS_ROOT_DIR}/cyclus"
+  "${CYCLUS_ROOT_DIR}/lib"  "${CYCLUS_CORE_SHARE_DIR}/../lib"
   /usr/local/cyclus/lib /usr/local/cyclus
   /opt/local/lib /opt/local/cyclus/lib
   PATH_SUFFIXES cyclus/lib lib)
+MESSAGE(STATUS "CYCLUS_GTEST_LIBRARY Found : ${CYCLUS_GTEST_LIBRARY}")

 # Copy the results to the output variables.
 IF (CYCLUS_CORE_INCLUDE_DIR AND CYCLUS_CORE_LIBRARY AND CYCLUS_GTEST_LIBRARY AND CYCLUS_CORE_SHARE_DIR)


Compress fatbins (#7601)

Compress fatbins (#7601)

* compress CUDA device code

Co-authored-by: ptaylor <9b5e68c334274b572dadf4941c134a2f08be9921@me.com>

--- cmake/Utils.cmake
+++ cmake/Utils.cmake
@@ -105,9 +105,10 @@

   if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.18")
     cmake_policy(SET CMP0104 NEW)
-    foreach(ver ${flags})
-      set(CMAKE_CUDA_ARCHITECTURES "${ver}-real;${ver}-virtual;${CMAKE_CUDA_ARCHITECTURES}")
-    endforeach()
+    list(POP_BACK flags latest_arch)
+    list(TRANSFORM flags APPEND "-real")
+    list(APPEND flags ${latest_arch})
+    set(CMAKE_CUDA_ARCHITECTURES ${flags})
     set(CMAKE_CUDA_ARCHITECTURES "${CMAKE_CUDA_ARCHITECTURES}" PARENT_SCOPE)
     message(STATUS "CMAKE_CUDA_ARCHITECTURES: ${CMAKE_CUDA_ARCHITECTURES}")
   else()
@@ -136,7 +137,8 @@
     $<$<COMPILE_LANGUAGE:CUDA>:--expt-extended-lambda>
     $<$<COMPILE_LANGUAGE:CUDA>:--expt-relaxed-constexpr>
     $<$<COMPILE_LANGUAGE:CUDA>:${GEN_CODE}>
-    $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${OpenMP_CXX_FLAGS}>)
+    $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${OpenMP_CXX_FLAGS}>
+    $<$<COMPILE_LANGUAGE:CUDA>:-Xfatbin=-compress-all>)

   if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.18")
     set_property(TARGET ${target} PROPERTY CUDA_ARCHITECTURES ${CMAKE_CUDA_ARCHITECTURES})


restrict clang-tidy checks

restrict clang-tidy checks

--- cmake/utils.cmake
+++ cmake/utils.cmake
@@ -134,8 +134,7 @@
         list(APPEND RUN_CLANG_TIDY_BIN_ARGS
             -clang-tidy-binary ${CLANG_TIDY_BIN}
             -header-filter=.*
-            -checks=clan*,cert*,misc*,perf*,cppc*,read*,mode*,-cert-err58-cpp,-misc-noexcept-move-constructor
-            -j3)
+            -checks=-*,modernize*,performance*,clang-analyzer*)

         add_custom_target(
             tidy


Revert f6f0237 revision.

Revert f6f0237 revision.

--- dep/uv.cmake
+++ dep/uv.cmake
@@ -20,7 +20,10 @@

 set (TBAG_DEP_UV_DEPENDENCIES "")
 if (UNIX)
-    list (APPEND TBAG_DEP_UV_DEPENDENCIES -lpthread -ldl)
+    list (APPEND TBAG_DEP_UV_DEPENDENCIES -lpthread)
+    if (NOT APPLE)
+        list (APPEND TBAG_DEP_UV_DEPENDENCIES -lrt -lnsl -ldl)
+    endif ()
 endif ()

 set (TBAG_DEP_UV_LIBRARIES ${TBAG_DEP_UV_ARCHIVES}


Fix: mingw: undefined reference rand_r

Fix: mingw: undefined reference rand_r

Exclude mingw from ENABLE_OPTIMIZATIONS.

--- cmake/ElektraCompiling.cmake
+++ cmake/ElektraCompiling.cmake
@@ -64,6 +64,7 @@
 	execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
 	if (WIN32)
 		message (STATUS "mingw detected")
+		set (ENABLE_OPTIMIZATIONS OFF CACHE BOOL "Turn on optimizations that trade memory for speed" FORCE)
 	else(WIN32)
 		#not supported by icc:
 		set (EXTRA_FLAGS "${EXTRA_FLAGS} -Wno-deprecated-declarations")


Cmake changes for -llog and -latomic V

Cmake changes for -llog and -latomic V

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -359,7 +359,7 @@
     endif()
   elseif("${LFLAGS_SDK}" STREQUAL "ANDROID")
     list(APPEND result
-        "-ldl" "-llog" "-latomic"
+        "-ldl" "-llog" "-latomic" "-licudata" "-licui18n" "-licuuc"
         "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so")
     list(APPEND library_search_directories
         "${SWIFT_ANDROID_PREBUILT_PATH}/arm-linux-androideabi/lib/armv7-a"


build: tweak the conditional for section_magic

This adjusts the conditional to ensure that the section_magic dependency
is only added on target libraries not host libraries (e.g.
SwiftDemangle).

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -874,7 +874,8 @@

   # The section metadata objects are generated sources, and we need to tell CMake
   # not to expect to find them prior to their generation.
-  if("${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
+  if(SWIFTLIB_SINGLE_TARGET_LIBRARY AND
+     "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
     if("${libkind}" STREQUAL "SHARED")
       set_source_files_properties(${SWIFT_SECTIONS_OBJECT_BEGIN} PROPERTIES GENERATED 1)
       set_source_files_properties(${SWIFT_SECTIONS_OBJECT_END} PROPERTIES GENERATED 1)


Cmake changes for -llog and -latomic II

Cmake changes for -llog and -latomic II

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -362,7 +362,7 @@
         "-ldl" "-llog" "-latomic"
         "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so")
     list(APPEND library_search_directories
-        "${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/arm-linux-androideabi/lib/armv7-a"
+        "${SWIFT_ANDROID_PREBUILT_PATH}/arm-linux-androideabi/lib/armv7-a"
         "${SWIFT_ANDROID_PREBUILT_PATH}/lib/gcc/arm-linux-androideabi/${SWIFT_ANDROID_NDK_GCC_VERSION}.x")
   else()
     # If lto is enabled, we need to add the object path flag so that the LTO code


build: allow building gRPC as an alternative to dynamic linking

Co-Authored-By: Leonardo Di Donato <2012e0ca99d70aa6c893822ff73002216e5dba72@gmail.com>
Signed-off-by: Lorenzo Fontana <638e8f0171575864326f06d2a5f8e72287427b15@linux.com>

--- cmake/modules/FindGRPC.cmake
+++ cmake/modules/FindGRPC.cmake
@@ -1,35 +1,68 @@
 #
 # Copyright (C) 2019 The Falco Authors.
 #
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #
-find_path(GRPCXX_INCLUDE NAMES grpc++/grpc++.h)
-if(GRPCXX_INCLUDE)
-	set(GRPC_INCLUDE ${GRPCXX_INCLUDE})
+
+option(BUILD_STATIC_GRPC
+       "Build a static version of gRPC (useful for building in Operating Systems that don't have the gRPC package)" OFF)
+
+if(NOT BUILD_STATIC_GRPC)
+  find_path(GRPCXX_INCLUDE NAMES grpc++/grpc++.h)
+  if(GRPCXX_INCLUDE)
+    set(GRPC_INCLUDE ${GRPCXX_INCLUDE})
+  else()
+    find_path(GRPCPP_INCLUDE NAMES grpcpp/grpcpp.h)
+    set(GRPC_INCLUDE ${GRPCPP_INCLUDE})
+    add_definitions(-DGRPC_INCLUDE_IS_GRPCPP=1)
+  endif()
+  find_library(GRPC_LIB NAMES grpc)
+  find_library(GRPCPP_LIB NAMES grpc++)
+  if(GRPC_INCLUDE
+     AND GRPC_LIB
+     AND GRPCPP_LIB)
+    message(STATUS "Found grpc: include: ${GRPC_INCLUDE}, C lib: ${GRPC_LIB}, C++ lib: ${GRPCPP_LIB}")
+  else()
+    message(FATAL_ERROR "Couldn't find system grpc")
+  endif()
+  find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
+  if(NOT GRPC_CPP_PLUGIN)
+    message(FATAL_ERROR "System grpc_cpp_plugin not found")
+  endif()
 else()
-	find_path(GRPCPP_INCLUDE NAMES grpcpp/grpcpp.h)
-	set(GRPC_INCLUDE ${GRPCPP_INCLUDE})
-	add_definitions(-DGRPC_INCLUDE_IS_GRPCPP=1)
+  find_package(PkgConfig)
+  if(NOT PKG_CONFIG_FOUND)
+    message(FATAL_ERROR "pkg-config binary not found")
+  endif()
+  message(STATUS "Found pkg-config executable: ${PKG_CONFIG_EXECUTABLE}")
+  set(GRPC_SRC "${PROJECT_BINARY_DIR}/grpc-prefix/src/grpc")
+  message(STATUS "Using bundled grpc in '${GRPC_SRC}'")
+  set(GRPC_INCLUDE "${GRPC_SRC}/include")
+  set(GRPC_LIB "${GRPC_SRC}/libs/opt/libgrpc.a")
+  set(GRPCPP_LIB "${GRPC_SRC}/libs/opt/libgrpc++.a")
+  set(GRPC_CPP_PLUGIN "${GRPC_SRC}/bins/opt/grpc_cpp_plugin")
+
+  ExternalProject_Add(
+    grpc
+    URL "https://github.com/grpc/grpc/archive/v1.25.0.tar.gz"
+    URL_MD5 "3a875f7b3f0e3bdd3a603500bcef3d41"
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND
+      CFLAGS=-Wno-implicit-fallthrough
+      PKG_CONFIG=${PKG_CONFIG_EXECUTABLE}
+      make
+      grpc_cpp_plugin
+      static_cxx
+      static_c
+    BUILD_IN_SOURCE 1
+    BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB}
+    INSTALL_COMMAND "")
+
 endif()
-find_library(GRPC_LIB NAMES grpc)
-find_library(GRPCPP_LIB NAMES grpc++)
-if(GRPC_INCLUDE AND GRPC_LIB AND GRPCPP_LIB)
-	message(STATUS "Found grpc: include: ${GRPC_INCLUDE}, C lib: ${GRPC_LIB}, C++ lib: ${GRPCPP_LIB}")
-else()
-	message(FATAL_ERROR "Couldn't find system grpc")
-endif()
-find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
-if(NOT GRPC_CPP_PLUGIN)
-	message(FATAL_ERROR "System grpc_cpp_plugin not found")
-endif()


STYLE: Do not build test when building extension

--- DTI-Reg.cmake
+++ DTI-Reg.cmake
@@ -28,6 +28,7 @@
   SET(INSTALL_RUNTIME_DESTINATION ${Slicer_INSTALL_CLIMODULES_BIN_DIR})
   SET(INSTALL_LIBRARY_DESTINATION ${Slicer_INSTALL_CLIMODULES_LIB_DIR})
   SET(INSTALL_ARCHIVE_DESTINATION ${Slicer_INSTALL_CLIMODULES_LIB_DIR})
+  set(BUILD_TESTING OFF)
 endif()

 SETIFEMPTY(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin)


Added possibility to add icons to applications

First implementation only for windows (tested) and Mac (not tested yet)

--- BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake
+++ BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake
@@ -76,19 +76,39 @@
 link_directories(${MITK_LINK_DIRECTORIES})

 # -----------------------------------------------------------------------
+# Add executable icon (Windows)
+# -----------------------------------------------------------------------
+
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/icons/${_APP_NAME}.rc")
+  set(WINDOWS_ICON_RESOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/icons/${_APP_NAME}.rc")
+endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/icons/${_APP_NAME}.rc")
+
+# -----------------------------------------------------------------------
 # Create the executable and link libraries
 # -----------------------------------------------------------------------

 if(_APP_SHOW_CONSOLE)
-  add_executable(${_APP_NAME} MACOSX_BUNDLE ${_APP_SOURCES})
+  add_executable(${_APP_NAME} MACOSX_BUNDLE ${_APP_SOURCES} ${WINDOWS_ICON_RESOURCE_FILE})
 else()
-  add_executable(${_APP_NAME} MACOSX_BUNDLE WIN32 ${_APP_SOURCES})
+  add_executable(${_APP_NAME} MACOSX_BUNDLE WIN32 ${_APP_SOURCES} ${WINDOWS_ICON_RESOURCE_FILE})
 endif()

 target_link_libraries(${_APP_NAME} org_blueberry_osgi ${_APP_LINK_LIBRARIES})
 if(WIN32)
   target_link_libraries(${_APP_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY})
 endif()
+
+# -----------------------------------------------------------------------
+# Add executable icon (Mac)
+# -----------------------------------------------------------------------
+
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/icons/icon.icns")
+  set_target_properties(${_APP_NAME} PROPERTIES MACOSX_BUNDLE_ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/icons/icon.icns")
+  if(APPLE)
+    file(COPY ${MACOSX_BUNDLE_ICON_FILE} DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_APP_NAME}.app/Contents/Resources/")
+    file(INSTALL ${MACOSX_BUNDLE_ICON_FILE} DESTINATION "${_APP_NAME}.app/Contents/Resources/")
+  endif(APPLE)
+endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/icons/icon.icns")

 # -----------------------------------------------------------------------
 # Set build time dependencies


Temporarily disable try_compile as it does not work on older CMake.

--- CMake/Modules/FindUrho3D.cmake
+++ CMake/Modules/FindUrho3D.cmake
@@ -177,12 +177,13 @@
             set (URHO3D_LIB_TYPE SHARED)
         endif ()
     endif ()
-    # Ensure the module has found the library with the right ABI for the chosen compiler and URHO3D_64BIT build option
-    if (NOT IOS AND NOT MSVC)
-        try_compile (COMPILE_RESULT ${CMAKE_BINARY_DIR}/generated/FindUrho3D ${CMAKE_CURRENT_LIST_DIR}/CheckUrho3DLibrary.cpp
-            CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${URHO3D_INCLUDE_DIRS}
-            LINK_LIBRARIES ${URHO3D_LIBRARIES})
-    endif ()
+    # TODO: Ensure the module has found the library with the right ABI for the chosen compiler and URHO3D_64BIT build option
+    #if (NOT IOS AND NOT MSVC)
+    #    try_compile (COMPILE_RESULT ${CMAKE_BINARY_DIR}/generated/FindUrho3D ${CMAKE_CURRENT_LIST_DIR}/CheckUrho3DLibrary.cpp
+    #        CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${URHO3D_INCLUDE_DIRS}
+    #        LINK_LIBRARIES ${URHO3D_LIBRARIES})
+    #endif ()
+    set (COMPILE_RESULT TRUE)
     # For shared library type, also initialize the URHO3D_DLL variable for later use
     if (WIN32)
         if (URHO3D_LIB_TYPE STREQUAL SHARED AND URHO3D_HOME)


Update forge tag for release v3.2.2

Update forge tag for release v3.2.2

--- CMakeModules/build_forge.cmake
+++ CMakeModules/build_forge.cmake
@@ -22,7 +22,7 @@
 ExternalProject_Add(
     forge-ext
     GIT_REPOSITORY https://github.com/arrayfire/forge.git
-    GIT_TAG 84f82e8f54746d75ddf66eeef0e4368881da1f6e
+    GIT_TAG af3.2.2
     PREFIX "${prefix}"
     INSTALL_DIR "${prefix}"
     UPDATE_COMMAND ""


fix wrong local variable access

fix wrong local variable access

--- lib/orogen/templates/config/static_deployer.cmake
+++ lib/orogen/templates/config/static_deployer.cmake
@@ -13,14 +13,13 @@

 <% component.used_toolkits.each do |tk| %>
 pkg_check_modules(<%= tk.name %>_TOOLKIT REQUIRED <%= tk.pkg.name %>)
-include_directories(${<%= name %>_TOOLKIT_INCLUDE_DIRS})
-link_directories(${<%= name %>_TOOLKIT_LIBRARY_DIRS})
+include_directories(${<%= tk.name %>_TOOLKIT_INCLUDE_DIRS})
+link_directories(${<%= tk.name %>_TOOLKIT_LIBRARY_DIRS})
 <% end %>
-<% component.used_task_libraries.each do |pkg|
-    name = pkg.name %>
-pkg_check_modules(<%= name %>_TASKLIB REQUIRED <%= name %>-tasks-${OROCOS_TARGET})
-include_directories(${<%= name %>_TASKLIB_INCLUDE_DIRS})
-link_directories(${<%= name %>_TASKLIB_LIBRARY_DIRS})
+<% component.used_task_libraries.each do |pkg| %>
+pkg_check_modules(<%= pkg.name %>_TASKLIB REQUIRED <%= pkg.name %>-tasks-${OROCOS_TARGET})
+include_directories(${<%= pkg.name %>_TASKLIB_INCLUDE_DIRS})
+link_directories(${<%= pkg.name %>_TASKLIB_LIBRARY_DIRS})
 <% end %>

 include_directories(${OrocosRTT_INCLUDE_DIRS})


Disable 'missing braces' warning message (caused by Clang bug)

--- Builds/CMake/CompileOptions.cmake
+++ Builds/CMake/CompileOptions.cmake
@@ -103,6 +103,7 @@
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 	set(DEFAULT_COMPILE_OPTIONS ${DEFAULT_COMPILE_OPTIONS}
 		-Wall
+		-Wno-missing-braces
 		${WARN_AS_ERROR_FLAGS}
 		-std=c++1z
 	)


fixed: configure python exe so fcd rebuilding works
     : look for XX.Prepare.cmake files when building external projects

git-svn-id: 9c86407f91444b2cc93bb44d37d96a685973386f@2340 4683daeb-ad0f-0410-a623-93161e962ae5

--- CMake/ExternalProjectHelper.cmake
+++ CMake/ExternalProjectHelper.cmake
@@ -92,6 +92,12 @@

   ENDIF(NOT APPLE)

+  #############
+  #### Python
+  #############
+
+  FIND_PACKAGE(PythonInterp)
+
   ##########
   #### boost
   ##########
@@ -240,6 +246,17 @@
 FILE(GLOB_RECURSE OSG_LIBRARY_CONFIG_FILES RELATIVE "${CMAKE_SOURCE_DIR}"
      "./*CMakeLists.Lib.*.txt")

+FOREACH(LIBCONFIGFILE ${OSG_LIBRARY_CONFIG_FILES})
+  GET_FILENAME_COMPONENT(LIBCONFIGDIR "${LIBCONFIGFILE}" PATH)
+  GET_FILENAME_COMPONENT(LIBFILENAME  "${LIBCONFIGFILE}" NAME)
+  STRING(REPLACE "CMakeLists.Lib." "" LIBFILENAME "${LIBFILENAME}")
+  STRING(REPLACE ".txt"            "" LIBFILENAME "${LIBFILENAME}")
+
+  IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBCONFIGDIR}/${LIBFILENAME}.Prepare.cmake)
+    INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/${LIBCONFIGDIR}/${LIBFILENAME}.Prepare.cmake)
+  ENDIF()
+ENDFOREACH(LIBCONFIGFILE)
+
 # run build passes
 FOREACH(PASS ${OSG_CMAKE_PASSES})
     SET(OSG_CMAKE_PASS ${PASS})


COMP: no need for Code/Wrappers/CommandLine in global include dirs

--- CMake/otbIncludeDirectories.cmake
+++ CMake/otbIncludeDirectories.cmake
@@ -75,11 +75,6 @@
       ${OTB_SOURCE_DIR}/Utilities/otbmsinttypes )
 ENDIF(WIN32)

-IF(BUILD_APPLICATIONS)
-  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-    ${OTB_SOURCE_DIR}/Code/Wrappers/CommandLine )
-ENDIF(BUILD_APPLICATIONS)
-
 IF(OTB_USE_PQXX)
   SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
     ${OTB_SOURCE_DIR}/Code/GeospatialAnalysis ${PQXX_INCLUDE_DIR})


Patch [3427552] - FindOpenGLES.cmake doesn't support OpenGL ES 1.1 spec

--HG--
branch : v1-8

--- CMake/Packages/FindOpenGLES.cmake
+++ CMake/Packages/FindOpenGLES.cmake
@@ -42,17 +42,14 @@

   ELSE(APPLE)

-
-
     FIND_PATH(OPENGLES_INCLUDE_DIR GLES/gl.h
       /usr/openwin/share/include
       /opt/graphics/OpenGL/include /usr/X11R6/include
       /usr/include
     )

-
     FIND_LIBRARY(OPENGLES_gl_LIBRARY
-      NAMES GLES_CM
+      NAMES GLES_CM GLESv1_CM
       PATHS /opt/graphics/OpenGL/lib
             /usr/openwin/lib
             /usr/shlib /usr/X11R6/lib
@@ -62,16 +59,13 @@
     # On Unix OpenGL most certainly always requires X11.
     # Feel free to tighten up these conditions if you don't
     # think this is always true.
-    # It's not true on OSX.

     IF (OPENGLES_gl_LIBRARY)
       IF(NOT X11_FOUND)
         INCLUDE(FindX11)
       ENDIF(NOT X11_FOUND)
       IF (X11_FOUND)
-        IF (NOT APPLE)
-          SET (OPENGLES_LIBRARIES ${X11_LIBRARIES})
-        ENDIF (NOT APPLE)
+        SET (OPENGLES_LIBRARIES ${X11_LIBRARIES})
       ENDIF (X11_FOUND)
     ENDIF (OPENGLES_gl_LIBRARY)

@@ -99,4 +93,4 @@
   set(CMAKE_PREFIX_PATH ${CMAKE_SYSYEM_OUT_DIR})
   FIND_LIBRARY(OPENGLES_gl_LIBRARY libgles_cm )
   set(CMAKE_PREFIX_PATH ${ORIGINAL_CMAKE_PREFIX_PATH})
-endif()+endif()


COMP: do not include the (buggy BTW) internal liblas includes unconditionnally to support external liblas mode

--- CMake/otbIncludeDirectories.cmake
+++ CMake/otbIncludeDirectories.cmake
@@ -42,7 +42,6 @@
   ${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim
   ${OTB_SOURCE_DIR}/Utilities/InsightJournal
   ${OTB_SOURCE_DIR}/Utilities/otb6S
-  ${OTB_SOURCE_DIR}/Utilities/otbliblas/include
   ${OTB_SOURCE_DIR}/Utilities/otbedison/segm
   ${OTB_SOURCE_DIR}/Utilities/otbedison/prompt
   ${OTB_SOURCE_DIR}/Utilities/otbedison/edge
@@ -89,6 +88,16 @@
   SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
       ${OTB_SOURCE_DIR}/Utilities/tinyXMLlib)
 ENDIF(OTB_USE_EXTERNAL_TINYXML)
+
+IF(OTB_USE_LIBLAS)
+  IF(OTB_USE_EXTERNAL_LIBLAS)
+    SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+        ${LIBLAS_INCLUDE_DIRS})
+  ELSE()
+    SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+        ${OTB_SOURCE_DIR}/Utilities/otbliblas/include)
+  ENDIF()
+ENDIF()

 IF(OTB_USE_EXTERNAL_MUPARSER)
   SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
@@ -278,7 +287,6 @@
   Utilities/otbsvm
   Utilities/InsightJournal
   Utilities/otb6S
-  Utilities/otbliblas/include
   Utilities/otbedison
   Utilities/otbconfigfile
 )
@@ -335,6 +343,17 @@
         SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
   		        Utilities/FLTK)
 ENDIF(OTB_USE_EXTERNAL_FLTK)
+
+#For liblas headers
+IF(OTB_USE_LIBLAS)
+  IF(OTB_USE_EXTERNAL_LIBLAS)
+    SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
+        ${LIBLAS_INCLUDE_DIRS})
+  ELSE()
+    SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
+        Utilities/otbliblas/include)
+  ENDIF()
+ENDIF()

 #For TinyXML header file
 IF(OTB_USE_EXTERNAL_TINYXML)


COM: OTB-134/OGR -> required directories to use OTB updated

--- CMake/otbIncludeDirectories.cmake
+++ CMake/otbIncludeDirectories.cmake
@@ -269,6 +269,7 @@
   UtilitiesAdapters/OssimAdapters
   UtilitiesAdapters/TinyXMLAdapters
   UtilitiesAdapters/OGRAdapters
+  UtilitiesAdapters
   OBIA
   Fuzzy
   ObjectDetection


CMake: Fix Windows Overlay linking issue by disabling PNG for freetype. (#778)

--- CMake/Dependencies.cmake
+++ CMake/Dependencies.cmake
@@ -152,6 +152,7 @@
         -DCMAKE_INSTALL_PREFIX=${OGREDEPS_PATH}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DBUILD_SHARED_LIBS=${OGREDEPS_SHARED}
+        -DWITH_PNG=OFF
         -DWITH_BZip2=OFF # tries to use it on iOS otherwise
         # workaround for broken iOS toolchain in freetype
         -DPROJECT_SOURCE_DIR=${CMAKE_BINARY_DIR}/freetype-2.9


Use a Qt 4.6.2 compatible qRestAPI version

--- CMakeExternals/CTK.cmake
+++ CMakeExternals/CTK.cmake
@@ -81,7 +81,7 @@
         -DCTK_PLUGIN_org.commontk.configadmin:BOOL=ON
         -DCTK_USE_GIT_PROTOCOL:BOOL=OFF
         -DDCMTK_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_DCMTK_085525e6.tar.gz
-        -DqRestAPI_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/qRestAPI_778ac3f8.tar.gz
+        -DqRestAPI_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/qRestAPI_0d46f8a6.tar.gz
       DEPENDS ${proj_DEPENDENCIES}
      )
   set(CTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)


set PythonQt external to use patched-6 branch

--- distro/superbuild/cmake/externals.cmake
+++ distro/superbuild/cmake/externals.cmake
@@ -196,7 +196,7 @@
 # PythonQt
 ExternalProject_Add(PythonQt
   GIT_REPOSITORY https://github.com/commontk/PythonQt.git
-  GIT_TAG 00e6c6b2
+  GIT_TAG patched-6
   CMAKE_CACHE_ARGS
     ${default_cmake_args}
     ${qt_args}


Split off 8.8.4

Split off 8.8.4

Signed-off-by: Richard Chapman <5900d56196fe29dba8e3ae556d57eae28e9f0195@hpccsystems.com>

--- version.cmake
+++ version.cmake
@@ -5,7 +5,7 @@
 set ( HPCC_PROJECT "nagios-monitoring" )
 set ( HPCC_MAJOR 8 )
 set ( HPCC_MINOR 8 )
-set ( HPCC_POINT 3 )
+set ( HPCC_POINT 5 )
 set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 0 )
 ###


Use python-config exit status instead of stderr

Apparently some versions of python-config complain about unknown flags
to stdout rather than stderr.

--- cmake/FindPythonConfig.cmake
+++ cmake/FindPythonConfig.cmake
@@ -24,11 +24,11 @@
   # --embed first and fallback to python3-config --libs (without --embed) if
   # the previous command fails." -
   # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
-  execute_process(COMMAND ${_Python_config} "--ldflags" "--embed" OUTPUT_VARIABLE PYTHON_LINK_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE PYTHON_EMBED_FAILED)
-  if(PYTHON_EMBED_FAILED)
+  execute_process(COMMAND ${_Python_config} "--ldflags" "--embed" OUTPUT_VARIABLE PYTHON_LINK_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE RESULT_VARIABLE PYTHON_LINK_FLAGS_EMBED_RESULT)
+  if(NOT PYTHON_LINK_FLAGS_EMBED_RESULT EQUAL 0)
     message(STATUS "python-config failed, retrying without --embed")
     execute_process(COMMAND ${_Python_config} "--ldflags" OUTPUT_VARIABLE PYTHON_LINK_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
-  endif(PYTHON_EMBED_FAILED)
+  endif(NOT PYTHON_LINK_FLAGS_EMBED_RESULT EQUAL 0)
   set(_Python_config_message "${PYTHON_COMPILE_FLAGS}; ${PYTHON_LINK_FLAGS}")
   unset(_Python_config)
 else(PYTHONINTERP_FOUND)


Updated sketch parser (ignores forward declerations and added support for var args)

--- cmake/Platform/Arduino.cmake
+++ cmake/Platform/Arduino.cmake
@@ -195,10 +195,15 @@
         set(INPUT_AUTOLIBS False)
     endif()

+    if(NOT INPUT_BOARD)
+        message(FATAL_ERROR "Missing board ID (set ${TARGET_NAME}_BOARD)!")
+    endif()
+
     message(STATUS "Generating ${TARGET_NAME}")

     set(ALL_LIBS)
     set(ALL_SRCS ${INPUT_SRCS} ${INPUT_HDRS})
+

     setup_arduino_compiler(${INPUT_BOARD})
     setup_arduino_core(CORE_LIB ${INPUT_BOARD})
@@ -1081,10 +1086,10 @@
 #
 # Generates C++ sources from Arduino Sketch.
 function(SETUP_ARDUINO_SKETCH SKETCH_PATH OUTPUT_VAR)
+    get_filename_component(SKETCH_NAME "${SKETCH_PATH}" NAME)
+    get_filename_component(SKETCH_PATH "${SKETCH_PATH}" ABSOLUTE)
+
     if(EXISTS "${SKETCH_PATH}")
-        get_filename_component(SKETCH_NAME "${SKETCH_PATH}" NAME)
-        get_filename_component(SKETCH_PATH "${SKETCH_PATH}" ABSOLUTE)
-
         set(SKETCH_CPP  ${CMAKE_CURRENT_BINARY_DIR}/${SKETCH_NAME}.cpp)
         set(MAIN_SKETCH ${SKETCH_PATH}/${SKETCH_NAME})

@@ -1133,6 +1138,9 @@
     file(READ  ${MAIN_SKETCH_PATH} MAIN_SKETCH)

     string(FIND "${MAIN_SKETCH}" "#include" FIRST_INCLUDE_OFFSET REVERSE)
+    if ("${FIRST_INCLUDE_OFFSET}" STREQUAL "-1")
+        set(FIRST_INCLUDE_OFFSET 0)
+    endif()
     string(LENGTH "${MAIN_SKETCH}" MAIN_SKETCH_LENGTH)
     math(EXPR LENGTH_STR1 "${MAIN_SKETCH_LENGTH}-${FIRST_INCLUDE_OFFSET}")
     string(SUBSTRING "${MAIN_SKETCH}" ${FIRST_INCLUDE_OFFSET} ${LENGTH_STR1} STR1)
@@ -1150,7 +1158,11 @@

 	# write the file head
     file(APPEND ${SKETCH_CPP} "\n")
-    file(APPEND ${SKETCH_CPP} "#include \"Arduino.h\"\n")
+    if(ARDUINO_SDK_VERSION VERSION_LESS 1.0)
+        file(APPEND ${SKETCH_CPP} "#include \"WProgram.h\"\n")
+    else()
+        file(APPEND ${SKETCH_CPP} "#include \"Arduino.h\"\n")
+    endif()
     file(APPEND ${SKETCH_CPP} "\n")
     file(APPEND ${SKETCH_CPP} "${SKETCH_HEAD}")

@@ -1158,13 +1170,17 @@
     foreach(SKETCH_SOURCE_PATH ${SKETCH_SOURCES} ${MAIN_SKETCH_PATH})
         #message(STATUS "Sketch: ${SKETCH_SOURCE_PATH}")
         file(READ ${SKETCH_SOURCE_PATH} SKETCH_SOURCE)
-        string(REGEX MATCHALL "[\n]([a-zA-Z]+[ ])*[_a-zA-Z0-9]+([ ]*[\n][\t]*|[ ])[_a-zA-Z0-9]+[ ]?[\n]?[\t]*[ ]*[(]([\t]*[ ]*[*]?[ ]?[a-zA-Z0-9_](\\[([0-9]+)?\\])*[,]?[ ]*[\n]?)*[)]" SKETCH_PROTOTYPES ${SKETCH_SOURCE})
+        string(REGEX MATCHALL "[\n]([a-zA-Z]+[ ])*[_a-zA-Z0-9]+([ ]*[\n][\t]*|[ ])[_a-zA-Z0-9]+[ ]?[\n]?[\t]*[ ]*[(]([\t]*[ ]*[*]?[ ]?[a-zA-Z0-9_](\\[([0-9]+)?\\])*[,]?[ ]*[\n]?)*([,]?[ ]*[\n]?[.][.][.])?[)]([ ]*[\n][\t]*|[ ]){" SKETCH_PROTOTYPES ${SKETCH_SOURCE})

         # Write function prototypes
+        file(APPEND ${SKETCH_CPP} "\n//=== START Forward: ${SKETCH_SOURCE_PATH}\n")
         foreach(SKETCH_PROTOTYPE ${SKETCH_PROTOTYPES})
-            #message(STATUS "\tprototype: ${PROTOTYPE};")
-            file(APPEND ${SKETCH_CPP} "${SKETCH_PROTOTYPE};")
+            string(REPLACE "\n" " " SKETCH_PROTOTYPE "${SKETCH_PROTOTYPE}")
+            string(REPLACE "{" " " SKETCH_PROTOTYPE "${SKETCH_PROTOTYPE}")
+            message(STATUS "\tprototype: ${SKETCH_PROTOTYPE};")
+            file(APPEND ${SKETCH_CPP} "\n${SKETCH_PROTOTYPE};")
 		endforeach()
+        file(APPEND ${SKETCH_CPP} "\n//=== END Forward: ${SKETCH_SOURCE_PATH}\n")
 	endforeach()


[cmake] pkg_search_module add names for elpa

search for `elpa/elpa.h`, since now elpa is included as `elpa/elpa.h`.

elpa appends the version, e.g. elpa_openmp-2019.11.001 to the package config
file. Let cmake search for the two most recent versions to make it more likely
that the build systems finds elpa on its own, e.g. without the user manually
setting env ELPAROOT.

--- cmake/modules/FindElpa.cmake
+++ cmake/modules/FindElpa.cmake
@@ -3,7 +3,13 @@
 include(FindPackageHandleStandardArgs)
 find_package(PkgConfig)

-pkg_search_module(_ELPA elpa elpa_openmp)
+pkg_search_module(_ELPA
+  elpa
+  elpa_openmp
+  elpa_openmp-2019.11.001
+  elpa-2019.05.001
+  elpa-2019.11.001
+  elpa-2019.05.001)

 find_library(ELPA_LIBRARIES
   NAMES elpa elpa_openmp
@@ -15,8 +21,8 @@
   DOC "elpa libraries list")

 find_path(ELPA_INCLUDE_DIR
-  NAMES elpa.h elpa_constants.h
-  PATH_SUFFIXES include/elpa_openmp-$ENV{EBVERSIONELPA}/elpa include/elpa_openmp-$ENV{EBVERSIONELPA} elpa
+  NAMES elpa/elpa.h elpa/elpa_constants.h
+  PATH_SUFFIXES include/elpa_openmp-$ENV{EBVERSIONELPA}
   HINTS
   ${_ELPA_INCLUDE_DIRS}
   ENV ELPAROOT
@@ -24,6 +30,8 @@

 find_package_handle_standard_args(Elpa "DEFAULT_MSG" ELPA_LIBRARIES ELPA_INCLUDE_DIR)

+message("ELPA_INCLUDE_DIR: ${ELPA_INCLUDE_DIR}")
+
 if(Elpa_FOUND AND NOT TARGET sirius::elpa)
   add_library(sirius::elpa INTERFACE IMPORTED)
   set_target_properties(sirius::elpa PROPERTIES


テストexecutable名を変更 "rev" -> "beat"

テストexecutable名を変更 "rev" -> "beat"

--- aux.cmake
+++ aux.cmake
@@ -21,11 +21,11 @@
 	endif()
 endfunction()

-# リストSRCのソースファイルを用いてrev_SUBNAME という名前でテストexecutableを作成
+# リストSRCのソースファイルを用いてbeat_SUBNAME という名前でテストexecutableを作成
 function(AddTest SUBNAME SRC LIB)
 	list(LENGTH SRC LEN)
 	if(${LEN} GREATER 0)
-		string(CONCAT EXENAME rev_ ${SUBNAME})
+		string(CONCAT EXENAME beat_ ${SUBNAME})
 		add_executable(${EXENAME} ${SRC})
 		target_link_libraries(${EXENAME}
 			${LIB}


BUG: Update IOSTL to include new bug fixes upstream

Change-Id: Ibd91ce1bc1873cbf909985e82f149fb67e2507a8

--- Modules/Remote/IOSTL.remote.cmake
+++ Modules/Remote/IOSTL.remote.cmake
@@ -3,5 +3,5 @@
   "This module contains classes for reading and writing QuadEdgeMeshes using
   the STL (STereoLithography)file format. http://hdl.handle.net/10380/3452"
   GIT_REPOSITORY https://github.com/luisibanez/ITKSTLMeshIO.git
-  GIT_TAG dd92020fa5b2c17e32f7b90ef8d285832ada8b0f
+  GIT_TAG ebb492ceeb443b9b41845a5a7d48f3e317a37579
   )


Fixed another typo in the last commit

Fixed another typo in the last commit

--- python_module/cmake/add_python_export_library.cmake
+++ python_module/cmake/add_python_export_library.cmake
@@ -24,13 +24,6 @@
   get_filename_component(PYTHON_PACKAGE_NAME "${TMP}.txt" NAME_WE)
   # This grabs the parent of the leaf
   get_filename_component(PYTHON_MODULE_DIRECTORY_PREFIX "${TMP}.txt" PATH)
-
-  message("TMP: ${TMP}")
-  message("PYTHON_MODULE_DIRECTORY: ${PYTHON_MODULE_DIRECTORY}")
-  message("PYTHON_MODULE_DIRECTORY_PREFIX: ${PYTHON_MODULE_DIRECTORY_PREFIX}")
-  message("PYTHON_PACKAGE_NAME: ${PYTHON_PACKAGE_NAME}")
-  message("CATKIN_DEVEL_PREFIX: ${CATKIN_DEVEL_PREFIX}")
-

   set(SETUP_PY "${CMAKE_CURRENT_SOURCE_DIR}/setup.py")
   if(EXISTS ${SETUP_PY})


Fixed another typo in the last commit

Fixed another typo in the last commit

--- python_module/cmake/add_python_export_library.cmake
+++ python_module/cmake/add_python_export_library.cmake
@@ -39,7 +39,7 @@
 ## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

 from distutils.core import setup
-from catkin_pkg.python_setup import generate_distutils_setup2
+from catkin_pkg.python_setup import generate_distutils_setup

 # fetch values from package.xml
 setup_args = generate_distutils_setup(


Create import targets based on parent target name to avoid conflicts.

This is needed for submodules.

--- VeraPPUtilities.cmake
+++ VeraPPUtilities.cmake
@@ -181,14 +181,16 @@
                              "this command")
     endif (NOT VERAPP_RULES)

+    set (_new_target ${TARGET}_verapp_import_default_rules)
+
     verapp_copy_files_in_dir_to_subdir_on_target (${VERAPP_RULES}
                                                   ${SUBDIRECTORY}
                                                   .tcl
-                                                  verapp_import_default_rules
+                                                  ${_new_target}
                                                   "Vera++ rule")

     add_dependencies (${TARGET}
-                      verapp_import_default_rules)
+                      ${_new_target})
 endfunction (verapp_import_default_rules_into_subdirectory_on_target)

 # verapp_import_default_transformations_into_subdirectory_on_target
@@ -211,14 +213,16 @@
                              "this command")
     endif (NOT VERAPP_TRANSFORMATIONS)

+    set (_new_target ${TARGET}_verapp_import_transformations)
+
     verapp_copy_files_in_dir_to_subdir_on_target (${VERAPP_TRANSFORMATIONS}
                                                   ${SUBDIRECTORY}
                                                   .tcl
-                                                  verapp_import_transformations
+                                                  ${_new_target}
                                                   "Vera++ transformation")

     add_dependencies (${TARGET}
-                      verapp_import_transformations)
+                      ${_new_target})
 endfunction (verapp_import_default_transformations_into_subdirectory_on_target)

 # verapp_import_default_profiles_into_subdirectory_on_target
@@ -241,14 +245,16 @@
                              "this command")
     endif (NOT VERAPP_PROFILES)

+    set (_new_target ${TARGET}_verapp_import_default_profiles)
+
     verapp_copy_files_in_dir_to_subdir_on_target (${VERAPP_PROFILES}
                                                   ${SUBDIRECTORY}
                                                   NO_MATCH
-                                                  verapp_import_default_profiles
+                                                  ${_new_target}
                                                   "Vera++ profile")

     add_dependencies (${TARGET}
-                      verapp_import_default_profiles)
+                      ${_new_target})
 endfunction (verapp_import_default_profiles_into_subdirectory_on_target)

 function (_verapp_check_sources_conformance_invariants MODE)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/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   27)
+SET(KWSYS_DATE_STAMP_DAY   28)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 04)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/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   19)
+SET(KWSYS_DATE_STAMP_DAY   20)


Version 0.1.2

Version 0.1.2

--- vkmm.cmake
+++ vkmm.cmake
@@ -1,4 +1,4 @@

 SET (VKMM_VERSION_MAJOR 0)
 SET (VKMM_VERSION_MINOR 1)
-SET (VKMM_VERSION_REVISION 1)
+SET (VKMM_VERSION_REVISION 2)


Cleanup.

Cleanup.

--- runtime/hipacc_cu.hpp.cmake
+++ runtime/hipacc_cu.hpp.cmake
@@ -579,22 +579,18 @@

 // Create a module from ptx assembly
 void hipaccCreateModule(CUmodule &module, const void *ptx, int cc) {
-    CUresult err = CUDA_SUCCESS;
     CUjit_target target_cc = (CUjit_target) cc;
-    const unsigned opt_level = 3;
-    const int error_log_size = 10240;
-    const int num_options = 4;
+    const unsigned int opt_level = 4;
+    const unsigned int error_log_size = 10240;
+    const unsigned int num_options = 4;
     char error_log_buffer[error_log_size] = { 0 };

     CUjit_option options[] = { CU_JIT_ERROR_LOG_BUFFER, CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES, CU_JIT_TARGET, CU_JIT_OPTIMIZATION_LEVEL };
-    void *option_values[]  = { (void *)error_log_buffer, (void *)(size_t)error_log_size, (void *)target_cc, (void*)(size_t)opt_level };
-
-    // load ptx source
-    err = cuModuleLoadDataEx(&module, ptx, num_options, options, option_values);
-
-    if (err != CUDA_SUCCESS) {
+    void *option_values[]  = { (void *)error_log_buffer, (void *)error_log_size, (void *)target_cc, (void*)opt_level };
+
+    CUresult err = cuModuleLoadDataEx(&module, ptx, num_options, options, option_values);
+    if (err != CUDA_SUCCESS)
         std::cerr << "Error log: " << error_log_buffer << std::endl;
-    }
     checkErrDrv(err, "cuModuleLoadDataEx()");
 }

@@ -617,24 +613,24 @@
     err = nvrtcCreateProgram(&program, cu_string.c_str(), file_name.c_str(), 0, NULL, NULL);
     checkErrNVRTC(err, "nvrtcCreateProgram()");

-    size_t offset = 2;
-    size_t num_options = build_options.size() + offset;
+    int offset = 2;
+    int num_options = build_options.size() + offset;
     const char *options[num_options];
     std::string compute_arch("-arch=compute_" + std::to_string(target_cc));
     options[0] = compute_arch.c_str();
     options[1] = "-std=c++11";
     //options[2] = "-G";
     //options[3] = "-lineinfo";
-    for (size_t i=offset; i<num_options; ++i) options[i] = build_options[i-offset].c_str();
+    for (int i=offset; i<num_options; ++i)
+        options[i] = build_options[i-offset].c_str();

     err = nvrtcCompileProgram(program, num_options, options);
     if (err != NVRTC_SUCCESS) {
         size_t log_size;
         nvrtcGetProgramLogSize(program, &log_size);
-        char *error_log = new char[log_size];
-        nvrtcGetProgramLog(program, error_log);
+        std::string error_log(log_size, '\0');
+        nvrtcGetProgramLog(program, &error_log[0]);
         std::cerr << "Error log: " << error_log << std::endl;
-        delete[] error_log;
     }
     checkErrNVRTC(err, "nvrtcCompileProgram()");

@@ -642,29 +638,27 @@
     err = nvrtcGetPTXSize(program, &ptx_size);
     checkErrNVRTC(err, "nvrtcGetPTXSize()");

-    char *ptx = new char[ptx_size];
-    err = nvrtcGetPTX(program, ptx);
+    std::string ptx(ptx_size, '\0');
+    err = nvrtcGetPTX(program, &ptx[0]);
     checkErrNVRTC(err, "nvrtcGetPTX()");

     err = nvrtcDestroyProgram(&program);
     checkErrNVRTC(err, "nvrtcDestroyProgram()");

-    // compile ptx
-    hipaccCreateModule(module, ptx, cc);
-    delete[] ptx;
+    hipaccCreateModule(module, ptx.c_str(), cc);
 }
 #else
 void hipaccCompileCUDAToModule(CUmodule &module, std::string file_name, int cc, std::vector<std::string> &build_options) {
     std::string command = "${NVCC} -O4 -ptx -arch=compute_" + std::to_string(cc) + " ";
-    for (auto option : build_options) command += option + " ";
+    for (auto option : build_options)
+        command += option + " ";
     command += file_name + " -o " + file_name + ".ptx 2>&1";

     if (auto stream = popen(command.c_str(), "r")) {
         char line[FILENAME_MAX];

-        while (fgets(line, sizeof(char) * FILENAME_MAX, stream)) {
+        while (fgets(line, sizeof(char) * FILENAME_MAX, stream))
             std::cerr << line;
-        }

         int exit_status = pclose(stream);
         if (WEXITSTATUS(exit_status)) {
@@ -682,11 +676,9 @@
         exit(EXIT_FAILURE);
     }

-    std::string ptx_string(std::istreambuf_iterator<char>(ptx_file), (std::istreambuf_iterator<char>()));
-    const char *ptx = (const char *)ptx_string.c_str();
-
-    // compile ptx
-    hipaccCreateModule(module, ptx, cc);
+    std::string ptx(std::istreambuf_iterator<char>(ptx_file), (std::istreambuf_iterator<char>()));
+
+    hipaccCreateModule(module, ptx.c_str(), cc);
 }
 #endif


fixed: repeated inclusion of paramFile.C in sources.cmake

--- source/FORMAT/sources.cmake
+++ source/FORMAT/sources.cmake
@@ -29,7 +29,6 @@
 	paramFile.C
 	parameters.C
 	parameterSection.C
-	paramFile.C
 	PDBdefs.C
 	PDBFileGeneral.C
 	PDBFileDetails.C


Makefile: Fixed include dir in CMakeLists.txt

--- tests/CMakeLists.txt.cmake
+++ tests/CMakeLists.txt.cmake
@@ -14,7 +14,7 @@

 rs_wrap_scripts (PROJECT_CPP ${PROJECT_RS})

-rs_include_directories (/scratch-local/usr/include)
+rs_include_directories (@CMAKE_INSTALL_PREFIX@/include)

 rs_link_libraries (${PROJECT_NAME} stdc++)


fixed variable name default_STIR_BUILD_EXECUTABLE

--- SuperBuild/External_STIR.cmake
+++ SuperBuild/External_STIR.cmake
@@ -59,7 +59,7 @@
   endif()
   RenameVariable(BUILD_STIR_WITH_OPENMP STIR_ENABLE_OPENMP build_STIR_OPENMP_default)
   option(STIR_ENABLE_OPENMP "Build STIR with OpenMP acceleration" ${build_STIR_OPENMP_default})
-  set(default_BUILD_STIR_EXECUTABLES OFF)
+  set(default_STIR_BUILD_EXECUTABLES OFF)
   RenameVariable(BUILD_STIR_EXECUTABLES STIR_BUILD_EXECUTABLES default_STIR_BUILD_EXECUTABLES)
   option(STIR_BUILD_EXECUTABLES "Build all STIR executables" ${default_STIR_BUILD_EXECUTABLES})
   set(default_STIR_BUILD_SWIG_PYTHON OFF)


Delete find-libusb-windows.cmake

Delete find-libusb-windows.cmake

--- recipes/librealsense/find-libusb-windows.cmake
+++ recipes/librealsense/find-libusb-windows.cmake
@@ -1,11 +0,0 @@
-diff --git a/CMake/libusb_config.cmake b/CMake/libusb_config.cmake
-index ca221ca66d..cf48bc547f 100644
---- a/CMake/libusb_config.cmake
-+++ b/CMake/libusb_config.cmake
-@@ -1,5 +1,5 @@
- if (NOT TARGET usb)
--    find_library(LIBUSB_LIB usb-1.0)
-+    find_library(LIBUSB_LIB usb-1.0 libusb-1.0)
-     find_path(LIBUSB_INC libusb.h HINTS PATH_SUFFIXES libusb-1.0)
-     include(FindPackageHandleStandardArgs)
-     find_package_handle_standard_args(usb "libusb not found; using internal version" LIBUSB_LIB LIBUSB_INC)


Set CMP0025 to NEW to make CMake shut up about Clang.

--- CMakeUnitRunner.cmake
+++ CMakeUnitRunner.cmake
@@ -148,6 +148,9 @@
         set (TEST_DIRECTORY_CONFIGURE_SCRIPT
              ${TEST_DIRECTORY_NAME}/CMakeLists.txt)
         set (TEST_DIRECTORY_CONFIGURE_SCRIPT_CONTENTS
+             "if (POLICY CMP0025)\n"
+             "  cmake_policy (SET CMP0025 NEW)\n"
+             "endif (POLICY CMP0025)\n"
              "project (TestProject CXX C)\n"
              "cmake_minimum_required (VERSION 2.8 FATAL_ERROR)\n"
              "include (${CMAKE_CURRENT_SOURCE_DIR}/${TEST_FILE})\n")


Update compile date format

Update compile date format

This prevents multiple recompiles of HOOMDVersionInfo.cc when there is no need to.

--- CMake_src_setup.cmake
+++ CMake_src_setup.cmake
@@ -22,7 +22,7 @@

 # handle linux/mac and windows dates differently
 if (NOT WIN32)
-    exec_program("date" OUTPUT_VARIABLE COMPILE_DATE)
+    exec_program("date +%x" OUTPUT_VARIABLE COMPILE_DATE)
 else(NOT WIN32)
     exec_program("cmd" ARGS "/c date /T" OUTPUT_VARIABLE COMPILE_DATE)
 endif (NOT WIN32)


Remove conditional to add variables to propagation list

The variables in the superbuild variable propagation list are only
propagated if they are defined, and not empty. Therefore there is no
need to conditionally add the variable.

--- SuperBuild/SuperBuild.cmake
+++ SuperBuild/SuperBuild.cmake
@@ -222,6 +222,7 @@
   CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO

   CMAKE_STRIP
+  CMAKE_STRIP_FLAGS

   CMAKE_PREFIX_PATH
   CMAKE_FRAMEWORK_PATH
@@ -244,18 +245,11 @@
   SITE
   BUILDNAME

-  SKBUILD )
-
-if( APPLE )
-  list( APPEND ep_common_list
-    CMAKE_OSX_SYSROOT
-    CMAKE_OSX_DEPLOYMENT_TARGET )
-endif()
-
-if( DEFINED CMAKE_STRIP_FLAGS )
-  list( APPEND ep_common_list
-    CMAKE_STRIP_FLAGS )
-endif()
+  SKBUILD
+
+  CMAKE_OSX_SYSROOT
+  CMAKE_OSX_DEPLOYMENT_TARGET
+)

 VariableListToArgs( ep_common_list ep_common_args )


Turn off ospray for travis

Turn off ospray for travis

--- Superbuild/Superbuild.cmake
+++ Superbuild/Superbuild.cmake
@@ -105,10 +105,11 @@

 IF(TRAVIS_BUILD)
   IF(APPLE)
+    SET(WITH_OSPRAY OFF)
     SET(BUILD_TESTING OFF)
     SET(DOWNLOAD_TOOLKITS OFF)
     SET(BUILD_WITH_SCIRUN_DATA OFF)
-  ELSE()
+  ELSE()
     SET(WITH_OSPRAY OFF)
 	SET(BUILD_TESTING OFF)
 	SET(DOWNLOAD_TOOLKITS OFF)


Check for vsnprintf first.

Check for vsnprintf first.

--- ConfigureChecks.cmake
+++ ConfigureChecks.cmake
@@ -209,22 +209,22 @@
   int main() {
     char buf[20];
     va_list args;
-    vsprintf_s(buf, \"%d\", args);
-    return 0;
-  }
-" HAVE_VSPRINTF_S)
-
-if(NOT HAVE_VSPRINTF_S)
+    vsnprintf(buf, 20, \"%d\", args);
+    return 0;
+  }
+" HAVE_VSNPRINTF)
+
+if(NOT HAVE_VSNPRINTF)
   check_cxx_source_compiles("
     #include <cstdio>
     #include <cstdarg>
     int main() {
       char buf[20];
       va_list args;
-      vsnprintf(buf, 20, \"%d\", args);
+      vsprintf_s(buf, \"%d\", args);
       return 0;
     }
-  " HAVE_VSNPRINTF)
+  " HAVE_VSPRINTF_S)
 endif()

 # Check for libz using the cmake supplied FindZLIB.cmake


[cmake] findAlembic deals with all-in-one library (latest builds)

[ci skip]

--- src/cmakeFindModules/FindAlembic.cmake
+++ src/cmakeFindModules/FindAlembic.cmake
@@ -23,14 +23,17 @@
 FIND_PATH(ABC_HALF_INCLUDE_DIR half.h
     HINTS
     ${ALEMBIC_ILMBASE_ROOT}/include/OpenEXR
-    $ENV{ALEMBIC_ILMBASE_ROOT}/include/OpenEXR)
+    $ENV{ALEMBIC_ILMBASE_ROOT}/include/OpenEXR
+    $ENV{ILMBASE_INCLUDE_DIR} )

 FIND_PATH(ABC_ILMBASE_LIBS_PATH NAMES libIex.so libIex.a
     PATHS
         ${ALEMBIC_ILMBASE_ROOT}/lib
+        ${ALEMBIC_ILMBASE_ROOT}/lib/static
         ${ALEMBIC_ILMBASE_ROOT}/lib64
         $ENV{ALEMBIC_ILMBASE_ROOT}/lib
         $ENV{ALEMBIC_ILMBASE_ROOT}/lib64
+        $ENV{ILMBASE_LIBRARY_DIR}
     NO_DEFAULT_PATH)

 FIND_LIBRARY(ABC_ILMBASE_IEX Iex PATHS ${ABC_ILMBASE_LIBS_PATH} NO_DEFAULT_PATH)
@@ -45,6 +48,7 @@
         ${ALEMBIC_OPENEXR_ROOT}/lib64
         $ENV{ALEMBIC_OPENEXR_ROOT}/lib
         $ENV{ALEMBIC_OPENEXR_ROOT}/lib64
+        $ENV{OPENEXR_LIBRARY_DIR}
     NO_DEFAULT_PATH)

 ################################################################################
@@ -58,6 +62,7 @@
         ${ALEMBIC_HDF5_ROOT}/lib64
         $ENV{ALEMBIC_HDF5_ROOT}/lib
         $ENV{ALEMBIC_HDF5_ROOT}/lib64
+        $ENV{HDF5_LIBRARY_DIR}
        NO_DEFAULT_PATH)
 FIND_LIBRARY(ABC_HDF5 hdf5 PATHS ${ABC_HDF5_LIBS_PATH})
 FIND_LIBRARY(ABC_HDF5_HL hdf5_hl PATHS ${ABC_HDF5_LIBS_PATH})
@@ -70,16 +75,21 @@
 FIND_PATH(ABC_INCLUDE_DIR Alembic/Abc/All.h
     PATHS
         $ENV{ALEMBIC_ROOT}/include
+        $ENV{ALEMBIC_INCLUDE_DIR}
         ${ALEMBIC_ROOT}/include
     PATH_SUFFIXES
         alembic
     NO_DEFAULT_PATH
 )
+# message(STATUS "ABC_OPENEXR_LIBS ${ABC_OPENEXR_LIBS}")

 #
-# We force the use of dynamic libraries as with using the static ones we had initialization problems.
-#MESSAGE(STATUS "ALEMBIC_ROOT ${ALEMBIC_ROOT}")
-FIND_PATH(ABC_LIBRARY_DIR libAlembicAbc.so libAlembicAbc.a libAlembicAbc.dylib
+# We force the use of dynamic libraries as using the static ones had caused some
+# initialization problems.
+
+# try to find the all-in-one library
+message(STATUS "trying to found the all-in-one libAlembic.so")
+FIND_LIBRARY(ABC_ALL_IN_ONE libAlembic
     PATHS
         ${ALEMBIC_ROOT}/lib
         ${ALEMBIC_ROOT}/lib/static
@@ -90,13 +100,36 @@
         $ENV{ALEMBIC_LIBRARY_DIR}
         $ENV{ALEMBIC_LIBRARY_DIR}/static
     NO_DEFAULT_PATH)
-#MESSAGE(STATUS "ABC_LIBRARY_DIR ${ABC_LIBRARY_DIR}")
-FIND_LIBRARY(ABC AlembicAbc PATHS ${ABC_LIBRARY_DIR})
-FIND_LIBRARY(ABC_COREABSTRACT AlembicAbcCoreAbstract PATHS ${ABC_LIBRARY_DIR})
-FIND_LIBRARY(ABC_COREHDF5 AlembicAbcCoreHDF5 PATHS ${ABC_LIBRARY_DIR})
-FIND_LIBRARY(ABC_GEOM AlembicAbcGeom PATHS ${ABC_LIBRARY_DIR})
-FIND_LIBRARY(ABC_UTIL AlembicUtil PATHS ${ABC_LIBRARY_DIR})
-SET(ABC_CORE_LIBS ${ABC_GEOM} ${ABC} ${ABC_COREHDF5} ${ABC_COREABSTRACT} ${ABC_UTIL})
+# message(STATUS "ABC_ALL_IN_ONE ${ABC_ALL_IN_ONE}")
+if( EXISTS ${ABC_ALL_IN_ONE})
+    message(STATUS "found the all-in-one libAlembic")
+    SET(ABC_CORE_LIBS ${ABC_ALL_IN_ONE} )
+else()
+    message(STATUS "all-in-one not found, try finding individual ones")
+
+    FIND_PATH(ABC_LIBRARY_DIR libAlembicAbc.so libAlembicAbc.a
+        PATHS
+            ${ALEMBIC_ROOT}/lib
+            ${ALEMBIC_ROOT}/lib/static
+            ${ALEMBIC_ROOT}/lib64
+            $ENV{ALEMBIC_ROOT}/lib
+            $ENV{ALEMBIC_ROOT}/lib64
+            $ENV{ALEMBIC_LIBRARY_DIR}
+        NO_DEFAULT_PATH)
+    #FIND_LIBRARY(ABC_COLLECTION libAlembicAbcCollection.so PATHS ${ABC_LIBRARY_DIR})
+    #FIND_LIBRARY(ABC_COREFACTORY libAlembicAbcCoreFactory.so PATHS ${ABC_LIBRARY_DIR})
+    #FIND_LIBRARY(ABC_COREOGAWA libAlembicAbcCoreOgawa.so PATHS ${ABC_LIBRARY_DIR})
+    #FIND_LIBRARY(ABC_MATERIAL libAlembicAbcMaterial.so PATHS ${ABC_LIBRARY_DIR})
+    #FIND_LIBRARY(ABC_OGAWA libAlembicOgawa.so PATHS ${ABC_LIBRARY_DIR})
+    #FIND_LIBRARY(ABC_OPENGL libAlembicAbcOpenGL.so PATHS ${ABC_LIBRARY_DIR})
+    #FIND_LIBRARY(ABC_WFOBJCONVERT libAbcWFObjConvert.so PATHS ${ABC_LIBRARY_DIR})
+    FIND_LIBRARY(ABC libAlembicAbc.so PATHS ${ABC_LIBRARY_DIR})
+    FIND_LIBRARY(ABC_COREABSTRACT libAlembicAbcCoreAbstract.so PATHS ${ABC_LIBRARY_DIR})
+    FIND_LIBRARY(ABC_COREHDF5 libAlembicAbcCoreHDF5.so PATHS ${ABC_LIBRARY_DIR})
+    FIND_LIBRARY(ABC_GEOM libAlembicAbcGeom.so PATHS ${ABC_LIBRARY_DIR})
+    FIND_LIBRARY(ABC_UTIL libAlembicUtil.so PATHS ${ABC_LIBRARY_DIR})
+    SET(ABC_CORE_LIBS ${ABC_GEOM} ${ABC} ${ABC_COREHDF5} ${ABC_COREABSTRACT} ${ABC_UTIL})
+endif()

 SET(ABC_LIBRARIES ${ABC_CORE_LIBS} ${ABC_HDF5_LIBS} "-ldl" ${ABC_OPENEXR_LIBS} ${ABC_ILMBASE_LIBS})
 SET(ABC_INCLUDE_DIR ${ABC_INCLUDE_DIR} ${ABC_HALF_INCLUDE_DIR})
@@ -105,4 +138,9 @@
 FIND_PACKAGE_HANDLE_STANDARD_ARGS("Alembic" DEFAULT_MSG ABC_LIBRARIES ABC_LIBRARY_DIR ABC_INCLUDE_DIR ABC_HDF5_LIBS)

+if (ALEMBIC_FOUND)
 mark_as_advanced(ABC_LIBRARY_DIR ABC_HDF5_LIBS_PATH ABC_ILMBASE_LIBS_PATH)
+    message("Found Alembic - will build alembic exporter")
+else()
+    message("Alembic NOT FOUND")
+endif()


platforms/nuttx: init.cmake skip config lines with empty values

--- platforms/nuttx/cmake/init.cmake
+++ platforms/nuttx/cmake/init.cmake
@@ -153,15 +153,17 @@
 	# Find variable name
 	string(REGEX MATCH "^CONFIG[^=]+" Name ${NameAndValue})

-	if (Name)
+	if(Name)
 		# Find the value
 		string(REPLACE "${Name}=" "" Value ${NameAndValue})

-		# remove extra quotes
-		string(REPLACE "\"" "" Value ${Value})
+		if(Value)
+			# remove extra quotes
+			string(REPLACE "\"" "" Value ${Value})

-		# Set the variable
-		#message(STATUS "${Name} ${Value}")
-		set(${Name} ${Value} CACHE INTERNAL "NUTTX DEFCONFIG: ${Name}" FORCE)
+			# Set the variable
+			#message(STATUS "${Name} ${Value}")
+			set(${Name} ${Value} CACHE INTERNAL "NUTTX DEFCONFIG: ${Name}" FORCE)
+		endif()
 	endif()
 endforeach()


Make iSWA module dependent on Kameleon

Make iSWA module dependent on Kameleon

--- modules/iswa/include.cmake
+++ modules/iswa/include.cmake
@@ -1,3 +1,3 @@
 set (OPENSPACE_DEPENDENCIES
-    base
+    base kameleon
 )


Fix dependency order of Photoacoustics plugins

--- Plugins/PluginList.cmake
+++ Plugins/PluginList.cmake
@@ -74,6 +74,8 @@
   org.mitk.gui.qt.tofutil:OFF
   org.mitk.gui.qt.tubegraph:OFF
   org.mitk.gui.qt.ugvisualization:OFF
+  org.mitk.gui.qt.photoacoustics.pausviewer:OFF
+  org.mitk.gui.qt.photoacoustics.imageprocessing:OFF
   org.mitk.gui.qt.ultrasound:OFF
   org.mitk.gui.qt.volumevisualization:OFF
   org.mitk.gui.qt.eventrecorder:OFF
@@ -93,7 +95,5 @@
   org.mitk.gui.qt.matchpoint.visualizer:OFF
   org.mitk.gui.qt.matchpoint.evaluator:OFF
   org.mitk.gui.qt.matchpoint.manipulator:OFF
-  org.mitk.gui.qt.photoacoustics.pausviewer:OFF
-  org.mitk.gui.qt.photoacoustics.imageprocessing:OFF
   org.mitk.gui.qt.cest:OFF
 )


Update to Go 1.2 release

Update to Go 1.2 release

--- golang.cmake
+++ golang.cmake
@@ -12,8 +12,8 @@

 external_source (golang
     1.2
-    go1.2rc4.src.tar.gz
-    21df7d7d0e585299045203fd443ee2c5
+    go1.2.src.tar.gz
+    c2ace56f6b6413a5c6318b9527a8b763
     http://go.googlecode.com/files)

 message ("Installing ${golang_NAME} into build area: ${BUILDEM_DIR} ...")


Prepare for RHEL 7.8.

Prepare for RHEL 7.8.

--- default_build_settings.cmake
+++ default_build_settings.cmake
@@ -159,7 +159,8 @@
   endif()
   if(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 6.10")
     setup_vespa_default_build_settings_rhel_6_10()
-  elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 7.7")
+  elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 7.7" OR
+      VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 7.8")
     setup_vespa_default_build_settings_rhel_7()
   elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 8.1")
     setup_vespa_default_build_settings_rhel_8()


ENH: Change the URL for the PCA remote module repo.

Change the URL for the PrincipalComponentsAnalysis remote module
repository to match the one under InsightSoftwareConsortium's github.

Change-Id: I0eb241561a2b40c1d635d5d55ae903a5da0e21a4

--- Modules/Remote/PrincipalComponentsAnalysis.remote.cmake
+++ Modules/Remote/PrincipalComponentsAnalysis.remote.cmake
@@ -7,6 +7,6 @@
     http://www.insight-journal.org/browse/publication/878
     August, 2013.
 "
-  GIT_REPOSITORY ${git_protocol}://github.com/vovythevov/ITKPCA.git
+  GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKPrincipalComponentsAnalysis.git
   GIT_TAG 36120bcc4937f9a9e558280609088755ab180c1e
   )


Fix the find of thirdparty with the complete CMakeLists.txt

--- samples/Macros.cmake
+++ samples/Macros.cmake
@@ -100,11 +100,11 @@
     find_package(Vulkan)

     if (NOT VULKAN_INCLUDE_DIR)
-        if (NOT EXISTS "${CMAKE_SOURCE_DIR}/../../thirdparty/vulkan")
+        if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/vulkan")
             message(FATAL_ERROR "Can't find vulkan, call `git submodule update --recursive`")
         endif()

-        set(VULKAN_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../../thirdparty/vulkan/include)
+        set(VULKAN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/vulkan/include)
         message(STATUS "Found Vulkan: ${VULKAN_INCLUDE_DIR}")
     endif()

@@ -114,11 +114,11 @@
     find_package(Fmt)

     if (NOT FMT_INCLUDE_DIR)
-        if (NOT EXISTS "${CMAKE_SOURCE_DIR}/../../thirdparty/fmt")
+        if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/fmt")
             message(FATAL_ERROR "Can't find fmt, call `git submodule update --recursive`")
         endif()

-        set(FMT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../../thirdparty/fmt/include)
+        set(FMT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/fmt/include)
         message(STATUS "Found Fmt: ${FMT_INCLUDE_DIR}")
     endif()


Remove TABs on CMake files.

Remove TABs on CMake files.

--- Tools/CMake/basics.cmake
+++ Tools/CMake/basics.cmake
@@ -35,14 +35,14 @@
              ${dir}/*.h)
     LIST(APPEND ${PROJECT_NAME}_files "${tmpa}")
     LIST(APPEND ${PROJECT_NAME}_paths "${dir}")
-	#message(STATUS "addPath ${PROJECT_NAME} : ${tmpa}")
+    #message(STATUS "addPath ${PROJECT_NAME} : ${tmpa}")
     #set(t "${${t}};${tmpa}")
 endmacro()

 # adds a file to the sources
 macro(addFile filename)
     LIST(APPEND ${PROJECT_NAME}_files "${filename}")
-	#message(STATUS "addFile ${PROJECT_NAME} : ${filename}")
+    #message(STATUS "addFile ${PROJECT_NAME} : ${filename}")
 endmacro()

 # finds and adds sources files in a folder recursively
@@ -55,7 +55,7 @@
              ${dir}/*.h)
     LIST(APPEND ${PROJECT_NAME}_files "${tmpa}")
     LIST(APPEND ${PROJECT_NAME}_paths "${dir}")
-	#message(STATUS "addPathRec ${PROJECT_NAME} : ${tmpa}")
+    #message(STATUS "addPathRec ${PROJECT_NAME} : ${tmpa}")
 endmacro()

 # adds a definition
@@ -187,17 +187,17 @@
         string(REGEX REPLACE "(.*)(/[^/]*)$" "\\1" SRCGR ${SRCGR})
         # do not have any ../ dirs
         string(REPLACE "../" "" SRCGR ${SRCGR})
-		IF("${SRCGR}" MATCHES "^torque3d/My Projects/.*$")
-			string(REPLACE "torque3d/My Projects/${PROJECT_NAME}/" "" SRCGR ${SRCGR})
-			string(REPLACE "/source" "" SRCGR ${SRCGR})
-		endif()
+        IF("${SRCGR}" MATCHES "^torque3d/My Projects/.*$")
+            string(REPLACE "torque3d/My Projects/${PROJECT_NAME}/" "" SRCGR ${SRCGR})
+            string(REPLACE "/source" "" SRCGR ${SRCGR})
+        endif()
         # Source_group expects \\ (double antislash), not / (slash)
         string(REPLACE / \\ SRCGR ${SRCGR})
         #STRING(REPLACE "//" "/" SRCGR ${SRCGR})
-		IF(EXISTS "${f}" AND NOT IS_DIRECTORY "${f}")
-			#message(STATUS "FILE: ${f} -> ${SRCGR}")
-			source_group("${SRCGR}" FILES ${f})
-		endif()
+        IF(EXISTS "${f}" AND NOT IS_DIRECTORY "${f}")
+            #message(STATUS "FILE: ${f} -> ${SRCGR}")
+            source_group("${SRCGR}" FILES ${f})
+        endif()
     endforeach()
 endmacro()
 # macro to add a static library
@@ -216,11 +216,11 @@
         endif()
     endforeach()
     generateFilters("${firstDir}")
-	if(TORQUE_STATIC)
-		add_library("${PROJECT_NAME}" STATIC ${${PROJECT_NAME}_files})
-	else()
-		add_library("${PROJECT_NAME}" SHARED ${${PROJECT_NAME}_files})
-	endif()
+    if(TORQUE_STATIC)
+        add_library("${PROJECT_NAME}" STATIC ${${PROJECT_NAME}_files})
+    else()
+        add_library("${PROJECT_NAME}" SHARED ${${PROJECT_NAME}_files})
+    endif()
     # omg - only use the first folder ... otehrwise we get lots of header name collisions
     #foreach(dir ${${PROJECT_NAME}_paths})
     addInclude("${firstDir}")
@@ -251,36 +251,36 @@
 endmacro()

 macro(setupVersionNumbers)
-	set(TORQUE_APP_VERSION_MAJOR 1 CACHE INTEGER "")
-	set(TORQUE_APP_VERSION_MINOR 0 CACHE INTEGER "")
-	set(TORQUE_APP_VERSION_PATCH 0 CACHE INTEGER "")
-	set(TORQUE_APP_VERSION_TWEAK 0 CACHE INTEGER "")
-	mark_as_advanced(TORQUE_APP_VERSION_TWEAK)
-	MATH(EXPR TORQUE_APP_VERSION "${TORQUE_APP_VERSION_MAJOR} * 1000 + ${TORQUE_APP_VERSION_MINOR} * 100 + ${TORQUE_APP_VERSION_PATCH} * 10 + ${TORQUE_APP_VERSION_TWEAK}")
-	set(TORQUE_APP_VERSION_STRING "${TORQUE_APP_VERSION_MAJOR}.${TORQUE_APP_VERSION_MINOR}.${TORQUE_APP_VERSION_PATCH}.${TORQUE_APP_VERSION_TWEAK}")
-	#message(STATUS "version numbers: ${TORQUE_APP_VERSION} / ${TORQUE_APP_VERSION_STRING}")
+    set(TORQUE_APP_VERSION_MAJOR 1 CACHE INTEGER "")
+    set(TORQUE_APP_VERSION_MINOR 0 CACHE INTEGER "")
+    set(TORQUE_APP_VERSION_PATCH 0 CACHE INTEGER "")
+    set(TORQUE_APP_VERSION_TWEAK 0 CACHE INTEGER "")
+    mark_as_advanced(TORQUE_APP_VERSION_TWEAK)
+    MATH(EXPR TORQUE_APP_VERSION "${TORQUE_APP_VERSION_MAJOR} * 1000 + ${TORQUE_APP_VERSION_MINOR} * 100 + ${TORQUE_APP_VERSION_PATCH} * 10 + ${TORQUE_APP_VERSION_TWEAK}")
+    set(TORQUE_APP_VERSION_STRING "${TORQUE_APP_VERSION_MAJOR}.${TORQUE_APP_VERSION_MINOR}.${TORQUE_APP_VERSION_PATCH}.${TORQUE_APP_VERSION_TWEAK}")
+    #message(STATUS "version numbers: ${TORQUE_APP_VERSION} / ${TORQUE_APP_VERSION_STRING}")
 endmacro()

 macro(setupPackaging)
-	INCLUDE(CPack)
-	# only enable zips for now
-	set(CPACK_BINARY_NSIS OFF CACHE INTERNAL "" FORCE)
-	set(CPACK_BINARY_ZIP   ON CACHE INTERNAL "" FORCE)
-	set(CPACK_SOURCE_ZIP  OFF CACHE INTERNAL "" FORCE)
-	SET(CPACK_GENERATOR "ZIP")
-	SET(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
-	SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
-	SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
-	SET(CPACK_OUTPUT_FILE_PREFIX "${projectDir}/packages/${PROJECT_NAME}")
-	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "")
-	#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
-	#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
-	SET(CPACK_PACKAGE_VERSION_MAJOR "${TORQUE_APP_VERSION_MAJOR}")
-	SET(CPACK_PACKAGE_VERSION_MINOR "${TORQUE_APP_VERSION_MINOR}")
-	SET(CPACK_PACKAGE_VERSION_PATCH "${TORQUE_APP_VERSION_PATCH}")
-	#SET(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}")
-	SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${TORQUE_APP_VERSION_STRING}")
-	#SET(CPACK_SOURCE_STRIP_FILES "")
+    INCLUDE(CPack)
+    # only enable zips for now
+    set(CPACK_BINARY_NSIS OFF CACHE INTERNAL "" FORCE)
+    set(CPACK_BINARY_ZIP   ON CACHE INTERNAL "" FORCE)
+    set(CPACK_SOURCE_ZIP  OFF CACHE INTERNAL "" FORCE)
+    SET(CPACK_GENERATOR "ZIP")
+    SET(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
+    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
+    SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
+    SET(CPACK_OUTPUT_FILE_PREFIX "${projectDir}/packages/${PROJECT_NAME}")
+    SET(CPACK_PACKAGE_INSTALL_DIRECTORY "")
+    #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
+    #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
+    SET(CPACK_PACKAGE_VERSION_MAJOR "${TORQUE_APP_VERSION_MAJOR}")
+    SET(CPACK_PACKAGE_VERSION_MINOR "${TORQUE_APP_VERSION_MINOR}")
+    SET(CPACK_PACKAGE_VERSION_PATCH "${TORQUE_APP_VERSION_PATCH}")
+    #SET(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}")
+    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${TORQUE_APP_VERSION_STRING}")
+    #SET(CPACK_SOURCE_STRIP_FILES "")
 endmacro()
 # always static for now
 set(TORQUE_STATIC ON)
@@ -289,36 +289,36 @@
 if(WIN32)
     set(TORQUE_DISABLED_WARNINGS " ")
     set(TORQUE_CXX_FLAGS "/MP /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /arch:SSE2 /fp:fast /fp:except- /GR /Zc:wchar_t- /wd4018 /wd4100 /wd4121 /wd4127 /wd4130 /wd4244 /wd4245 /wd4389 /wd4511 /wd4512 /wd4800 /wd4995 /D_CRT_SECURE_NO_WARNINGS " CACHE TYPE STRING)
-	mark_as_advanced(TORQUE_CXX_FLAGS)
+    mark_as_advanced(TORQUE_CXX_FLAGS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORQUE_CXX_FLAGS}")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
     set(CMAKE_EXE_LINKER_FLAGS "/LARGEADDRESSAWARE")
     #set(STATIC_LIBRARY_FLAGS "/OPT:NOREF")

     # Force static runtime libraries
-	if(TORQUE_STATIC)
-		FOREACH(flag
-			CMAKE_C_FLAGS_RELEASE
-			CMAKE_C_FLAGS_RELWITHDEBINFO
-			CMAKE_C_FLAGS_DEBUG
-			CMAKE_C_FLAGS_DEBUG_INIT
-			CMAKE_CXX_FLAGS_RELEASE
-			CMAKE_CXX_FLAGS_RELWITHDEBINFO
-			CMAKE_CXX_FLAGS_DEBUG
-			CMAKE_CXX_FLAGS_DEBUG_INIT)
-			STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
-			SET("${flag}" "${${flag}} /EHsc")
-		ENDFOREACH()
-	endif()
+    if(TORQUE_STATIC)
+        FOREACH(flag
+            CMAKE_C_FLAGS_RELEASE
+            CMAKE_C_FLAGS_RELWITHDEBINFO
+            CMAKE_C_FLAGS_DEBUG
+            CMAKE_C_FLAGS_DEBUG_INIT
+            CMAKE_CXX_FLAGS_RELEASE
+            CMAKE_CXX_FLAGS_RELWITHDEBINFO
+            CMAKE_CXX_FLAGS_DEBUG
+            CMAKE_CXX_FLAGS_DEBUG_INIT)
+            STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
+            SET("${flag}" "${${flag}} /EHsc")
+        ENDFOREACH()
+    endif()
 endif()

 # fix the debug/release subfolders on windows
 if(MSVC)
-	FOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})
-		# Go uppercase (DEBUG, RELEASE...)
-		STRING(TOUPPER "${CONF}" CONF)
-		#SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONF}" "${projectOutDir}")
-		SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF}" "${projectOutDir}")
-	ENDFOREACH()
-endif()
+    FOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})
+        # Go uppercase (DEBUG, RELEASE...)
+        STRING(TOUPPER "${CONF}" CONF)
+        #SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONF}" "${projectOutDir}")
+        SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF}" "${projectOutDir}")
+    ENDFOREACH()
+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"

--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Instant Messaging
 Name[ar]=التّراسل المباشر
-Name[ast]=Mensaxería nel intre
 Name[bs]=Brze poruke
 Name[ca]=Missatgeria instantània
 Name[ca@valencia]=Missatgeria instantània
@@ -48,7 +47,6 @@
 Name[zh_TW]=即時訊息
 Comment=Start a chat with any of your IM contacts or change your IM status
 Comment[ar]=ابدأ محادثة بأيّ من متراسلي ت‌م أو غيّر حالة ت‌م
-Comment[ast]=Anicia una charra con cualesquier contautu o camuda'l to estáu
 Comment[bs]=Pokrenite ćaskanje s bilo kojim od vaših IM kontakta ili promijenite svoj IM status
 Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat a la MI
 Comment[ca@valencia]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat a la MI


cmake-modules:
+ [FindThirdPartyEmotivAPI] added paths for 64bit windows

git-svn-id: ed1ce8e5c168003d808aec37bc6fda77b178f7bb@3397 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- trunk/cmake-modules/FindThirdPartyEmotivAPI.cmake
+++ trunk/cmake-modules/FindThirdPartyEmotivAPI.cmake
@@ -9,12 +9,17 @@
 	FIND_PATH(PATH_EmotivAPI edk.h  PATHS
 		"C:/Program Files/Emotiv Development Kit_v1.0.0.3-PREMIUM"
 		"C:/Program Files/Emotiv Development Kit_v1.0.0.3-PREMIUM/doc/examples/include"
-		"C:\Program Files\Emotiv Research Edition SDK_v1.0.0.4-PREMIUM"
-		"C:\Program Files\Emotiv Research Edition SDK_v1.0.0.4-PREMIUM/doc/examples/include"
-		"C:\Program Files (x86)\Emotiv Research Edition SDK_v1.0.0.4-PREMIUM"
-		"C:\Program Files (x86)\Emotiv Research Edition SDK_v1.0.0.4-PREMIUM/doc/examples/include"
+		"C:/Program Files (x86)/Emotiv Development Kit_v1.0.0.3-PREMIUM"
+		"C:/Program Files (x86)/Emotiv Development Kit_v1.0.0.3-PREMIUM/doc/examples/include"
+		"C:/Program Files/Emotiv Research Edition SDK_v1.0.0.4-PREMIUM"
+		"C:/Program Files/Emotiv Research Edition SDK_v1.0.0.4-PREMIUM/doc/examples/include"
+		"C:/Program Files (x86)/Emotiv Research Edition SDK_v1.0.0.4-PREMIUM"
+		"C:/Program Files (x86)/Emotiv Research Edition SDK_v1.0.0.4-PREMIUM/doc/examples/include"
 		"C:/Program Files/Emotiv Research Edition SDK_v1.0.0.5-PREMIUM"
-		"C:/Program Files/Emotiv Research Edition SDK_v1.0.0.5-PREMIUM/doc/examples/include" $ENV{OpenViBE_dependencies})
+		"C:/Program Files/Emotiv Research Edition SDK_v1.0.0.5-PREMIUM/doc/examples/include"
+		"C:/Program Files (x86)/Emotiv Research Edition SDK_v1.0.0.5-PREMIUM"
+		"C:/Program Files (x86)/Emotiv Research Edition SDK_v1.0.0.5-PREMIUM/doc/examples/include"
+		$ENV{OpenViBE_dependencies})
 	IF(PATH_EmotivAPI)
 		MESSAGE(STATUS "  Found Emotiv API...")
 		INCLUDE_DIRECTORIES(${PATH_EmotivAPI})


remove 'photoeffects/cmake_install.cmake'

--- photoeffects/cmake_install.cmake
+++ photoeffects/cmake_install.cmake
@@ -1,53 +0,0 @@
-# Install script for directory: /home/kustikova/Documents/itlab-vision/photoeffects
-
-# Set the install prefix
-IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  SET(CMAKE_INSTALL_PREFIX "/usr/local")
-ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
-STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-  IF(BUILD_TYPE)
-    STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
-           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
-  ELSE(BUILD_TYPE)
-    SET(CMAKE_INSTALL_CONFIG_NAME "Release")
-  ENDIF(BUILD_TYPE)
-  MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-
-# Set the component getting installed.
-IF(NOT CMAKE_INSTALL_COMPONENT)
-  IF(COMPONENT)
-    MESSAGE(STATUS "Install component: \"${COMPONENT}\"")
-    SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
-  ELSE(COMPONENT)
-    SET(CMAKE_INSTALL_COMPONENT)
-  ENDIF(COMPONENT)
-ENDIF(NOT CMAKE_INSTALL_COMPONENT)
-
-# Install shared libraries without execute permission?
-IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  SET(CMAKE_INSTALL_SO_NO_EXE "1")
-ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-
-IF(NOT CMAKE_INSTALL_LOCAL_ONLY)
-  # Include the install script for each subdirectory.
-  INCLUDE("/home/kustikova/Documents/itlab-vision/photoeffects/3rdparty/cmake_install.cmake")
-  INCLUDE("/home/kustikova/Documents/itlab-vision/photoeffects/src/cmake_install.cmake")
-  INCLUDE("/home/kustikova/Documents/itlab-vision/photoeffects/test/cmake_install.cmake")
-  INCLUDE("/home/kustikova/Documents/itlab-vision/photoeffects/samples/cmake_install.cmake")
-
-ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY)
-
-IF(CMAKE_INSTALL_COMPONENT)
-  SET(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
-ELSE(CMAKE_INSTALL_COMPONENT)
-  SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
-ENDIF(CMAKE_INSTALL_COMPONENT)
-
-FILE(WRITE "/home/kustikova/Documents/itlab-vision/photoeffects/${CMAKE_INSTALL_MANIFEST}" "")
-FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES})
-  FILE(APPEND "/home/kustikova/Documents/itlab-vision/photoeffects/${CMAKE_INSTALL_MANIFEST}" "${file}\n")
-ENDFOREACH(file)


fix warning in doc job

fix warning in doc job

--- cmake/catkin_install_python.cmake
+++ cmake/catkin_install_python.cmake
@@ -4,9 +4,7 @@
 #
 # The signature:
 #
-#   catkin_install_python(PROGRAMS files... DESTINATION <dir>
-#     [OPTIONAL]
-#   )
+#   catkin_install_python(PROGRAMS files... DESTINATION <dir> [OPTIONAL])
 #
 # See the documentation for CMake install() function for more information.
 #


GTest package: support for ios build [skip ci]

--- cmake/projects/GTest/hunter.cmake
+++ cmake/projects/GTest/hunter.cmake
@@ -39,11 +39,21 @@
     0cb1dcf75e144ad052d3f1e4923a7773bf9b494f
 )

+string(COMPARE EQUAL "${CMAKE_OSX_SYSROOT}" "iphoneos" _hunter_result)
+if(_hunter_result)
+  set(_hunter_download_scheme url_sha1_combined_release_debug)
+else()
+  set(_hunter_download_scheme url_sha1_release_debug)
+endif()
+unset(_hunter_result)
+
 hunter_download(
     PACKAGE_NAME
     GTest
     DEPENDS
     Sugar
     DOWNLOAD_SCHEME
-    url_sha1_release_debug
+    ${_hunter_download_scheme}
 )
+
+unset(_hunter_download_scheme)


compat: wrap_python: SRCS => SRC

compat: wrap_python: SRCS => SRC

--- cmake/qibuild/compat/compat.cmake
+++ cmake/qibuild/compat/compat.cmake
@@ -418,6 +418,7 @@
   )
   include(qibuild/swig/python)
   _fix_flags(_new_args DEPENDENCIES DEPENDS ${ARGN})
+  _fix_flags(_new_args SRCS SRC ${ARGN})
   qi_swig_wrap_python(${_new_args})
 endfunction()


non-obsolete policy by default

non-obsolete policy by default

--- cmakemodules/script_gl_glut.cmake
+++ cmakemodules/script_gl_glut.cmake
@@ -19,7 +19,10 @@

 # Read: https://cmake.org/cmake/help/latest/module/FindOpenGL.html
-#set(OpenGL_GL_PREFERENCE "LEGACY")
+if (POLICY CMP0072)
+	# prefer non-legacy opengl libs
+	cmake_policy(SET CMP0072 NEW)
+endif()
 find_package(OpenGL)

 if (NOT "${CMAKE_VERSION}" VERSION_LESS "3.8.2")


Missing cmake var name prefix

Missing cmake var name prefix

--- cmakemodules/script_octomap.cmake
+++ cmakemodules/script_octomap.cmake
@@ -16,8 +16,8 @@
 endif()

 if (NOT OCTOMAP_FOUND)
-	set(BUILD_OCTOMAP ON CACHE BOOL "Build an embedded version of Octomap")
-	if (BUILD_OCTOMAP)
+	set(MRPT_BUILD_OCTOMAP ON CACHE BOOL "Build an embedded version of Octomap")
+	if (MRPT_BUILD_OCTOMAP)
 		# Use embedded version:
 		# --------------------------
 		if (MSVC)


Add --roi flag to fasm2frames to include required_features.

Signed-off-by: Keith Rothman <1bc19627a439baf17510dc2d0b2d250c96d445a5@users.noreply.github.com>

--- xc7/make/arch_define.cmake
+++ xc7/make/arch_define.cmake
@@ -52,6 +52,7 @@
     PYTHONPATH=${symbiflow-arch-defs_BINARY_DIR}/env/conda/lib/python3.7/site-packages:${PRJXRAY_DIR}:${PRJXRAY_DIR}/third_party/fasm \
     \${PYTHON3} \${FASM_TO_BIT} \
         --db-root ${PRJXRAY_DB_DIR}/${ARCH} \
+        --roi ${ROI_DIR}/design.json \
         --sparse \
     \${OUT_FASM} \${OUT_BITSTREAM}"
     BIT_TO_BIN xc7patch


devices.cmake: added disable check route option

Signed-off-by: Alessandro Comodi <622632e70fd6771cf2cd943f69e5e51ab66adef8@antmicro.com>

--- xc7/make/arch_define.cmake
+++ xc7/make/arch_define.cmake
@@ -24,6 +24,7 @@
       --enable_timing_computations off
       --allow_unrelated_clustering on
       --clustering_pin_feasibility_filter off
+      --disable_check_route on
     RR_PATCH_TOOL
       ${symbiflow-arch-defs_SOURCE_DIR}/xc7/utils/prjxray_routing_import.py
     RR_PATCH_CMD "${CMAKE_COMMAND} -E env \


Suppress useless warnings from check_route.

Signed-off-by: Keith Rothman <1bc19627a439baf17510dc2d0b2d250c96d445a5@users.noreply.github.com>

--- xc7/make/arch_define.cmake
+++ xc7/make/arch_define.cmake
@@ -45,7 +45,7 @@
       --bb_factor 10 \
       --initial_pres_fac 4.0 \
       --disable_check_rr_graph on \
-      --suppress_warnings \${OUT_NOISY_WARNINGS},sum_pin_class:check_unbuffered_edges:load_rr_indexed_data_T_values:check_rr_node:trans_per_R"
+      --suppress_warnings \${OUT_NOISY_WARNINGS},sum_pin_class:check_unbuffered_edges:load_rr_indexed_data_T_values:check_rr_node:trans_per_R:check_route"
     RR_PATCH_TOOL
       ${symbiflow-arch-defs_SOURCE_DIR}/xc7/utils/prjxray_routing_import.py
     RR_PATCH_CMD "${CMAKE_COMMAND} -E env \


run nosetests with the python executable (#70)

* run nosetests with the python executable

* comment to describe the source of the issue

* fixup

--- ament_cmake_nose/cmake/ament_add_nose_test.cmake
+++ ament_cmake_nose/cmake/ament_add_nose_test.cmake
@@ -69,8 +69,17 @@
   endif()

   set(result_file "${AMENT_TEST_RESULTS_DIR}/${PROJECT_NAME}/${testname}.xunit.xml")
+  # Invoke ${NOSETESTS} explicitly with the ${PYTHON_EXECUTABLE} because on
+  # some systems, like OS X, the ${NOSETESTS} binary may have a #! which points
+  # to the Python2 on the system, rather than the Python3 which is what we want
+  # most of the time.
+  # This "misalignment" can occur when you do `pip install -U nose` after doing
+  # `pip3 install -U nose` because both install the `nose` binary.
+  # Basically the last Python system to install nose will determine what the
+  # ${NOSETESTS} executable references.
+  # See: https://github.com/ament/ament_cmake/pull/70
   set(cmd
-    "${NOSETESTS}" "${path}" "--with-xunit"
+    "${PYTHON_EXECUTABLE}" "${NOSETESTS}" "${path}" "--with-xunit"
     "--xunit-file=${result_file}")
   if(NOT "${NOSETESTS_VERSION}" VERSION_LESS "1.3.5")
     list(APPEND cmd "--xunit-testsuite-name=${PROJECT_NAME}.nosetests")


Handle single files in javascript style tests

--- tests/JavascriptTests.cmake
+++ tests/JavascriptTests.cmake
@@ -76,18 +76,25 @@
   endif()
   if(NOT EXISTS ${input})
     message(FATAL_ERROR "Failed to add javascript style tests."
-                        "Directory '${input}' does not exist.")
+                        "Directory or file '${input}' does not exist.")
+  endif()
+
+  # check if the input is a directory or file and set the working directory
+  if(IS_DIRECTORY "${input}")
+    set(test_directory "${input}")
+  else()
+    get_filename_component(test_directory "${input}" DIRECTORY)
   endif()

   add_test(
     NAME "jshint_${name}"
-    WORKING_DIRECTORY ${input}
+    WORKING_DIRECTORY "${test_directory}"
     COMMAND "${JSHINT_EXECUTABLE}" --config "${jshint_config}" "${input}"
   )
   add_test(
     NAME "jsstyle_${name}"
-    WORKING_DIRECTORY ${input}
-    COMMAND "${JSSTYLE_EXECUTABLE}" --config "${jsstyle_config}" "${input}"
+    WORKING_DIRECTORY "${test_directory}"
+    COMMAND "${JSSTYLE_EXECUTABLE}"  --config "${jsstyle_config}" "${input}"
   )
 endfunction()


tensorflow 1.1.0 working on linux

tensorflow 1.1.0 working on linux

--- cmake/ExternalTensorflow.cmake
+++ cmake/ExternalTensorflow.cmake
@@ -12,11 +12,11 @@
         PREFIX ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
         BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/tensorflow
         GIT_REPOSITORY "https://github.com/smistad/tensorflow.git"
-        GIT_TAG "version-master"
+        GIT_TAG "fast"
         # Need to override this because tensorflow creates a file in the source dir
         # and cmake files to stash these files
         UPDATE_COMMAND
-            ${GIT_EXECUTABLE} pull origin master
+            ${GIT_EXECUTABLE} pull origin fast
         # Must use CONFIGURE_COMMAND because CMakeLists.txt is not in the src root of tensorflow
         CONFIGURE_COMMAND
             ${CMAKE_COMMAND}
@@ -28,7 +28,7 @@
             -Dtensorflow_BUILD_SHARED_LIB=ON
             -Dtensorflow_BUILD_CONTRIB_KERNELS=OFF
             -Dtensorflow_ENABLE_GRPC_SUPPORT=OFF
-            -Dtensorflow_OPTIMIZE_FOR_NATIVE_ARCH=ON
+            -Dtensorflow_OPTIMIZE_FOR_NATIVE_ARCH=OFF
             #-Dtensorflow_ENABLE_GPU=ON     # Will only work on NVIDIA for windows atm
             -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
             -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
@@ -38,19 +38,19 @@

 if(WIN32)
     # Tensorflow is built static on windows, need to include all dependecies
-    list(APPEND LIBRARIES
-        tensorflow.lib
-        libprotobuf.lib
-        libjpeg.lib
-        libpng12_static.lib
-        giflib.lib
-        jsoncpp.lib
-        farmhash.lib
-        highwayhash.lib
-	gpr.lib
-	grpc_unsecure.lib
-	grpc++_unsecure.lib
-    )
+#    list(APPEND LIBRARIES
+#        tensorflow.lib
+#        libprotobuf.lib
+#        libjpeg.lib
+#        libpng12_static.lib
+#        giflib.lib
+#        jsoncpp.lib
+#        farmhash.lib
+#        highwayhash.lib
+#        gpr.lib
+#        grpc_unsecure.lib
+#        grpc++_unsecure.lib
+#    )
     set(Tensorflow_LIBRARY ${FAST_EXTERNAL_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}tensorflow${CMAKE_STATIC_LIBRARY_SUFFIX})
 else(WIN32)
     list(APPEND LIBRARIES


Use JavaScriptCore lib matching build Configuration

--- cmake/FindJavaScriptCore.cmake
+++ cmake/FindJavaScriptCore.cmake
@@ -41,11 +41,8 @@
   get_filename_component(JavaScriptCore_LIBRARY_DIR ${JavaScriptCore_LIBRARIES} DIRECTORY)

   # If we found the JavaScriptCore library and we're using a Visual
-  # Studio generator and we're targeting either WindowsStore or
-  # WindowsPhone, then allow Visual Studio to use both the
-  # JavaScriptCore-Debug.lib and JavaScriptCore-Release.lib if they
-  # exist.
-  if(CMAKE_GENERATOR MATCHES "^Visual Studio .+" AND CMAKE_SYSTEM_NAME MATCHES "^Windows(Store|Phone)")
+  # Studio generator, then set Visual Studio to use version os JSC lib matching current Configuration of the build.
+  if(CMAKE_GENERATOR MATCHES "^Visual Studio .+")
     string(REGEX REPLACE "-(Debug|Release)" "-$(Configuration)" JavaScriptCore_LIBRARIES ${JavaScriptCore_LIBRARIES})
   endif()


fix FindOpenCL.cmake

fix FindOpenCL.cmake

--- cmake/Modules/FindOpenCL.cmake
+++ cmake/Modules/FindOpenCL.cmake
@@ -35,11 +35,9 @@
 	    # The AMD SDK currently installs both x86 and x86_64 libraries
 	    # This is only a hack to find out architecture
 	    IF( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64" )
-	    	SET(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86_64")
-			SET(OPENCL_LIB_DIR "$ENV{ATIINTERNALSTREAMSDKROOT}/lib/x86_64")
+	    	SET(OPENCL_LIB_DIR "$ENV{AMDAPPSDKROOT}/lib/x86_64")
 	    ELSE (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
-	    	SET(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86")
-	   		SET(OPENCL_LIB_DIR "$ENV{ATIINTERNALSTREAMSDKROOT}/lib/x86")
+	    	SET(OPENCL_LIB_DIR "$ENV{AMDAPPSDKROOT}/lib/x86")
 	    ENDIF( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64" )

 	    # find out if the user asked for a 64-bit build, and use the corresponding


fixed copy&paste error

fixed copy&paste error

--- cmake/Modules/FindPXCAPI.cmake
+++ cmake/Modules/FindPXCAPI.cmake
@@ -1,5 +1,5 @@
 ###############################################################################
-# Find Fotonic FZAPI
+# Find Intel Perceptual Computing SDK PXCAPI
 #
 # This sets the following variables:
 # PXCAPI_FOUND - True if PXCAPI was found.


cmake: fixed version in tarball

cmake: fixed version in tarball

--- cmake/Modules/GetVersion.cmake
+++ cmake/Modules/GetVersion.cmake
@@ -1,23 +1,26 @@
+# This file defines BH_VERSION_STRING, BH_VERSION_MAJOR, BH_VERSION_MINOR, and BH_VERSION_PATCH

 find_package(Git)
 set_package_properties(Git PROPERTIES DESCRIPTION "Distributed Version Control" URL "www.git-scm.com")
 set_package_properties(Git PROPERTIES TYPE OPTIONAL PURPOSE "For extracting the currect version of the Bohrium source")

-# We either extract the version using git or by reading the VERSION file
+# Let's try to extract the version using git
 if(GIT_FOUND)
-    message("git found: ${GIT_EXECUTABLE}")
+    execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match v[0-9]* --abbrev=0 --always
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+            OUTPUT_VARIABLE _VERSION_STRING
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    string(REPLACE "v" "" BH_VERSION_STRING ${_VERSION_STRING}) # removing the "v"
+endif()

-    execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match v[0-9]* --abbrev=0 --always
-                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                    OUTPUT_VARIABLE _VERSION_STRING
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-    string(REPLACE "v" "" BH_VERSION_STRING ${_VERSION_STRING}) # removing the "v"
-
-    # Save version to file (which will be used when Git is not available)
+# If the extraction failed, read the VERSION file
+if (BH_VERSION_STRING STREQUAL "")
+    file(READ ${CMAKE_SOURCE_DIR}/VERSION BH_VERSION_STRING)
+else()
+    # Else, write to the version to file for later use
     file(WRITE ${CMAKE_SOURCE_DIR}/VERSION ${BH_VERSION_STRING})
-else()
-    file(READ ${CMAKE_SOURCE_DIR}/VERSION BH_VERSION_STRING)
 endif()
+message(STATUS "BH_VERSION_STRING: \"${BH_VERSION_STRING}\"")

 # Then we extract the MAJOR, MINOR, and PATCH version