target_relocation.cmake: fix spell typo

target_relocation.cmake: fix spell typo

fix spell typo in target_relocation.cmake.

Signed-off-by: Wentong Wu <a92ffab6ab5ff780cf36418e13a69a97399df0f5@intel.com>

--- cmake/linker/ld/target_relocation.cmake
+++ cmake/linker/ld/target_relocation.cmake
@@ -3,28 +3,28 @@
 # See root CMakeLists.txt for description and expectations of these macros

 macro(toolchain_ld_relocation)
-  set(MEM_RELOCATAION_LD   "${PROJECT_BINARY_DIR}/include/generated/linker_relocate.ld")
-  set(MEM_RELOCATAION_SRAM_DATA_LD
+  set(MEM_RELOCATION_LD   "${PROJECT_BINARY_DIR}/include/generated/linker_relocate.ld")
+  set(MEM_RELOCATION_SRAM_DATA_LD
        "${PROJECT_BINARY_DIR}/include/generated/linker_sram_data_relocate.ld")
-  set(MEM_RELOCATAION_SRAM_BSS_LD
+  set(MEM_RELOCATION_SRAM_BSS_LD
        "${PROJECT_BINARY_DIR}/include/generated/linker_sram_bss_relocate.ld")
-  set(MEM_RELOCATAION_CODE "${PROJECT_BINARY_DIR}/code_relocation.c")
+  set(MEM_RELOCATION_CODE "${PROJECT_BINARY_DIR}/code_relocation.c")

   add_custom_command(
-    OUTPUT ${MEM_RELOCATAION_CODE} ${MEM_RELOCATAION_LD}
+    OUTPUT ${MEM_RELOCATION_CODE} ${MEM_RELOCATION_LD}
     COMMAND
     ${PYTHON_EXECUTABLE}
     ${ZEPHYR_BASE}/scripts/gen_relocate_app.py
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     -d ${APPLICATION_BINARY_DIR}
     -i '$<TARGET_PROPERTY:code_data_relocation_target,COMPILE_DEFINITIONS>'
-    -o ${MEM_RELOCATAION_LD}
-    -s ${MEM_RELOCATAION_SRAM_DATA_LD}
-    -b ${MEM_RELOCATAION_SRAM_BSS_LD}
-    -c ${MEM_RELOCATAION_CODE}
+    -o ${MEM_RELOCATION_LD}
+    -s ${MEM_RELOCATION_SRAM_DATA_LD}
+    -b ${MEM_RELOCATION_SRAM_BSS_LD}
+    -c ${MEM_RELOCATION_CODE}
     DEPENDS app kernel ${ZEPHYR_LIBS_PROPERTY}
     )

-  add_library(code_relocation_source_lib  STATIC ${MEM_RELOCATAION_CODE})
+  add_library(code_relocation_source_lib  STATIC ${MEM_RELOCATION_CODE})
   target_link_libraries(code_relocation_source_lib zephyr_interface)
 endmacro()


Changed how breakpad copies it's files

Changed how breakpad copies it's files

--- cmake/modules/BuildGoogleBreakpad.cmake
+++ cmake/modules/BuildGoogleBreakpad.cmake
@@ -32,13 +32,6 @@
     build-common
     COMMAND msbuild <SOURCE_DIR>/src/client/windows/common.vcxproj /nologo /t:rebuild /m:2 /property:Configuration=$<CONFIG>
   )
-
-  ExternalProject_Add_Step(
-    breakpad
-    copy-breakpad
-    COMMAND ${CMAKE_SCRIPT_PATH}/robocopy.bat "<SOURCE_DIR>/src/" "<INSTALL_DIR>/include/breakpad" "*.h"
-    COMMAND ${CMAKE_SCRIPT_PATH}/robocopy.bat "<SOURCE_DIR>/src/" "<INSTALL_DIR>/include/breakpad" "*.hpp"
-  )

   ExternalProject_Add_Step(
     breakpad
@@ -59,6 +52,14 @@
     COMMAND cmake -DVCXPROJ_PATH=<SOURCE_DIR>/src/client/windows/common.vcxproj -P ${CMAKE_SCRIPT_PATH}/breakpad_VS_patch.cmake
     COMMAND cmake -DVCXPROJ_PATH=<SOURCE_DIR>/src/client/windows/handler/exception_handler.vcxproj -P ${CMAKE_SCRIPT_PATH}/breakpad_VS_patch.cmake
     COMMAND cmake -DVCXPROJ_PATH=<SOURCE_DIR>/src/client/windows/crash_generation/crash_generation_client.vcxproj -P ${CMAKE_SCRIPT_PATH}/breakpad_VS_patch.cmake
+  )
+
+  ExternalProject_Add_Step(
+    breakpad
+    copy-breakpad
+    DEPENDERS patch_project_files
+    COMMAND ${CMAKE_SCRIPT_PATH}/robocopy.bat "<SOURCE_DIR>/src/" "<INSTALL_DIR>/include/breakpad" "*.h"
+    COMMAND ${CMAKE_SCRIPT_PATH}/robocopy.bat "<SOURCE_DIR>/src/" "<INSTALL_DIR>/include/breakpad" "*.hpp"
   )
 else()


cmake: Bump min version to 0.10.3

cmake: Bump min version to 0.10.3

We need SDK version 0.10.3 to fix a build regress on RISC-V when
linking.  So bump the version to pickup that fix.

Signed-off-by: Kumar Gala <a5e5248af4cd4f0ed8c515f61d40a6e2db46a66e@linaro.org>

--- cmake/toolchain/zephyr/host-tools.cmake
+++ cmake/toolchain/zephyr/host-tools.cmake
@@ -17,7 +17,7 @@
   return()
 endif()

-set(REQUIRED_SDK_VER 0.10.2)
+set(REQUIRED_SDK_VER 0.10.3)
 set(TOOLCHAIN_VENDOR zephyr)
 set(TOOLCHAIN_ARCH x86_64)


Replaced the MD5 with SHA1 on Windows

Replaced the MD5 with SHA1 on Windows

--- Tools/CMake/R.cmake
+++ Tools/CMake/R.cmake
@@ -568,7 +568,7 @@
     fetchcontent_declare(
       r_win_exe
       URL ${R_DOWNLOAD_URL}
-      URL_HASH MD5=${R_PACKAGE_HASH}
+      URL_HASH SHA1=${R_PACKAGE_HASH}
       DOWNLOAD_NO_EXTRACT ON
       DOWNLOAD_NAME ${R_PACKAGE_NAME})


use ${CMAKE_CFG_INTDIR} to avoid msvc specific code

--- gtest.cmake
+++ gtest.cmake
@@ -12,19 +12,9 @@

   set(byproducts)
   foreach(lib gtest gtest_main)
-    if(CMAKE_CONFIGURATION_TYPES)
-      set(${lib}_properties)
-      foreach(type ${CMAKE_CONFIGURATION_TYPES})
-        string(TOUPPER ${type} TYPE)
-        set(file ${binary_dir}/${type}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
-        list(APPEND ${lib}_properties IMPORTED_LOCATION_${TYPE} ${file})
-        list(APPEND byproducts ${file})
-      endforeach()
-    else()
-      set(file ${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
-      set(${lib}_properties IMPORTED_LOCATION ${file})
-      list(APPEND byproducts ${file})
-    endif()
+    set(file ${binary_dir}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(${lib}_properties IMPORTED_LOCATION ${file})
+    list(APPEND byproducts ${file})
   endforeach()

   set(build_byproducts)


FindTXT2TAGS.cmake: add STATUS to message

--- CMakeModules/FindTXT2TAGS.cmake
+++ CMakeModules/FindTXT2TAGS.cmake
@@ -53,7 +53,7 @@
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(TXT2TAGS DEFAULT_MSG TXT2TAGS_EXECUTABLE)

 IF(NOT TXT2TAGS_FOUND)
-  message("txt2tags not found, help cmake to find it by setting TXT2TAGS_EXECUTABLE")
+  message(STATUS "txt2tags not found, help cmake to find it by setting TXT2TAGS_EXECUTABLE")
 ENDIF(NOT TXT2TAGS_FOUND)

 MARK_AS_ADVANCED( TXT2TAGS_EXECUTABLE )


respect QUIET in ogre_find_component

respect QUIET in ogre_find_component

--HG--
branch : findft2update

--- CMake/Packages/FindOGRE.cmake
+++ CMake/Packages/FindOGRE.cmake
@@ -388,6 +388,7 @@
 )

 macro(ogre_find_component COMPONENT HEADER)
+  set(OGRE_${COMPONENT}_FIND_QUIETLY ${OGRE_FIND_QUIETLY})
   findpkg_begin(OGRE_${COMPONENT})
   find_path(OGRE_${COMPONENT}_INCLUDE_DIR NAMES ${HEADER} HINTS ${OGRE_INCLUDE_DIRS} ${OGRE_PREFIX_SOURCE} PATH_SUFFIXES ${COMPONENT} OGRE/${COMPONENT} Components/${COMPONENT}/include)
   set(OGRE_${COMPONENT}_LIBRARY_NAMES "Ogre${COMPONENT}${OGRE_LIB_SUFFIX}")


[OGRE-274] Clean traces of package files that have been removed in FindOGRE

--HG--
branch : v1-9

--- CMake/Packages/FindOGRE.cmake
+++ CMake/Packages/FindOGRE.cmake
@@ -261,16 +261,8 @@
       set(X11_FOUND FALSE)
     endif ()
   endif ()
-  if (APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
-    find_package(Cocoa QUIET)
-    find_package(Carbon QUIET)
-    find_package(CoreVideo QUIET)
-    if (NOT Cocoa_FOUND OR NOT Carbon_FOUND OR NOT CoreVideo_FOUND)
-      set(OGRE_DEPS_FOUND FALSE)
-    endif ()
-  endif ()
-
-  set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${ZZip_LIBRARIES} ${ZLIB_LIBRARIES} ${FreeImage_LIBRARIES} ${FREETYPE_LIBRARIES} )
+
+  set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${ZZip_LIBRARIES} ${ZLIB_LIBRARIES} ${FreeImage_LIBRARIES} ${FREETYPE_LIBRARIES})

   if (APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS AND NOT ANDROID)
     set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${X11_LIBRARIES} ${X11_Xt_LIBRARIES} ${XAW_LIBRARY} ${X11_Xrandr_LIB} ${Carbon_LIBRARIES} ${Cocoa_LIBRARIES})


Changed revision tag of MITK-Data.

Changed revision tag of MITK-Data.

--- CMakeExternals/MITKData.cmake
+++ CMakeExternals/MITKData.cmake
@@ -13,7 +13,7 @@

 if(BUILD_TESTING)

-  set(revision_tag 2f58ecf9)
+  set(revision_tag 1d8634e6)

   ExternalProject_Add(${proj}
     URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MITK-Data_${revision_tag}.tar.gz


Add AboutTab to sources

Add AboutTab to sources

--- Source/weather/ui/ios/iphone/sugar.cmake
+++ Source/weather/ui/ios/iphone/sugar.cmake
@@ -11,6 +11,8 @@

 sugar_files(
     WEATHER_IOS_SOURCES
+    AboutTab.h
+    AboutTab.mm
     WeatherTab.h
     WeatherTab.mm
 )


Revert "removed TomoPhantom"

Revert "removed TomoPhantom"

This reverts commit 86cc19e34019e4aaf87667e599227472e37a5191.

--- SuperBuild/External_CCPi-Framework.cmake
+++ SuperBuild/External_CCPi-Framework.cmake
@@ -22,7 +22,7 @@
 set(proj CCPi-Framework)

 # Set dependency list
-set(${proj}_DEPENDENCIES "")
+set(${proj}_DEPENDENCIES "TomoPhantom")

 # Include dependent projects if any
 ExternalProject_Include_Dependencies(${proj} DEPENDS_VAR ${proj}_DEPENDENCIES)


PKG: duplicate same check when adding files to make_symlinks

--- SuperBuild/Packaging/PackageMacros.cmake
+++ SuperBuild/Packaging/PackageMacros.cmake
@@ -75,12 +75,32 @@
 endfunction()

 macro(add_to_symlink_list src_file target_file)
+  #TODO: avoid code duplication here and later in install_rule
+
+  set(SKIP_INSTALL FALSE)
+  if(PKG_GENERATE_XDK)
+    get_filename_component(src_file_NAME ${src_file} NAME)
+    setif_value_in_list(is_gtk_lib "${src_file_NAME}" ALLOWED_SYSTEM_DLLS)
+    if ("${src_file_NAME}"
+	MATCHES
+	"libOTB|libotb|otbApp|otbapp_|otbTest|libMonteverdi|monteverdi|mapla|iceViewer"
+	)
+      set(SKIP_INSTALL TRUE)
+    endif()
+
+    if(is_gtk_lib)
+      set(SKIP_INSTALL TRUE)
+    endif()
+
+  endif(PKG_GENERATE_XDK)
   # NOTE: $OUT_DIR is set actually in pkgsetup.in. So don't try
   # any pre-mature optimization on that variable names
+  if(NOT SKIP_INSTALL)
   file(APPEND
     ${CMAKE_BINARY_DIR}/make_symlinks_temp
-    "ln -sf $OUT_DIR/lib/${src_file} $OUT_DIR/lib/${target_file}\n"
-  )
+    "if [ -f \"\$OUT_DIR/lib/${src_file}\" ]; then \n ln -sf \"$OUT_DIR/lib/${src_file}\" \"$OUT_DIR/lib/${target_file}\" \n fi;\n"
+    )
+  endif()
 endmacro()

 function(check_for_gtk_libs input_file result)


small cmake fix

small cmake fix

git-svn-id: 6b1c4fe79111c0bc0cce83313250759594f8984b@6597 e128ff1e-fa79-4151-a8cb-522299a2c450

--- cmake/gsConfig.cmake
+++ cmake/gsConfig.cmake
@@ -31,8 +31,10 @@
    "Coefficient type(float, double, long double, mpfr::mpreal, mpq_class)" FORCE)
 elseif(${GISMO_COEFF_TYPE} STREQUAL "mpfr::mpreal")
   set(GISMO_WITH_MPFR ON CACHE INTERNAL "Use MPFR")
+  set(GISMO_WITH_MPQ OFF CACHE INTERNAL "Use GMP/mpq_class")
 elseif(${GISMO_COEFF_TYPE} STREQUAL "mpq_class")
   set(GISMO_WITH_MPQ ON CACHE INTERNAL "Use GMP/mpq_class")
+  set(GISMO_WITH_MPFR OFF CACHE INTERNAL "Use MPFR")
 endif()
 set_property(CACHE GISMO_COEFF_TYPE PROPERTY STRINGS
 "float" "double" "long double" "mpfr::mpreal" "mpq_class")
@@ -149,7 +151,8 @@

 elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   # Update if necessary
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -Wattributes") # -Woverloaded-virtual -Wconversion -Wextra -pedantic
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -Wattributes")
+  # -Woverloaded-virtual -Wconversion -Wextra -pedantic
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftrack-macro-expansion=0")
   endif()


Fix gcc testing flag to std=gnu11

Fix gcc testing flag to std=gnu11

--- Testing/script/travis_script.cmake
+++ Testing/script/travis_script.cmake
@@ -126,7 +126,7 @@
 endif()

 if($ENV{CC} MATCHES "^gcc.*")
-  set(MERCURY_C_FLAGS "-Wall -Wextra -Wshadow -Winline -Wundef -Wcast-qual -Wconversion -Wmissing-prototypes -pedantic -Wpointer-arith -Wformat=2 -std=gnu99 ${MERCURY_MEMCHECK_FLAGS}")
+  set(MERCURY_C_FLAGS "-Wall -Wextra -Wshadow -Winline -Wundef -Wcast-qual -Wconversion -Wmissing-prototypes -pedantic -Wpointer-arith -Wformat=2 -std=gnu11 ${MERCURY_MEMCHECK_FLAGS}")
 endif()

 # Initial cache used to build mercury, options can be modified here


CMake/FindMPI: Drop unnecessary and incorrect use of GetPrerequisites

The call to the GetPrerequisites is_file_executable function passes the
name of a CMake variable instead of its value.  Therefore the function
has always failed and caused the search for the compiler name to run
even with an absolute path.  Switch to using if(IS_ABSOLUTE) instead and
drop use of GetPrerequisites.

--- CMake/FindMPI.cmake
+++ CMake/FindMPI.cmake
@@ -78,7 +78,6 @@

 # include this to handle the QUIETLY and REQUIRED arguments
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-include(GetPrerequisites)

 #
 # This part detects MPI compilers, attempting to wade through the mess of compiler names in
@@ -560,14 +559,13 @@
   if (CMAKE_${lang}_COMPILER_WORKS)
     # If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler.
     if (MPI_${lang}_COMPILER)
-      is_file_executable(MPI_${lang}_COMPILER MPI_COMPILER_IS_EXECUTABLE)
-      if (NOT MPI_COMPILER_IS_EXECUTABLE)
+      if (NOT IS_ABSOLUTE "${MPI_${lang}_COMPILER}")
         # Get rid of our default list of names and just search for the name the user wants.
         set(_MPI_${lang}_COMPILER_NAMES ${MPI_${lang}_COMPILER})
         set(MPI_${lang}_COMPILER "MPI_${lang}_COMPILER-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
-        # If the user specifies a compiler, we don't want to try to search libraries either.
-        set(try_libs FALSE)
-      endif()
+      endif()
+      # If the user specifies a compiler, we don't want to try to search libraries either.
+      set(try_libs FALSE)
     else()
       set(try_libs TRUE)
     endif()


Make COMMON_LIBRARY_TYPE a cache property

Using static or shared libraries really is a system decision (cf. BGQ
performance with DSOs) -- Consequently one wants to setup the whole
build shared or static. This change makes this a cache property, and a
follow-on Buildyard change will propagate the setting from BY to all
projects. An even later change will probably auto-detect the target
platform and set COMMON_LIBRARY_TYPE accordingly.

--- CommonLibrary.cmake
+++ CommonLibrary.cmake
@@ -8,7 +8,8 @@
 # * NAME_HEADERS for all internal header files
 # * NAME_PUBLIC_HEADERS for public, installed header files
 # * NAME_LINK_LIBRARIES for dependencies of name
-# * NAME_LIBRARY_TYPE or COMMON_LIBRARY_TYPE for SHARED or STATIC library
+# * NAME_LIBRARY_TYPE or COMMON_LIBRARY_TYPE for SHARED or STATIC library, with
+#   COMMON_LIBRARY_TYPE being an option stored in the CMakeCache.
 # * PROJECT_INCLUDE_NAME for the include directory and project include header
 # * VERSION for the API version
 # * VERSION_ABI for the ABI version
@@ -22,6 +23,10 @@
 # headers.

 include(InstallFiles)
+
+set(COMMON_LIBRARY_TYPE SHARED CACHE STRING
+  "Library type {any combination of SHARED, STATIC}")
+set_property(CACHE COMMON_LIBRARY_TYPE PROPERTY STRINGS SHARED STATIC)

 function(COMMON_LIBRARY Name)
   string(TOUPPER ${Name} NAME)


Adding a NAME_LIBRARY_TYPE parameter in order to choose between STATIC and SHARED library types

--- CommonLibrary.cmake
+++ CommonLibrary.cmake
@@ -8,6 +8,7 @@
 # * NAME_HEADERS for all internal header files
 # * NAME_PUBLIC_HEADERS for public, installed header files
 # * NAME_LINK_LIBRARIES for dependencies of name
+# * NAME_LIBRARY_TYPE for setting shared or static library
 # * VERSION for the API version
 # * VERSION_ABI for the ABI version
 #
@@ -56,7 +57,10 @@
   list(SORT PUBLIC_HEADERS)

   source_group(${name} FILES ${SOURCES} ${HEADERS} ${PUBLIC_HEADERS})
-  add_library(${Name} SHARED ${SOURCES} ${HEADERS} ${PUBLIC_HEADERS})
+  if (NOT ${NAME}_LIBRARY_TYPE)
+    set(${NAME}_LIBRARY_TYPE SHARED)
+  endif()
+  add_library(${Name} ${${NAME}_LIBRARY_TYPE} ${SOURCES} ${HEADERS} ${PUBLIC_HEADERS})
   target_link_libraries(${Name} ${LINK_LIBRARIES})
   set_target_properties(${Name}
     PROPERTIES VERSION ${VERSION} SOVERSION ${VERSION_ABI})


Update PointCloudLibraryPlugin to improve MacOS installation

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

 ExternalProject_Add(PointCloudLibraryPlugin
   GIT_REPOSITORY https://github.com/patmarion/PointCloudLibraryPlugin.git
-  GIT_TAG 2b1bdfe
+  GIT_TAG 84de916
   CMAKE_CACHE_ARGS
     ${default_cmake_args}
     ${eigen_args}


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


cmake: we don't need the dylib copy on travis, so just disable it there -- for extensions too.

--- Shared/CMake/JamomaUtilFunctions.cmake
+++ Shared/CMake/JamomaUtilFunctions.cmake
@@ -201,19 +201,21 @@

 	if(APPLE)
 		if(BUILD_JAMOMAMAX)
-			ADD_CUSTOM_COMMAND(
-			  TARGET ${PROJECT_NAME}
-			  POST_BUILD
-			  COMMAND ${CMAKE_COMMAND} -E make_directory
-			   ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/support
-			)
-			ADD_CUSTOM_COMMAND(
-			  TARGET ${PROJECT_NAME} #Jamoma::Foundation # for instance
-			  POST_BUILD
-			  COMMAND ${CMAKE_COMMAND} -E copy
-			      ${CMAKE_BINARY_DIR}/JamomaCore/${JAMOMA_CURRENT_LIBRARY_NAME}/extensions/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/${PROJECT_NAME}.ttdylib #* # we have to be careful with .so / .dll
-			      ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/support #/libJamomaFoundation.dylib
-			)
+			if(!$ENV{TRAVIS})
+				ADD_CUSTOM_COMMAND(
+				  TARGET ${PROJECT_NAME}
+				  POST_BUILD
+				  COMMAND ${CMAKE_COMMAND} -E make_directory
+				   ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/support
+				)
+				ADD_CUSTOM_COMMAND(
+				  TARGET ${PROJECT_NAME} #Jamoma::Foundation # for instance
+				  POST_BUILD
+				  COMMAND ${CMAKE_COMMAND} -E copy
+				      ${CMAKE_BINARY_DIR}/JamomaCore/${JAMOMA_CURRENT_LIBRARY_NAME}/extensions/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/${PROJECT_NAME}.ttdylib #* # we have to be careful with .so / .dll
+				      ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/support #/libJamomaFoundation.dylib
+				)
+			endif() # !$ENV{TRAVIS}
 		endif() # BUILD_JAMOMAMAX
 	endif() # APPLE


Update gsl-lite to v0.32.0

Update gsl-lite to v0.32.0

--- chainerx_cc/third_party/gsl-lite.cmake
+++ chainerx_cc/third_party/gsl-lite.cmake
@@ -4,7 +4,7 @@
 include(ExternalProject)
 ExternalProject_Add(gsl-lite
         GIT_REPOSITORY    https://github.com/martinmoene/gsl-lite
-        GIT_TAG           v0.26.0
+        GIT_TAG           v0.32.0
         SOURCE_DIR        "${CMAKE_BINARY_DIR}/gsl-lite"
         BINARY_DIR        ""
         CONFIGURE_COMMAND ""


Work around find_package() failure for newer boost versions with cmake output (#2293)

The FindBoost.cmake interface is broken if it uses boost's installed cmake
output (e.g. boost 1.70.0, cmake <= 3.14) at least in the case that boost
was installed to a non-standard prefix. Specifically it fails to set
variables as indicated in FindBoost.cmake documentation. So until that's
fixed force FindBoost.cmake to use the original path which is consistent
with its docs.

--- src/cmake/externalpackages.cmake
+++ src/cmake/externalpackages.cmake
@@ -96,8 +96,21 @@
     if (NOT USE_STD_REGEX)
         list (APPEND Boost_COMPONENTS regex)
     endif ()
+    # The FindBoost.cmake interface is broken if it uses boost's installed
+    # cmake output (e.g. boost 1.70.0, cmake <= 3.14). Specifically it fails
+    # to set the expected variables printed below. So until that's fixed
+    # force FindBoost.cmake to use the original brute force path.
+    set (Boost_NO_BOOST_CMAKE ON)
     find_package (Boost 1.53 REQUIRED
                   COMPONENTS ${Boost_COMPONENTS})
+    if (Boost_FOUND)
+        message (STATUS "Boost include      ${Boost_INCLUDE_DIR} ")
+        message (STATUS "Boost lib debug    ${Boost_LIBRARY_DIR_DEBUG} ")
+        message (STATUS "Boost lib release  ${Boost_LIBRARY_DIR_RELEASE} ")
+        message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
+        message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
+        message (STATUS "Boost libraries    ${Boost_LIBRARIES}")
+    endif ()
 endif ()

 # On Linux, Boost 1.55 and higher seems to need to link against -lrt


compiler: gcc: Add warning option to spot poblematic switches

Option -Wimplicit-fallthrough as the name suggests raises a warning when
there is an implicit fallthrough in a switch clause. This warning does
not happen when the last statement is a return or a call to a function
declared with noreturn attribute.

This flag helps to enforce two MISRA-C rules (not completely), 16.1 and
16.3

Signed-off-by: Flavio Ceolin <979b9165500b0741b9d0500e2efd74fc1547bff7@intel.com>

--- cmake/compiler/gcc/target_warnings.cmake
+++ cmake/compiler/gcc/target_warnings.cmake
@@ -11,6 +11,12 @@
     -Wno-format-zero-length
     -Wno-main
   )
+
+if(CMAKE_C_COMPILER_VERSION VERSION_GREATER "7.1.0")
+  zephyr_compile_options(
+    -Wimplicit-fallthrough=2
+    )
+endif()

 if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "9.1.0")
   zephyr_compile_options(


Define tap as a Memory Constrained system

--- cmake/configs/nuttx_tap-v1_default.cmake
+++ cmake/configs/nuttx_tap-v1_default.cmake
@@ -1,6 +1,8 @@
 include(nuttx/px4_impl_nuttx)

 set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-none-eabi.cmake)
+
+set(target_definitions MEMORY_CONSTRAINED_SYSTEM)

 set(config_module_list
 	#


OSX: Enforces Boost to use DEPLOYMENT_TARGET

Enforces Boost to follow DEPLOYMENT_TARGET instead of
requirering to built-system version as deployment target

--- Superbuild/Projects/boost.cmake
+++ Superbuild/Projects/boost.cmake
@@ -1,8 +1,16 @@
+set (boost_toolset "")
+set (boost_osx_opts "")
+if (APPLE)
+  set (boost_toolset "--with-toolset=clang")
+  set (boost_osx_opts "toolset=clang cxxflags=\"-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}\" cflags=\"-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}\"")
+  message(STATUS "${boost_osx_opts}")
+ #macosx-version=${CMAKE_OSX_DEPLOYMENT_TARGET} macosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+endif(APPLE)
 add_external_project_or_use_system(boost
   BUILD_IN_SOURCE 1
   CONFIGURE_COMMAND
-    <SOURCE_DIR>/bootstrap.sh --prefix=<INSTALL_DIR>
+    <SOURCE_DIR>/bootstrap.sh ${boost_toolset} --prefix=<INSTALL_DIR>
                               --with-libraries=date_time,thread,regex,system,program_options,filesystem,iostreams,chrono
-  BUILD_COMMAND <SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi
-  INSTALL_COMMAND <SOURCE_DIR>/bjam  address-model=${VV_BUILD_ARCHITECTURE} threading=multi --prefix=<INSTALL_DIR> install
+  BUILD_COMMAND <SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi --with-regex --with-system --with-date_time --with-program_options --with-iostreams --with-filesystem --with-thread ${boost_osx_opts} --prefix=<INSTALL_DIR> install
+  INSTALL_COMMAND ""
 )


Update PythonExternal.cmake

Update PythonExternal.cmake

--- Superbuild/PythonExternal.cmake
+++ Superbuild/PythonExternal.cmake
@@ -34,7 +34,7 @@
 ENDIF()

 set(USER_PYTHON_VERSION ${DEFAULT_PYTHON_VERSION} CACHE STRING "Branch name corresponding to Python version number")
-set_property(CACHE USER_PYTHON_VERSION PROPERTY STRINGS 3.4.3 3.5.6 3.6.7 3.7.1 3.8.2)
+set_property(CACHE USER_PYTHON_VERSION PROPERTY STRINGS 3.4.3 3.5.6 3.6.7 3.7.9 3.8.2)

 string(REPLACE "." ";" USER_PYTHON_VERSION_LIST ${USER_PYTHON_VERSION})
 list(GET USER_PYTHON_VERSION_LIST 0 USER_PYTHON_VERSION_MAJOR)


[CMake] Removing an unnecessary layer of variable indirection

This prevents passthrough variables from having values.

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@254641 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/LLVMExternalProjectUtils.cmake
+++ cmake/modules/LLVMExternalProjectUtils.cmake
@@ -95,7 +95,7 @@
     if(variableName MATCHES "^${nameCanon}")
       string(REPLACE ";" "\;" value "${${variableName}}")
       list(APPEND PASSTHROUGH_VARIABLES
-        -D${variableName}=${${value}})
+        -D${variableName}=${value})
     endif()
   endforeach()


geometry: drop server-side option for geometry

--- channels/geometry/ChannelOptions.cmake
+++ channels/geometry/ChannelOptions.cmake
@@ -9,4 +9,3 @@
 	DEFAULT ${OPTION_DEFAULT})

 define_channel_client_options(${OPTION_CLIENT_DEFAULT})
-define_channel_server_options(${OPTION_SERVER_DEFAULT})


cmake: Simplify VTK external project removing unused TCL settings

--- SuperBuild/External_VTK.cmake
+++ SuperBuild/External_VTK.cmake
@@ -56,7 +56,6 @@
   endif()

   ### --- Project specific additions here
-  set(VTK_WRAP_TCL OFF)
   set(VTK_WRAP_PYTHON OFF)

   if (${PROJECT_NAME}_USE_PYTHONQT)
@@ -114,33 +113,6 @@
     list(APPEND VTK_QT_ARGS -DVTK_USE_TK:BOOL=OFF)
   endif()

-  set(slicer_TCL_LIB)
-  set(slicer_TK_LIB)
-  set(slicer_TCLSH)
-  set(VTK_TCL_ARGS)
-  if(VTK_WRAP_TCL)
-    if(WIN32)
-      set(slicer_TCL_LIB ${CMAKE_BINARY_DIR}/tcl-build/lib/tcl84.lib)
-      set(slicer_TK_LIB ${CMAKE_BINARY_DIR}/tcl-build/lib/tk84.lib)
-      set(slicer_TCLSH ${CMAKE_BINARY_DIR}/tcl-build/bin/tclsh.exe)
-    elseif(APPLE)
-      set(slicer_TCL_LIB ${CMAKE_BINARY_DIR}/tcl-build/lib/libtcl8.4.dylib)
-      set(slicer_TK_LIB ${CMAKE_BINARY_DIR}/tcl-build/lib/libtk8.4.dylib)
-      set(slicer_TCLSH ${CMAKE_BINARY_DIR}/tcl-build/bin/tclsh84)
-    else()
-      set(slicer_TCL_LIB ${CMAKE_BINARY_DIR}/tcl-build/lib/libtcl8.4.so)
-      set(slicer_TK_LIB ${CMAKE_BINARY_DIR}/tcl-build/lib/libtk8.4.so)
-      set(slicer_TCLSH ${CMAKE_BINARY_DIR}/tcl-build/bin/tclsh84)
-    endif()
-    set(VTK_TCL_ARGS
-      -DTCL_INCLUDE_PATH:PATH=${CMAKE_BINARY_DIR}/tcl-build/include
-      -DTK_INCLUDE_PATH:PATH=${CMAKE_BINARY_DIR}/tcl-build/include
-      -DTCL_LIBRARY:FILEPATH=${slicer_TCL_LIB}
-      -DTK_LIBRARY:FILEPATH=${slicer_TK_LIB}
-      -DTCL_TCLSH:FILEPATH=${slicer_TCLSH}
-      )
-  endif()
-
   set(VTK_BUILD_STEP "")
   if(UNIX)
     configure_file(SuperBuild/External_VTK_build_step.cmake.in
@@ -156,9 +128,8 @@
       -DVTK_USE_PARALLEL:BOOL=ON
       -DVTK_DEBUG_LEAKS:BOOL=${${PROJECT_NAME}_USE_VTK_DEBUG_LEAKS}
       -DVTK_LEGACY_REMOVE:BOOL=OFF
-      -DVTK_WRAP_TCL:BOOL=${VTK_WRAP_TCL}
+      -DVTK_WRAP_TCL:BOOL=OFF
       #-DVTK_USE_RPATH:BOOL=ON # Unused
-      ${VTK_TCL_ARGS}
       -DVTK_WRAP_PYTHON:BOOL=${VTK_WRAP_PYTHON}
       -DVTK_INSTALL_LIB_DIR:PATH=${${PROJECT_NAME}_INSTALL_LIB_DIR}
       ${VTK_PYTHON_ARGS}


[CMake] Set missing PythonX_Interpreter_Development_FOUND variable

A fix for:
https://lcgapp-services.cern.ch/root-jenkins/job/roottest-pullrequests-build/6686/console

--- cmake/modules/SearchRootCoreDeps.cmake
+++ cmake/modules/SearchRootCoreDeps.cmake
@@ -238,6 +238,7 @@
   find_package(NumPy)

   if (PYTHONLIBS_FOUND)
+    set(Python${PYTHON_VERSION_MAJOR}_Interpreter_Development_FOUND ON) # This means we have both Interpreter and Development, hence we can build PyROOT with this Python
     set(PYTHON_EXECUTABLE_Development_Main "${PYTHON_EXECUTABLE}")
     set(PYTHON_VERSION_STRING_Development_Main "${PYTHON_VERSION_STRING}")
     set(PYTHON_VERSION_MAJOR_Development_Main "${PYTHON_VERSION_MAJOR}")


Not used

Not used

--- fsm/cmake/FindBISON.cmake
+++ fsm/cmake/FindBISON.cmake
@@ -1,162 +0,0 @@
-# - Find bison executable and provides macros to generate custom build rules
-# The module defined the following variables:
-#  BISON_EXECUTABLE - path to the bison program
-#  BISON_VERSION - version of bison
-#  BISON_FOUND - true if the program was found
-# If bison is found, the module defines the macros:
-#  BISON_TARGET(<Name> <YaccInput> <CodeOutput> [VERBOSE <file>]
-#              [COMPILE_FLAGS <string>])
-# which will create  a custom rule to generate  a parser. <YaccInput> is
-# the path to  a yacc file. <CodeOutput> is the name  of the source file
-# generated by bison.  A header file is also  be generated, and contains
-# the  token  list.  If  COMPILE_FLAGS  option is  specified,  the  next
-# parameter is  added in the bison  command line.  if  VERBOSE option is
-# specified, <file> is created  and contains verbose descriptions of the
-# grammar and parser. The macro defines a set of variables:
-#  BISON_${Name}_DEFINED - true is the macro ran successfully
-#  BISON_${Name}_INPUT - The input source file, an alias for <YaccInput>
-#  BISON_${Name}_OUTPUT_SOURCE - The source file generated by bison
-#  BISON_${Name}_OUTPUT_HEADER - The header file generated by bison
-#  BISON_${Name}_OUTPUTS - The sources files generated by bison
-#  BISON_${Name}_COMPILE_FLAGS - Options used in the bison command line
-#
-# Example:
-# FIND_PACKAGE(BISON)
-# BISON_TARGET(MyParser parser.y ${PROJECT_BINARY_DIR}/parser.cpp)
-# ADD_EXECUTABLE(Foo main.cpp ${BISON_MyParser_OUTPUTS})
-#
-
-# Copyright (c) 2006, Tristan Carel
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the University of California, Berkeley nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# $Id: FindBISON.cmake 1218 2007-03-22 22:10:45Z jmh $
-
-SET(BISON_FOUND FALSE)
-
-FIND_PROGRAM(BISON_EXECUTABLE bison DOC "path to the bison executable")
-MARK_AS_ADVANCED(BISON_EXECUTABLE)
-
-IF(BISON_EXECUTABLE)
-  SET(BISON_FOUND TRUE)
-
-  EXECUTE_PROCESS(COMMAND ${BISON_EXECUTABLE} --version
-    OUTPUT_VARIABLE BISON_version_output
-    ERROR_VARIABLE BISON_version_error
-    RESULT_VARIABLE BISON_version_result
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  IF(NOT ${BISON_version_result} EQUAL 0)
-    MESSAGE(SEND_ERROR "Command \"${BISON_EXECUTABLE} --version\" failed with output:\n${BISON_version_error}")
-  ELSE(NOT ${BISON_version_result} EQUAL 0)
-    STRING(REGEX REPLACE "^bison \\(GNU Bison\\) ([^\n]+)\n.*" "\\1"
-      BISON_VERSION "${BISON_version_output}")
-  ENDIF(NOT ${BISON_version_result} EQUAL 0)
-
-  # internal macro
-  MACRO(BISON_TARGET_option_verbose Name BisonOutput filename)
-    LIST(APPEND BISON_TARGET_cmdopt "--verbose")
-    GET_FILENAME_COMPONENT(BISON_TARGET_output_path "${BisonOutput}" PATH)
-    GET_FILENAME_COMPONENT(BISON_TARGET_output_name "${BisonOutput}" NAME_WE)
-    ADD_CUSTOM_COMMAND(OUTPUT ${filename}
-      COMMAND ${CMAKE_COMMAND} -E copy
-      "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
-      "${filename}"
-      DEPENDS
-      "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
-      COMMENT "[BISON][${Name}] Copying bison verbose table to ${filename}"
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-    SET(BISON_${Name}_VERBOSE_FILE ${filename})
-    LIST(APPEND BISON_TARGET_extraoutputs
-      "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output")
-  ENDMACRO(BISON_TARGET_option_verbose)
-
-  # internal macro
-  MACRO(BISON_TARGET_option_extraopts Options)
-    SET(BISON_TARGET_extraopts "${Options}")
-    SEPARATE_ARGUMENTS(BISON_TARGET_extraopts)
-    LIST(APPEND BISON_TARGET_cmdopt ${BISON_TARGET_extraopts})
-  ENDMACRO(BISON_TARGET_option_extraopts)
-
-  MACRO(BISON_TARGET Name BisonInput BisonOutput)
-    SET(BISON_TARGET_output_header "")
-    SET(BISON_TARGET_command_opt "")
-    SET(BISON_TARGET_outputs "${BisonOutput}")
-    IF(NOT ${ARGC} EQUAL 3 AND NOT ${ARGC} EQUAL 5 AND NOT ${ARGC} EQUAL 7)
-      MESSAGE(SEND_ERROR "Usage")
-    ELSE(NOT ${ARGC} EQUAL 3 AND NOT ${ARGC} EQUAL 5 AND NOT ${ARGC} EQUAL 7)
-      # Parsing parameters
-      IF(${ARGC} GREATER 5 OR ${ARGC} EQUAL 5)
-	IF("${ARGV3}" STREQUAL "VERBOSE")
-	  BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV4}")
-	ENDIF("${ARGV3}" STREQUAL "VERBOSE")
-	IF("${ARGV3}" STREQUAL "COMPILE_FLAGS")
-	  BISON_TARGET_option_extraopts("${ARGV4}")
-	ENDIF("${ARGV3}" STREQUAL "COMPILE_FLAGS")
-      ENDIF(${ARGC} GREATER 5 OR ${ARGC} EQUAL 5)
-      IF(${ARGC} EQUAL 7)
-	IF("${ARGV5}" STREQUAL "VERBOSE")
-	  BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV6}")
-	ENDIF("${ARGV5}" STREQUAL "VERBOSE")
-	IF("${ARGV5}" STREQUAL "COMPILE_FLAGS")
-	  BISON_TARGET_option_extraopts("${ARGV6}")
-	ENDIF("${ARGV5}" STREQUAL "COMPILE_FLAGS")
-      ENDIF(${ARGC} EQUAL 7)
-
-      # Header's name generated by bison (see option -d)
-      LIST(APPEND BISON_TARGET_cmdopt "-d")
-      STRING(REGEX REPLACE "^(.*)\\.c([^.]*)$" "\\1.h\\2"
-	BISON_${Name}_OUTPUT_HEADER "${ARGV2}")
-      LIST(APPEND BISON_TARGET_outputs "${BISON_${Name}_OUTPUT_HEADER}")
-
-      ADD_CUSTOM_COMMAND(OUTPUT ${BISON_TARGET_outputs}
-	${BISON_TARGET_extraoutputs}
-	COMMAND ${BISON_EXECUTABLE} ${BISON_TARGET_cmdopt} -o ${ARGV2} ${ARGV1}
-	DEPENDS ${ARGV1}
-	COMMENT "[BISON][${Name}] Building parser with bison ${BISON_VERSION}"
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-
-      # define target variables
-      SET(BISON_${Name}_DEFINED TRUE)
-      SET(BISON_${Name}_INPUT ${ARGV1})
-      SET(BISON_${Name}_OUTPUTS ${BISON_TARGET_outputs})
-      SET(BISON_${Name}_COMPILE_FLAGS ${BISON_TARGET_cmdopt})
-      SET(BISON_${Name}_OUTPUT_SOURCE "${BisonOutput}")
-
-    ENDIF(NOT ${ARGC} EQUAL 3 AND NOT ${ARGC} EQUAL 5 AND NOT ${ARGC} EQUAL 7)
-  ENDMACRO(BISON_TARGET)
-
-ENDIF(BISON_EXECUTABLE)
-
-
-IF(NOT BISON_FOUND)
-  IF(NOT BISON_FIND_QUIETLY)
-    MESSAGE(STATUS "BISON was not found.")
-  ELSE(NOT BISON_FIND_QUIETLY)
-    IF(BISON_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "BISON was not found.")
-    ENDIF(BISON_FIND_REQUIRED)
-  ENDIF(NOT BISON_FIND_QUIETLY)
-ENDIF(NOT BISON_FOUND)
-
-# FindBISON.cmake ends here


Fixed lib suffix for 64-bit builds

Fixed lib suffix for 64-bit builds

--- cmake/FindDM.cmake
+++ cmake/FindDM.cmake
@@ -21,6 +21,11 @@
 # We expect that the driver manager is UnixODBC

 # Try to find the include directory, giving precedence to special variables
+IF ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+  SET(LIB_SUFFIX "lib64")
+ELSE()
+  SET(LIB_SUFFIX "lib")
+ENDIF()
 FIND_PATH(ODBC_INCLUDE_DIR sql.h
     HINTS ${DM_INCLUDE_DIR}
           ${DM_DIR}
@@ -48,7 +53,7 @@
           ENV DM_DIR
     PATHS /usr/local
           /usr
-    PATH_SUFFIXES lib
+    PATH_SUFFIXES ${LIB_SUFFIX}
     NO_DEFAULT_PATH
     DOC "Driver Manager Libraries")
 FIND_PATH(ODBC_LIB_DIR libodbc.so


If available we use odbc_config to determine location of unixODBC include files and libraries

--- cmake/FindDM.cmake
+++ cmake/FindDM.cmake
@@ -20,44 +20,60 @@
 # Cmake script to look for driver manager includes and libraries on platforms others than Windows
 # We expect that the driver manager is UnixODBC

-# Try to find the include directory, giving precedence to special variables
-IF ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-  SET(LIB_SUFFIX "lib64")
+FIND_PROGRAM(ODBC_CONFIG odbc_config
+             PATH
+             /usr/bin
+             ${DM_DIR}
+             )
+
+IF(ODBC_CONFIG)
+  MESSAGE(STATUS "Found odbc_config: ${ODBC_CONFIG}")
+  EXECUTE_PROCESS(COMMAND ${ODBC_CONFIG} --include-prefix
+                  OUTPUT_VARIABLE result)
+  STRING(REPLACE "\n" "" ODBC_INCLUDE_DIR ${result})
+  EXECUTE_PROCESS(COMMAND ${ODBC_CONFIG} --lib-prefix
+                  OUTPUT_VARIABLE result)
+  STRING(REPLACE "\n" "" ODBC_LIB_DIR ${result})
 ELSE()
-  SET(LIB_SUFFIX "lib")
-ENDIF()
-FIND_PATH(ODBC_INCLUDE_DIR sql.h
-    HINTS ${DM_INCLUDE_DIR}
-          ${DM_DIR}
-          ENV DM_INCLUDE_DIR
-          ENV DM_DIR
-    PATHS /usr/local
-          /usr
-    PATH_SUFFIXES include
-    NO_DEFAULT_PATH
-    DOC "Driver Manager Includes")
-# Giving chance to cmake_(environment)path
-FIND_PATH(ODBC_INCLUDE_DIR sql.h
-    DOC "Driver Manager Includes")
+  # Try to find the include directory, giving precedence to special variables
+  IF ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    SET(LIB_SUFFIX "lib64")
+  ELSE()
+    SET(LIB_SUFFIX "lib")
+  ENDIF()
+  FIND_PATH(ODBC_INCLUDE_DIR sql.h
+      HINTS ${DM_INCLUDE_DIR}
+            ${DM_DIR}
+            ENV DM_INCLUDE_DIR
+            ENV DM_DIR
+      PATHS /usr/local
+            /usr
+      PATH_SUFFIXES include
+      NO_DEFAULT_PATH
+      DOC "Driver Manager Includes")
+  # Giving chance to cmake_(environment)path
+  FIND_PATH(ODBC_INCLUDE_DIR sql.h
+      DOC "Driver Manager Includes")

-IF(ODBC_INCLUDE_DIR)
-  MESSAGE(STATUS "Found ODBC Driver Manager includes: ${ODBC_INCLUDE_DIR}")
-ENDIF()
+  IF(ODBC_INCLUDE_DIR)
+    MESSAGE(STATUS "Found ODBC Driver Manager includes: ${ODBC_INCLUDE_DIR}")
+  ENDIF()

-# Try to find DM libraries, giving precedence to special variables
-FIND_PATH(ODBC_LIB_DIR libodbc.so
-    HINTS ${DM_LIB_DIR}
-          ${DM_DIR}
-          ENV DM_LIB_DIR
-          ENV DM_DIR
-    PATHS /usr/local
-          /usr
-    PATH_SUFFIXES ${LIB_SUFFIX}
-    NO_DEFAULT_PATH
-    DOC "Driver Manager Libraries")
-FIND_PATH(ODBC_LIB_DIR libodbc.so
-    DOC "Driver Manager Libraries")
+  # Try to find DM libraries, giving precedence to special variables
+  FIND_PATH(ODBC_LIB_DIR libodbc.so
+      HINTS ${DM_LIB_DIR}
+            ${DM_DIR}
+            ENV DM_LIB_DIR
+            ENV DM_DIR
+      PATHS /usr/local
+            /usr
+      PATH_SUFFIXES ${LIB_SUFFIX}
+      NO_DEFAULT_PATH
+      DOC "Driver Manager Libraries")
+  FIND_PATH(ODBC_LIB_DIR libodbc.so
+      DOC "Driver Manager Libraries")
+ENDIF()

 IF(ODBC_LIB_DIR AND ODBC_INCLUDE_DIR)
   MESSAGE(STATUS "Found ODBC Driver Manager libraries: ${ODBC_LIB_DIR}")


Make macOS happy.

Make macOS happy.

--- cmake/common.cmake
+++ cmake/common.cmake
@@ -190,6 +190,7 @@
       -readability-convert-member-functions-to-static
       -readability-magic-numbers
       -readability-qualified-auto
+      -readability-use-anyofallof
       ${_DISABLED_READABILITY_CHECKS}
     )
     string(REPLACE ";" ","


removed cyCodeBase

removed cyCodeBase

--- cmake/common.cmake
+++ cmake/common.cmake
@@ -23,6 +23,7 @@
     FILE(COPY ${f} DESTINATION ${DEST})
   ENDFOREACH()
 ENDMACRO(DeployRepo)
+#
 #
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 #
@@ -79,9 +80,16 @@
     MESSAGE(FATAL_ERROR " GLEW not found!")
 ENDIF()
 #
+#--- ospray
+#
+FIND_PACKAGE(ospray REQUIRED)
+INCLUDE_DIRECTORIES(${OSPRAY_INCLUDE_DIRS})
+MESSAGE(STATUS "OSPRay Include: ${OSPRAY_INCLUDE_DIRS}")
+MESSAGE(STATUS "OSPRay Libraries: ${OSPRAY_LIBRARIES}")
+#
 #--- add cyCodeBase (submodule)
 #   https://github.com/cemyuksel/cyCodeBase.git
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/external/cyCodeBase)
+# INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/external/cyCodeBase)
 #
 #--- lodePNG
 #   http://lodev.org/lodepng/
@@ -89,25 +97,18 @@
 INCLUDE_DIRECTORIES(${LodePNG_INCLUDE_DIR})
 LIST(APPEND COMMON_LIBS ${LodePNG_LIBRARIES})
 #
-#--- ImGui
+#--- imgui
 #
 ADD_SUBDIRECTORY("${PROJECT_SOURCE_DIR}/external/imgui")
 LIST(APPEND COMMON_LIBS imgui)
 #
-#--- tiny obj loader
+#--- tiny OBJ loader
 #
-INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/external/tinyOBJloader")
+INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/external/tinyobjloader")
 #
 #--- glm
 #
 INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/external/glm")
-#
-#--- ospray
-#
-FIND_PACKAGE(ospray REQUIRED)
-INCLUDE_DIRECTORIES(${OSPRAY_INCLUDE_DIRS})
-MESSAGE(STATUS "OSPRay Include: ${OSPRAY_INCLUDE_DIRS}")
-MESSAGE(STATUS "OSPRay Libraries: ${OSPRAY_LIBRARIES}")
 #
 #--- image magick++
 #


Some minor cleaning up.

Some minor cleaning up.

--- cmake/common.cmake
+++ cmake/common.cmake
@@ -196,7 +196,7 @@
                 MESSAGE(FATAL_ERROR "No SDK could be found...")
             ELSE()
                 EXECUTE_PROCESS(COMMAND echo ${OS_X_VERSIONS}
-                                COMMAND grep "${INVALID_OS_X_VERSION_NUMBER}"
+                                COMMAND grep --colour=never "${INVALID_OS_X_VERSION_NUMBER}"
                                 OUTPUT_VARIABLE INVALID_OS_X_VERSION
                                 OUTPUT_STRIP_TRAILING_WHITESPACE)

@@ -205,7 +205,7 @@
         ENDIF()

         EXECUTE_PROCESS(COMMAND echo ${OS_X_VERSIONS}
-                        COMMAND grep "${VALID_OS_X_VERSION_NUMBER}"
+                        COMMAND grep --colour=never "${VALID_OS_X_VERSION_NUMBER}"
                         OUTPUT_VARIABLE VALID_OS_X_VERSION
                         OUTPUT_STRIP_TRAILING_WHITESPACE)
         EXECUTE_PROCESS(COMMAND xcodebuild -version -sdk macosx${VALID_OS_X_VERSION_NUMBER} Path


Core: Enabled warnings in PCH build for MSVS

--- cmake/cotire.cmake
+++ cmake/cotire.cmake
@@ -1272,8 +1272,10 @@
 	elseif (_option_COMPILER_ID MATCHES "GNU")
 		set (_prologue "#pragma GCC system_header")
 	elseif (_option_COMPILER_ID MATCHES "MSVC")
-		set (_prologue "#pragma warning(push, 0)")
-		set (_epilogue "#pragma warning(pop)")
+		#set (_prologue "#pragma warning(push, 0)")
+		#set (_epilogue "#pragma warning(pop)")
+		set (_prologue "")
+		set (_epilogue "")
 	elseif (_option_COMPILER_ID MATCHES "Intel")
 		# Intel compiler requires hdrstop pragma to stop generating PCH file
 		set (_epilogue "#pragma hdrstop")


[Build] Added support for RMOL and AirInv in the CMake framework.

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -120,7 +120,11 @@
   if (NOT EXISTS ${DOC_INSTALL_FILE})
     unset (DOC_INSTALL_FILE)
   endif (NOT EXISTS ${DOC_INSTALL_FILE})
-  set (BASICDOC_FILES AUTHORS NEWS README ${DOC_INSTALL_FILE})
+  set (DOC_NEWS_FILE NEWS)
+  if (NOT EXISTS ${DOC_NEWS_FILE})
+    unset (DOC_NEWS_FILE)
+  endif (NOT EXISTS ${DOC_NEWS_FILE})
+  set (BASICDOC_FILES AUTHORS ${DOC_NEWS_FILE} README ${DOC_INSTALL_FILE})
   set (BASICDOC_PATH "share/doc/${PACKAGE}-${PACKAGE_VERSION}")

 endmacro (set_project_options)
@@ -291,9 +295,49 @@
       get_stdair (${_arg_version})
     endif (${_arg_lower} STREQUAL "stdair")

+    if (${_arg_lower} STREQUAL "sevmgr")
+      get_sevmgr (${_arg_version})
+    endif (${_arg_lower} STREQUAL "sevmgr")
+
+    if (${_arg_lower} STREQUAL "trademgen")
+      get_trademgen (${_arg_version})
+    endif (${_arg_lower} STREQUAL "trademgen")
+
+    if (${_arg_lower} STREQUAL "travelccm")
+      get_travelccm (${_arg_version})
+    endif (${_arg_lower} STREQUAL "travelccm")
+
+    if (${_arg_lower} STREQUAL "airsched")
+      get_airsched (${_arg_version})
+    endif (${_arg_lower} STREQUAL "airsched")
+
     if (${_arg_lower} STREQUAL "airrac")
       get_airrac (${_arg_version})
     endif (${_arg_lower} STREQUAL "airrac")
+
+    if (${_arg_lower} STREQUAL "rmol")
+      get_rmol (${_arg_version})
+    endif (${_arg_lower} STREQUAL "rmol")
+
+    if (${_arg_lower} STREQUAL "airinv")
+      get_airinv (${_arg_version})
+    endif (${_arg_lower} STREQUAL "airinv")
+
+    if (${_arg_lower} STREQUAL "avlcal")
+      get_avlcal (${_arg_version})
+    endif (${_arg_lower} STREQUAL "avlcal")
+
+    if (${_arg_lower} STREQUAL "simfqt")
+      get_simfqt (${_arg_version})
+    endif (${_arg_lower} STREQUAL "simfqt")
+
+    if (${_arg_lower} STREQUAL "simlfs")
+      get_simlfs (${_arg_version})
+    endif (${_arg_lower} STREQUAL "simlfs")
+
+    if (${_arg_lower} STREQUAL "simcrs")
+      get_simcrs (${_arg_version})
+    endif (${_arg_lower} STREQUAL "simcrs")

     if (${_arg_lower} STREQUAL "doxygen")
       get_doxygen (${_arg_version})
@@ -577,6 +621,70 @@
   endif (AirRAC_FOUND)

 endmacro (get_airrac)
+
+# ~~~~~~~~~~ RMOL ~~~~~~~~~
+macro (get_rmol)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires RMOL-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires RMOL without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (RMOL ${_required_version} REQUIRED
+	HINTS ${WITH_RMOL_PREFIX})
+  if (RMOL_FOUND)
+    #
+    message (STATUS "Found RMOL version: ${RMOL_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${RMOL_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${RMOL_LIBRARIES})
+
+  else (RMOL_FOUND)
+    set (ERROR_MSG "The RMOL library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_RMOL_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<RMOL install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (RMOL_FOUND)
+
+endmacro (get_rmol)
+
+# ~~~~~~~~~~ Airinv ~~~~~~~~~
+macro (get_airinv)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires Airinv-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires Airinv without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (Airinv ${_required_version} REQUIRED
+	HINTS ${WITH_AIRINV_PREFIX})
+  if (Airinv_FOUND)
+    #
+    message (STATUS "Found Airinv version: ${AIRINV_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${AIRINV_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${AIRINV_LIBRARIES})
+
+  else (Airinv_FOUND)
+    set (ERROR_MSG "The Airinv library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_AIRINV_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<Airinv install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (Airinv_FOUND)
+
+endmacro (get_airinv)

 ##############################################
@@ -1572,6 +1680,34 @@
     message (STATUS "  - AIRRAC_INCLUDE_DIRS ........ : ${AIRRAC_INCLUDE_DIRS}")
   endif (AirRAC_FOUND)
 endmacro (display_airrac)
+
+# RMOL
+macro (display_rmol)
+  if (RMOL_FOUND)
+    message (STATUS)
+    message (STATUS "* RMOL:")
+    message (STATUS "  - RMOL_VERSION ............... : ${RMOL_VERSION}")
+    message (STATUS "  - RMOL_BINARY_DIRS ........... : ${RMOL_BINARY_DIRS}")
+    message (STATUS "  - RMOL_EXECUTABLES ........... : ${RMOL_EXECUTABLES}")
+    message (STATUS "  - RMOL_LIBRARY_DIRS .......... : ${RMOL_LIBRARY_DIRS}")
+    message (STATUS "  - RMOL_LIBRARIES ............. : ${RMOL_LIBRARIES}")
+    message (STATUS "  - RMOL_INCLUDE_DIRS .......... : ${RMOL_INCLUDE_DIRS}")
+  endif (RMOL_FOUND)
+endmacro (display_rmol)
+
+# Airinv
+macro (display_airinv)
+  if (Airinv_FOUND)
+    message (STATUS)
+    message (STATUS "* Airinv:")
+    message (STATUS "  - AIRINV_VERSION ............. : ${AIRINV_VERSION}")
+    message (STATUS "  - AIRINV_BINARY_DIRS ......... : ${AIRINV_BINARY_DIRS}")
+    message (STATUS "  - AIRINV_EXECUTABLES ......... : ${AIRINV_EXECUTABLES}")
+    message (STATUS "  - AIRINV_LIBRARY_DIRS ........ : ${AIRINV_LIBRARY_DIRS}")
+    message (STATUS "  - AIRINV_LIBRARIES ........... : ${AIRINV_LIBRARIES}")
+    message (STATUS "  - AIRINV_INCLUDE_DIRS ........ : ${AIRINV_INCLUDE_DIRS}")
+  endif (Airinv_FOUND)
+endmacro (display_airinv)

 ##
 macro (display_status_all_modules)
@@ -1658,6 +1794,8 @@
   display_soci ()
   display_stdair ()
   display_airrac ()
+  display_rmol ()
+  display_airinv ()
   #
   message (STATUS)
   message (STATUS "Change a value with: cmake -D<Variable>=<Value>" )


cmake: Fix error when using MSVC

cmake: Fix error when using MSVC

--- cmake/python.cmake
+++ cmake/python.cmake
@@ -223,9 +223,8 @@
   PACKAGE wheel)

 add_custom_command(
-  OUTPUT python/dist
+  OUTPUT python/dist/timestamp
   COMMAND ${CMAKE_COMMAND} -E remove_directory dist
-  #COMMAND ${CMAKE_COMMAND} -E make_directory dist
   COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTHON_PROJECT}/.libs
   # Don't need to copy static lib on Windows.
   COMMAND ${CMAKE_COMMAND} -E $<IF:$<STREQUAL:$<TARGET_PROPERTY:ortools,TYPE>,SHARED_LIBRARY>,copy,true>
@@ -241,6 +240,7 @@
   COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:sorted_interval_list> ${PYTHON_PROJECT}/util
   #COMMAND ${Python3_EXECUTABLE} setup.py bdist_egg bdist_wheel
   COMMAND ${Python3_EXECUTABLE} setup.py bdist_wheel
+  COMMAND ${CMAKE_COMMAND} -E touch ${PROJECT_BINARY_DIR}/python/dist/timestamp
   MAIN_DEPENDENCY
     ortools/python/setup.py.in
   DEPENDS
@@ -258,7 +258,7 @@
 # Main Target
 add_custom_target(python_package ALL
   DEPENDS
-    python/dist
+    python/dist/timestamp
   WORKING_DIRECTORY python)

 # Install rules


Improve GLUT detection on Windows

Improve GLUT detection on Windows

--- cmake/glut.cmake
+++ cmake/glut.cmake
@@ -27,22 +27,26 @@
   ENDIF()
   FIND_PATH(GLUT_INCLUDE_DIR
     NAMES GL/glut.h
-    PATHS ${DEPRECIATED_WIN32_INCLUDE} ${FREEGLUT_ROOT_PATH}/include
+    PATHS ${FREEGLUT_ROOT_PATH}/include
+    ${PROJECT_SOURCE_DIR}/../freeglut/include
+    ${PROJECT_SOURCE_DIR}/../freeglut-MSVC-3.0.0-2.mp/include ${PROJECT_SOURCE_DIR}/../freeglut-MSVC-3.0.0-2.mp/freeglut/include
+    ${PROJECT_SOURCE_DIR}/../freeglut-MSVC-2.8.1-1.mp/include ${PROJECT_SOURCE_DIR}/../freeglut-MSVC-2.8.1-1.mp/freeglut/include
+    ${DEPRECIATED_WIN32_INCLUDE}
   )
   # detect and select x64
   IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
     SET(ARCH x64)
   ENDIF()
   FIND_LIBRARY(GLUT_glut_LIBRARY
-    NAMES glut glut32 freeglut
-    PATHS ${DEPRECIATED_WIN32_RELEASE} ${FREEGLUT_ROOT_PATH}/${ARCH} ${PROJECT_SOURCE_DIR}/../freeglut-MSVC-2.8.1-1.mp
+    NAMES freeglut glut glut32
+    PATHS ${GLUT_INCLUDE_DIR}/../lib/${ARCH} ${FREEGLUT_ROOT_PATH}/lib/${ARCH} ${DEPRECIATED_WIN32_RELEASE}
   )
   SET(GLUT_LIBRARIES ${GLUT_glut_LIBRARY})
   MARK_AS_ADVANCED(
     GLUT_INCLUDE_DIR
     GLUT_glut_LIBRARY
   )
-  IF (NOT GLUT_glut_LIBRARY)
+  IF (NOT GLUT_INCLUDE_DIR OR NOT GLUT_glut_LIBRARY)
     MESSAGE(FATAL_ERROR "Could not find GLUT library. You could fetch freeglut from http://www.transmissionzero.co.uk/software/freeglut-devel/ and set the FREEGLUT_ROOT_PATH variable in cmake.")
   ENDIF()
 ELSE()
@@ -58,7 +62,7 @@
       )
     FIND_LIBRARY(GLUT_LIBRARIES NAMES libglut.so PATHS $ENV{TACC_FREEGLUT_LIB})
     IF (NOT GLUIBRARIESD)
-      MESSAGE(FATAL_ERROR "Could not find GLUT library, even after trying additional search dirs")
+      MESSAGE(FATAL_ERROR "Could not find GLUT library, even after trying additional search dirs")
     ELSE()
       SET(GLUT_FOUND ON)
     ENDIF()


BUG: HDF5 do not force CMake CheckTypeSize on include.

This allows the version shipped with CMake to be overridden.

Change-Id: I018a451abcca8555ed4d5649c52d9602c77fe1da

--- Modules/ThirdParty/HDF5/src/itkhdf5/config/cmake/ConfigureChecks.cmake
+++ Modules/ThirdParty/HDF5/src/itkhdf5/config/cmake/ConfigureChecks.cmake
@@ -1,15 +1,15 @@
 #-----------------------------------------------------------------------------
 # Include all the necessary files for macros
 #-----------------------------------------------------------------------------
-INCLUDE (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckVariableExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake)
+INCLUDE (CheckFunctionExists)
+INCLUDE (CheckIncludeFile)
+INCLUDE (CheckIncludeFileCXX)
+INCLUDE (CheckIncludeFiles)
+INCLUDE (CheckLibraryExists)
+INCLUDE (CheckSymbolExists)
+INCLUDE (CheckTypeSize)
+INCLUDE (CheckVariableExists)
+INCLUDE (CheckFortranFunctionExists)

 #-----------------------------------------------------------------------------
 # Always SET this for now IF we are on an OS X box


Add `bf-test' target.

Add `bf-test' target.

	* build-aux/cmake/modules/Init.cmake: Here.

--- build-aux/cmake/modules/Init.cmake
+++ build-aux/cmake/modules/Init.cmake
@@ -52,4 +52,11 @@
   COMMENT "Checking the project..."
   )

+# Add bf-test target
+add_custom_target(bf-test
+  COMMAND ${CMAKE_CTEST_COMMAND} --force-new-ctest-process -VV
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  COMMENT "Checking the project on the buildfarm slave..."
+  )
+
 endif(NOT DEFINED INIT_CMAKE)


Windows installer will instruct app to quit when upgrading or uninstalling

--- win/installer.nsi.cmake
+++ win/installer.nsi.cmake
@@ -72,6 +72,22 @@
 Section Install
   SetOutPath "$INSTDIR"

+  ; If there is an existing installation, ensure that it's not running
+  IfFileExists "$INSTDIR\${APP_SHORTNAME}.exe" 0 notrunning
+    Delete "$INSTDIR\${APP_SHORTNAME}.exe"
+    IfErrors 0 notrunning
+      ; Does the old version have the ability to remote-quit?
+      ReadRegStr $0 HKLM "Software\${APP_LONGNAME}" "canRemoteQuit"
+      StrCmp $0 "true" 0 quitmanually
+        ExecWait '"$INSTDIR\${APP_SHORTNAME}.exe" --quit'
+        Goto notrunning
+      quitmanually:
+        MessageBox MB_OK "Please ensure that ${APP_LONGNAME} is closed and click OK to continue."
+  notrunning:
+
+  ; The current version is able to remote-quit
+  WriteRegStr HKLM "Software\${APP_LONGNAME}" "canRemoteQuit" "true"
+
   File "Licence.txt"

   ; App files
@@ -106,7 +122,7 @@
 SectionEnd

 Section Uninstall
-	MessageBox MB_OK "Make sure ${APP_LONGNAME} is not running and press OK to continue."
+  ExecWait '"$INSTDIR\${APP_SHORTNAME}.exe" --quit'

   Delete "$INSTDIR\Licence.txt"


Investigating bug on cluster

Investigating bug on cluster

Former-commit-id: bb24005fa71e79baf4607df01ee3eb551b88f57d

--- cmake-modules/Fetch_OpenBLAS.cmake
+++ cmake-modules/Fetch_OpenBLAS.cmake
@@ -125,45 +125,42 @@
             GIT_TAG             v0.3.5
             PREFIX      ${BUILD_DIRECTORY}/OpenBLAS
             INSTALL_DIR ${INSTALL_DIRECTORY}/OpenBLAS
-#            UPDATE_COMMAND ""
-#            TEST_COMMAND ""
-#            CONFIGURE_COMMAND ""
+            UPDATE_COMMAND ""
+            TEST_COMMAND ""
+            CONFIGURE_COMMAND ""

-            CMAKE_ARGS
-#            -j8
-            -DTARGET=${OPENBLAS_MARCH}
-            -DDYNAMIC_ARCH:BOOL=OFF
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-            -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-            -DBINARY=64
-            #            -DCMAKE_INSTALL_MESSAGE=NEVER #Avoid unnecessary output to console
+#            CMAKE_ARGS
+#            -DTARGET=${OPENBLAS_MARCH}
+#            -DDYNAMIC_ARCH:BOOL=OFF
+#            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+#            -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+#            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+#            -DBINARY=64
+#            -DCMAKE_INSTALL_MESSAGE=NEVER #Avoid unnecessary output to console
 #            -DCMAKE_C_FLAGS=-w
 #            -DCMAKE_CXX_FLAGS=-w
 #            -DCMAKE_FORTRAN_FLAGS=-w

-
-
-            #            BUILD_IN_SOURCE 1
 #            BUILD_COMMAND export LD_LIBRARY_PATH=${GFORTRAN_PATH}:$LD_LIBRARY_PATH &&
-#                          export LDFLAGS="-L${GFORTRAN_PATH} $LDFLAGS" &&
-#                          $(MAKE) TARGET=SKYLAKE
-#                          USE_THREAD=${OpenBLAS_MULTITHREADED}
-#                          USE_OPENMP=${OpenBLAS_USE_OPENMP}
-#                          NO_AFFINITY=1
-#                          NO_WARMUP=1
-#                          QUIET_MAKE=0
-#                          NUM_THREADS=128
-#                          DEBUG=1
-##                          FFLAGS=-frecursive
-#                          DYNAMIC_ARCH=1
-#                          BINARY64=64
-#                          GEMM_MULTITHREAD_THRESHOLD=4
-#                          LDFLAGS=-L${GFORTRAN_PATH}
-#                          FFLAGS=-O2 -Wno-maybe-uninitialized -Wno-conversion -Wno-unused-but-set-variable -Wno-unused-variable
-#            INSTALL_COMMAND $(MAKE) PREFIX=<INSTALL_DIR> install
+#            export LDFLAGS="-L${GFORTRAN_PATH} $LDFLAGS" &&
+            BUILD_IN_SOURCE 1
+            BUILD_COMMAND $(MAKE) TARGET=${OPENBLAS_MARCH}
+                          USE_THREAD=${OpenBLAS_MULTITHREADED}
+                          USE_OPENMP=${OpenBLAS_USE_OPENMP}
+                          NO_AFFINITY=1
+                          NO_WARMUP=1
+                          QUIET_MAKE=0
+                          NUM_THREADS=128
+                          DEBUG=0
+                          FFLAGS=-frecursive
+                          DYNAMIC_ARCH=0
+                          BINARY64=64
+                          GEMM_MULTITHREAD_THRESHOLD=16
+                          LDFLAGS=-L${GFORTRAN_PATH}
+                          FFLAGS=-O3 -Wno-maybe-uninitialized -Wno-conversion -Wno-unused-but-set-variable -Wno-unused-variable
+            INSTALL_COMMAND $(MAKE) PREFIX=<INSTALL_DIR> install
             DEPENDS gfortran
             )


Fix for PostgreSQL server installation can not be found in MacOSX 10.9 (ROOT-7026)

--- cmake/modules/FindPostgreSQL.cmake
+++ cmake/modules/FindPostgreSQL.cmake
@@ -18,12 +18,35 @@

 find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h
-   /usr/include/pgsql/
-   /usr/local/include/pgsql/
-   /usr/include/postgresql/
+   PATHS ${POSTGRESQL_DIR}/include $ENV{POSTGRESQL_DIR}/include
+   "/usr/include/pgsql/"
+   "/usr/local/include/pgsql/"
+   "/usr/include/postgresql/"
+   "/usr/local/include/pgsql/server"
+   "/usr/local/include/postgresql/server"
+   "/usr/local/include/postgresql/*/server"
+   "/usr/local/pgsql/postgresql/server"
+   "/usr/local/pgsql/postgresql/*/server"
+   "/usr/local/*/include/"
+   "/usr/local/*/include/postgresql/"
+   "/usr/local/*/include/postgresql/server"
+   "/usr/include/server"
+   "/usr/include/pgsql/server"
+   "/usr/include/postgresql/server"
+   "/usr/include/postgresql/*/server"
 )

-find_library(POSTGRESQL_LIBRARIES NAMES pq)
+find_library(POSTGRESQL_LIBRARIES NAMES pq
+    PATHS ${POSTGRESQL_DIR}/lib $ENV{POSTGRESQL_DIR}/lib
+    "/usr/lib/"
+    "/usr/lib64/"
+    "/usr/local/lib/"
+    "/usr/local/lib64/"
+    "/usr/lib/*/"
+    "/usr/local/*/"
+    "/usr/lib/posgresql/"
+    "/usr/lib64/posgresql/"
+)

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(PostgreSQL DEFAULT_MSG


[ETHOSN] Streamline Ethos(TM)-N cross-compile rpc usage (#9477)

* When cross-compiling the runtime or rpc application, LLVM is not
  required so don't insist on it being enabled for Ethos-N.

--- cmake/modules/contrib/EthosN.cmake
+++ cmake/modules/contrib/EthosN.cmake
@@ -19,10 +19,6 @@

 if(NOT USE_ETHOSN STREQUAL "OFF")
   find_ethosn(${USE_ETHOSN})
-
-  if(NOT DEFINED TVM_LLVM_VERSION)
-      message(FATAL_ERROR "Support for offloading to Ethos-N requires LLVM Support")
-  endif()

   if(NOT ETHOSN_FOUND)
     message(FATAL_ERROR "Cannot find Ethos-N, USE_ETHOSN=" ${USE_ETHOSN})


refs #6566 Improve xz source clone code, cleanup xz subproject

git-svn-id: b5c078ec0b4d3a50497e9dd3081db18a5b4f16e5@55449 c7de825b-a66e-492c-adef-691d508d4ae1

--- cmake_modules/TokuThirdParty.cmake
+++ cmake_modules/TokuThirdParty.cmake
@@ -54,34 +54,25 @@
 FILE(GLOB XZ_ALL_FILES ${XZ_SOURCE_DIR}/*)
 if (CMAKE_GENERATOR STREQUAL Ninja)
   ## ninja doesn't understand "$(MAKE)"
-  ExternalProject_Add(build_lzma
+  set(SUBMAKE_COMMAND make)
+else ()
+  ## use "$(MAKE)" for submakes so they can use the jobserver, doesn't
+  ## seem to break Xcode...
+  set(SUBMAKE_COMMAND $(MAKE))
+endif ()
+
+ExternalProject_Add(build_lzma
     PREFIX xz
     DOWNLOAD_COMMAND
-        cd ${XZ_SOURCE_DIR} && cp -ru "${XZ_ALL_FILES}" "<SOURCE_DIR>/"
+        cp -au "${XZ_ALL_FILES}" "<SOURCE_DIR>/"
     CONFIGURE_COMMAND
         "<SOURCE_DIR>/configure" ${xz_configure_opts}
         "--prefix=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz"
     BUILD_COMMAND
-        make -C src/liblzma
+        ${SUBMAKE_COMMAND} -C src/liblzma
     INSTALL_COMMAND
-        make -C src/liblzma install
-    )
-else ()
-  ## use "$(MAKE)" for submakes so they can use the jobserver, doesn't
-  ## seem to break Xcode...
-  ExternalProject_Add(build_lzma
-    PREFIX xz
-    DOWNLOAD_COMMAND
-        cd ${XZ_SOURCE_DIR} && cp -ru "${XZ_ALL_FILES}" "<SOURCE_DIR>/"
-    CONFIGURE_COMMAND
-        "<SOURCE_DIR>/configure" ${xz_configure_opts}
-        "--prefix=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz"
-    BUILD_COMMAND
-        $(MAKE) -C src/liblzma
-    INSTALL_COMMAND
-        $(MAKE) -C src/liblzma install
-    )
-endif ()
+        ${SUBMAKE_COMMAND} -C src/liblzma install
+)
 FILE(GLOB_RECURSE XZ_ALL_FILES_RECURSIVE ${XZ_SOURCE_DIR}/*)
 ExternalProject_Add_Step(build_lzma reclone_src # Names of project and custom step
     COMMENT "(re)cloning xz source..."     # Text printed when step executes


benchmark: Build drivers with N_AST symtab entries (for debugging) (#30777)

On Darwin, we pass the *.swiftmodule paths transitively referenced by
the driver executable to ld64. ld64 inserts N_AST references to these
modules into the program, for later use by lldb.

This change should let us exercise much more lldb functionality via
`stepper` testing.

--- benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
+++ benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
@@ -166,7 +166,7 @@
   endif()
 endmacro()

-function (add_swift_benchmark_library objfile_out sibfile_out)
+function (add_swift_benchmark_library objfile_out sibfile_out swiftmodule_out)
   cmake_parse_arguments(BENCHLIB "" "MODULE_PATH;SOURCE_DIR;OBJECT_DIR" "SOURCES;LIBRARY_FLAGS;DEPENDS" ${ARGN})

   precondition(BENCHLIB_MODULE_PATH)
@@ -197,6 +197,7 @@
       "-o" "${objfile}"
       ${sources})
   set(${objfile_out} "${objfile}" PARENT_SCOPE)
+  set(${swiftmodule_out} "${swiftmodule}" PARENT_SCOPE)

   if(SWIFT_BENCHMARK_EMIT_SIB)
     precondition(sibfile_out)
@@ -401,12 +402,13 @@
   endif()
   set(bench_library_objects)
   set(bench_library_sibfiles)
+  set(bench_library_swiftmodules)
   set(opt_view_dirs)
   # Build libraries used by the driver and benchmarks.
   foreach(module_name_path ${BENCH_LIBRARY_MODULES})
     set(sources "${srcdir}/${module_name_path}.swift")

-    add_swift_benchmark_library(objfile_out sibfile_out
+    add_swift_benchmark_library(objfile_out sibfile_out swiftmodule_out
       MODULE_PATH "${module_name_path}"
       SOURCE_DIR "${srcdir}"
       OBJECT_DIR "${objdir}"
@@ -414,6 +416,7 @@
       LIBRARY_FLAGS ${common_swift4_options})
     precondition(objfile_out)
     list(APPEND bench_library_objects "${objfile_out}")
+    list(APPEND bench_library_swiftmodules "${swiftmodule_out}")
     if (SWIFT_BENCHMARK_EMIT_SIB)
       precondition(sibfile_out)
       list(APPEND bench_library_sibfiles "${sibfile_out}")
@@ -433,7 +436,7 @@

     set(objfile_out)
     set(sibfile_out)
-    add_swift_benchmark_library(objfile_out sibfile_out
+    add_swift_benchmark_library(objfile_out sibfile_out swiftmodule_out
       MODULE_PATH "${module_name_path}"
       SOURCE_DIR "${srcdir}"
       OBJECT_DIR "${objdir}"
@@ -442,6 +445,7 @@
       DEPENDS ${bench_library_objects})
     precondition(objfile_out)
     list(APPEND bench_driver_objects "${objfile_out}")
+    list(APPEND bench_library_swiftmodules "${swiftmodule_out}")
     if (SWIFT_BENCHMARK_EMIT_SIB)
       precondition(sibfile_out)
       list(APPEND bench_driver_sibfiles "${sibfile_out}")
@@ -464,6 +468,7 @@
       set(swiftmodule "${objdir}/${module_name}.swiftmodule")
       set(source "${srcdir}/${module_name_path}.swift")
       list(APPEND SWIFT_BENCH_OBJFILES "${objfile}")
+      list(APPEND bench_library_swiftmodules "${swiftmodule}")

       if ("${bench_flags}" MATCHES "-whole-module.*")
         set(output_option "-o" "${objfile}")
@@ -622,6 +627,15 @@
     else()
       set(SWIFT_LINK_RPATH "${SWIFT_RPATH_BASE}/${BENCH_COMPILE_ARCHOPTS_PLATFORM}")
     endif()
+
+    # On Darwin, we pass the *.swiftmodule paths transitively referenced by the
+    # driver executable to ld64. ld64 inserts N_AST references to these modules
+    # into the program, for later use by lldb.
+    set(ld64_add_ast_path_opts)
+    foreach(ast_path ${bench_library_swiftmodules})
+      list(APPEND ld64_add_ast_path_opts "-Wl,-add_ast_path,${ast_path}")
+    endforeach()
+
     add_custom_command(
         OUTPUT "${OUTPUT_EXEC}"
         DEPENDS
@@ -647,6 +661,7 @@
           "-Xlinker" "${SWIFT_LINK_RPATH}"
           ${bench_library_objects}
           ${bench_driver_objects}
+          ${ld64_add_ast_path_opts}
           ${SWIFT_BENCH_OBJFILES}
           ${objcfile}
           "-o" "${OUTPUT_EXEC}"


add project_build_tools_patch_protobuf_sources

--- project/cmake/modules/ProjectBuildTools.cmake
+++ project/cmake/modules/ProjectBuildTools.cmake
@@ -204,4 +204,44 @@
             )
         endif ()
     endif()
-endfunction()+endfunction()
+
+function (project_build_tools_patch_protobuf_sources)
+    if (MSVC)
+        foreach(PROTO_SRC ${ARGN})
+            unset(PROTO_SRC_OPTIONS)
+            get_source_file_property(PROTO_SRC_OPTIONS ${PROTO_SRC} COMPILE_OPTIONS)
+            if (PROTO_SRC_OPTIONS)
+                list(APPEND PROTO_SRC_OPTIONS /wd4309)
+            else()
+                set(PROTO_SRC_OPTIONS /wd4309)
+            endif()
+
+            if (MSVC_VERSION GREATER_EQUAL 1925)
+                list(APPEND PROTO_SRC_OPTIONS /wd4996)
+            endif ()
+
+            set_source_files_properties(${PROTO_SRC} PROPERTIES COMPILE_OPTIONS "${PROTO_SRC_OPTIONS}")
+        endforeach()
+        unset(PROTO_SRC)
+        unset(PROTO_SRC_OPTIONS)
+    else()
+        include(CheckCXXCompilerFlag)
+        check_cxx_compiler_flag(-Wno-unused-parameter project_build_tools_patch_protobuf_sources_LINT_NO_UNUSED_PARAMETER)
+        if (project_build_tools_patch_protobuf_sources_LINT_NO_UNUSED_PARAMETER)
+            foreach(PROTO_SRC ${ARGN})
+                unset(PROTO_SRC_OPTIONS)
+                get_source_file_property(PROTO_SRC_OPTIONS ${PROTO_SRC} COMPILE_OPTIONS)
+                if (PROTO_SRC_OPTIONS)
+                    list(APPEND PROTO_SRC_OPTIONS -Wno-unused-parameter)
+                else()
+                    set(PROTO_SRC_OPTIONS -Wno-unused-parameter)
+                endif()
+
+                set_source_files_properties(${PROTO_SRC} PROPERTIES COMPILE_OPTIONS "${PROTO_SRC_OPTIONS}")
+            endforeach()
+            unset(PROTO_SRC)
+            unset(PROTO_SRC_OPTIONS)
+        endif ()
+    endif ()
+endfunction()


glowl version

glowl version

--- cmake/vcpkg_ports/glowl/portfile.cmake
+++ cmake/vcpkg_ports/glowl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO invor/glowl
-  REF v0.4g
-  SHA512 2d46f44b302cd05455b25a1b4b5438194aa387cf43f392ee62558e5d02fc4751695a054a13dfcec60a2cb975670a54c4783085fbbe29068f5302d1ce49d2960f
+  REF dafee75f11c5d759df30ff651d6763e4e674dd0e
+  SHA512 e29524be04a5eb65c4cf41190392eb7b09632ef85cf0ede53a36f8af8a84eda3a21dde2fcce7f20a61b9a269c604b31e33537aa473e20d8385562eb62c032c82
   HEAD_REF master
 )


cosmetics

cosmetics

--- config/cmake/modules/FindCaliper.cmake
+++ config/cmake/modules/FindCaliper.cmake
@@ -15,5 +15,8 @@
 #   - CALIPER_INCLUDE_DIRS

 include(MfemCmakeUtilities)
-mfem_find_package(Caliper CALIPER CALIPER_DIR "include" "caliper/cali.h" "lib" "caliper"
-  "Paths to headers required by Caliper." "Libraries required by Caliper.")
+mfem_find_package(Caliper CALIPER CALIPER_DIR
+       	"include" "caliper/cali.h"
+       	"lib" "caliper"
+  	"Paths to headers required by Caliper."
+       	"Libraries required by Caliper.")


Fixed Android 32bit ARM ABI file to match settings as set by the current NDK toolchain file.

--- toolchains/android/arm-linux-androideabi.abi.cmake
+++ toolchains/android/arm-linux-androideabi.abi.cmake
@@ -2,7 +2,7 @@
 #
 # T:N.U.N. Android ABI config file.
 #
-# Copyright (c) 2016. Domagoj Saric. All rights reserved.
+# Copyright (c) 2016. - 2018. Domagoj Saric. All rights reserved.
 #
 ################################################################################

@@ -10,19 +10,19 @@
 set( TNUN_cpu_archs
   # Implementation note: Dropping support for the old armeabi archs greatly
   # simplifies things: CMAKE_SYSTEM_PROCESSOR and ANDROID_NDK_ABI_NAME become
-  # fixed (armv7a and armeabi-v7a, respectively) just like in other ABIs.
+  # fixed (armv7-a and armeabi-v7a, respectively) just like in other ABIs.
   #                                           (03.06.2016.) (Domagoj Saric)
   #armv5te_armeabi ... obsolete
   #armv6m-vfp2_armeabi ... obsolete ... -marm -march=armv6k -mtune=arm1136j-s
   armv7-vfp3d16
- #armv7-vfp3d32 ... rare
+  armv7-vfp3d32
   armv7-neon
 )

 set( abi_sufix                "eabi"                          )
 set( ANDROID_ARCH_NAME        "arm"                           )
 set( ANDROID_GCC_MACHINE_NAME "arm-linux-android${abi_sufix}" )
-set( CMAKE_SYSTEM_PROCESSOR   "armv7"                         )
+set( CMAKE_SYSTEM_PROCESSOR   "armv7-a"                       )

 list( APPEND TNUN_compiler_optimize_for_size  -mthumb )
 list( APPEND TNUN_compiler_optimize_for_speed -marm   )


hunter_load_from_cache: add cache_done_file variable

--- cmake/modules/hunter_load_from_cache.cmake
+++ cmake/modules/hunter_load_from_cache.cmake
@@ -135,7 +135,10 @@
   file(SHA1 "${temp_deps_info}" deps_sha1)
   hunter_make_directory("${cache_meta_dir}" "${deps_sha1}" cache_meta_dir)

-  if(NOT EXISTS "${cache_meta_dir}/CACHE.DONE")
+  set(cache_sha1_file "${cache_meta_dir}/cache.sha1")
+  set(cache_done_file "${cache_meta_dir}/CACHE.DONE")
+
+  if(NOT EXISTS "${cache_done_file}")
     hunter_status_debug(
         "Cache miss (no entry found: ${cache_meta_dir}/CACHE.DONE)"
     )
@@ -144,7 +147,6 @@

   hunter_status_print("Cache HIT: ${human_readable}")

-  set(cache_sha1_file "${cache_meta_dir}/cache.sha1")
   if(NOT EXISTS "${cache_sha1_file}")
     hunter_internal_error("cache.sha1 not exists")
   endif()


[cmake] Allow headers to be installed.

[cmake] Allow headers to be installed.

--- cmake/Modules/WintermuteMacros.cmake
+++ cmake/Modules/WintermuteMacros.cmake
@@ -27,7 +27,6 @@
 #== includes things that can vary on an environmental level as well.
 #==============================================================================
 MACRO(wintermute_add_target_properties _target)
-  # Add inclusion directories to target.
   TARGET_COMPILE_OPTIONS(${_target} PUBLIC
     ${WINTERMUTE_COMPILE_FLAGS})
   TARGET_COMPILE_DEFINITIONS(${_target} PUBLIC
@@ -36,7 +35,7 @@
     ${WINTERMUTE_INCLUDE_DIRS})

   set(_ld_flags_raw "${WINTERMUTE_LINK_FLAGS}")
-  string(REPLACE ";" "  " _ld_flags "${_ld_flags_raw}")
+  string(REPLACE ";" " " _ld_flags "${_ld_flags_raw}")
   SET_TARGET_PROPERTIES(${_target} PROPERTIES
     LINK_FLAGS "${_ld_flags}"
     )
@@ -63,3 +62,31 @@
   TARGET_LINK_LIBRARIES(${_target}
     general ${WINTERMUTE_LIBRARIES})
 ENDMACRO(wintermute_link_libraries _target)
+
+MACRO(wintermute_install_target)
+  SET(options
+    )
+  SET(oneValueArgs
+    TARGET
+    HEADER_DIR
+    )
+  SET(multiValueArgs
+    HEADERS
+    )
+
+  CMAKE_PARSE_ARGUMENTS(_wit "${options}"
+    "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  install(TARGETS "${_wit_TARGET}"
+    LIBRARY DESTINATION ${WINTERMUTE_LIBRARY_DIR}
+    ARCHIVE DESTINATION ${WINTERMUTE_LIBRARY_DIR}
+    RUNTIME DESTINATION ${WINTERMUTE_BINARY_DIR}
+    COMPONENT runtime
+  )
+
+  # TODO: Preserve directory structure.
+  install(FILES ${_wit_HEADERS}
+    DESTINATION ${WINTERMUTE_INCLUDE_DIR}/${_wit_HEADER_DIR}
+    COMPONENT development
+  )
+ENDMACRO(wintermute_install_target)


cmake/modules/FindFFTWWrappers.cmake: added MSVC and MacOSX support

--- cmake/modules/FindFFTWWrappers.cmake
+++ cmake/modules/FindFFTWWrappers.cmake
@@ -4,19 +4,20 @@
 #   find_package(FFTWWrappers [REQUIRED] [QUIET])
 #
 # It sets the following variables:
-#   FFTWWrappers_FOUND          ... true if fftw is found on the system
-#   FFTWWrappers_GNU_LIBRARIES  ... list of library that were build with the GNU binary layout
-#   FFTWWrappers_INTEL_LIBRARIES  ... list of library that were build with the intel binary layout
-#   FFTWWrappers_LIBRARIES      ... list of library identifiers that were found (will be filled with serial/openmp/pthreads enabled file names if present, only stubs will be filled in not full paths)
-#   FFTWWrappers_MKL_LIBRARIES  ... list of library in the MKL that need to be linked to (intel64)
-#   FFTWWrappers_MKL_INCLUDE_DIR  ... folder containing fftw3.h
+#   FFTWWrappers_FOUND             ... true if fftw is found on the system
+#   FFTWWrappers_GNU_LIBRARIES     ... list of library that were build with the GNU binary layout
+#   FFTWWrappers_INTEL_LIBRARIES   ... list of library that were build with the intel binary layout
+#   FFTWWrappers_MSVS_LIBRARIES    ... list of library that were build with the MSVS binary layout
+#   FFTWWrappers_LIBRARIES         ... list of library identifiers that were found (will be filled with serial/openmp/pthreads enabled file names if present, only stubs will be filled in not full paths)
+#   FFTWWrappers_MKL_LIBRARIES     ... list of library in the MKL that need to be linked to (intel64)
+#   FFTWWrappers_MKL_INCLUDE_DIR   ... folder containing fftw3.h
 #   FFTWWrappers_MKL_LIBRARY_DIRS  ... folder containing the libraries in FFTWWrappers_MKL_LIBRARIES
-#   FFTWWrappers_LIBRARY_DIR	... fftw library directory
+#   FFTWWrappers_LIBRARY_DIR	   ... fftw library directory
 #
 # The following variables will be checked by the function
-#   FFTWWrappers_ROOT           ... if set, the libraries are exclusively searched
-#                                   under this path
-#   MKLROOT                     ... take the MKL libraries from here
+#   FFTWWrappers_ROOT              ... if set, the libraries are exclusively searched
+#                                      under this path
+#   MKLROOT                        ... take the MKL libraries from here
 #

 #If environment variable FFTWWrappers_ROOT is defined, it has the same effect as the cmake variable
@@ -42,21 +43,21 @@
 #initialize library variables
 find_library(
   FFTWWrappers_GNU_LIBRARIES
-  NAMES libfftw3xc_gnu libfftw3xc_gnu.a
+  NAMES fftw3xc_gnu fftw3xc_gnu.a
   PATHS ${FFTWWrappers_ROOT}
   PATH_SUFFIXES "lib" "lib64"
   NO_DEFAULT_PATH
   )
 find_library(
   FFTWWrappers_GNU_LIBRARIES
-  NAMES libfftw3xc_gnu libfftw3xc_gnu.a
-  PATHS ${MKLROOT}
-  PATH_SUFFIXES "lib/intel64"
-  NO_DEFAULT_PATH
-  )
-find_library(
-  FFTWWrappers_GNU_LIBRARIES
-  NAMES libfftw3xc_gnu libfftw3xc_gnu.a
+  NAMES fftw3xc_gnu fftw3xc_gnu.a
+  PATHS ${MKLROOT}
+  PATH_SUFFIXES "lib/intel64_lin" "lib/intel64_mac" "lib/intel64"
+  NO_DEFAULT_PATH
+  )
+find_library(
+  FFTWWrappers_GNU_LIBRARIES
+  NAMES fftw3xc_gnu fftw3xc_gnu.a
   )

 if(EXISTS ${FFTWWrappers_GNU_LIBRARIES})
@@ -65,25 +66,48 @@

 find_library(
   FFTWWrappers_INTEL_LIBRARIES
-  NAMES libfftw3xc_intel libfftw3xc_intel.a
+  NAMES fftw3xc_intel fftw3xc_intel.a
   PATHS ${FFTWWrappers_ROOT}
   PATH_SUFFIXES "lib" "lib64"
   NO_DEFAULT_PATH
   )
 find_library(
   FFTWWrappers_INTEL_LIBRARIES
-  NAMES libfftw3xc_intel libfftw3xc_intel.a
-  PATHS ${MKLROOT}
-  PATH_SUFFIXES "lib/intel64_lin"
+  NAMES fftw3xc_intel fftw3xc_intel.a
+  PATHS ${MKLROOT}
+  PATH_SUFFIXES "lib/intel64_lin" "lib/intel64_mac" "lib/intel64_win" "lib/intel64"
   NO_DEFAULT_PATH
 )
 find_library(
   FFTWWrappers_INTEL_LIBRARIES
-  NAMES libfftw3xc_intel libfftw3xc_intel.a
+  NAMES fftw3xc_intel fftw3xc_intel.a
 )

 if(EXISTS ${FFTWWrappers_INTEL_LIBRARIES})
   get_filename_component(FFTWWrappers_LIBRARY_DIR ${FFTWWrappers_INTEL_LIBRARIES} DIRECTORY)
+endif()
+
+find_library(
+  FFTWWrappers_MSVS_LIBRARIES
+  NAMES fftw3xc_msvs
+  PATHS ${FFTWWrappers_ROOT}
+  PATH_SUFFIXES "lib" "lib64"
+  NO_DEFAULT_PATH
+  )
+find_library(
+  FFTWWrappers_MSVS_LIBRARIES
+  NAMES fftw3xc_msvs
+  PATHS ${MKLROOT}
+  PATH_SUFFIXES "lib/intel64_win" "lib/intel64"
+  NO_DEFAULT_PATH
+  )
+find_library(
+  FFTWWrappers_MSVS_LIBRARIES
+  NAMES fftw3xc_msvs
+  )
+
+if(EXISTS ${FFTWWrappers_MSVS_LIBRARIES})
+  get_filename_component(FFTWWrappers_LIBRARY_DIR ${FFTWWrappers_MSVS_LIBRARIES} DIRECTORY)
 endif()

 ######################################### MKL related #####################################
@@ -104,44 +128,44 @@

 find_library(
   MKL_INTEL_LP64
-  NAMES libmkl_intel_lp64 libmkl_intel_lp64.a
-  PATHS ${MKLROOT}
-  PATH_SUFFIXES "lib/intel64_lin" "lib/intel64"
+  NAMES mkl_intel_lp64 mkl_intel_lp64.a
+  PATHS ${MKLROOT}
+  PATH_SUFFIXES "lib" "lib/intel64_lin" "lib/intel64_mac" "lib/intel64_win" "lib/intel64"
   NO_DEFAULT_PATH
   )

 if(EXISTS ${MKL_INTEL_LP64})
   list(APPEND FFTWWrappers_MKL_LIBRARIES "${MKL_INTEL_LP64}")
 else()
-  message( "FFTWWrappers was not able to find libmkl_intel_lp64.a in ${MKLROOT}")
+  message( "FFTWWrappers was not able to find mkl_intel_lp64 in ${MKLROOT}")
 endif()

 find_library(
   MKL_INTEL_THREAD
-  NAMES libmkl_intel_thread libmkl_intel_thread.a
-  PATHS ${MKLROOT}
-  PATH_SUFFIXES "lib/intel64_lin" "lib/intel64"
+  NAMES mkl_intel_thread mkl_intel_thread.a
+  PATHS ${MKLROOT}
+  PATH_SUFFIXES "lib" "lib/intel64_lin" "lib/intel64_mac" "lib/intel64_win" "lib/intel64"
   NO_DEFAULT_PATH
   )

 if(EXISTS ${MKL_INTEL_THREAD})
   list(APPEND FFTWWrappers_MKL_LIBRARIES "${MKL_INTEL_THREAD}")
 else()
-  message( "FFTWWrappers was not able to find libmkl_intel_thread.a in ${MKLROOT}")
+  message( "FFTWWrappers was not able to find mkl_intel_thread in ${MKLROOT}")
 endif()

 find_library(
   MKL_CORE
-  NAMES libmkl_core libmkl_core.a
-  PATHS ${MKLROOT}
-  PATH_SUFFIXES "lib/intel64_lin" "lib/intel64"
+  NAMES mkl_core mkl_core.a
+  PATHS ${MKLROOT}
+  PATH_SUFFIXES "lib" "lib/intel64_lin" "lib/intel64_mac" "lib/intel64_win" "lib/intel64"
   NO_DEFAULT_PATH
   )

 if(EXISTS ${MKL_CORE})
   list(APPEND FFTWWrappers_MKL_LIBRARIES "${MKL_CORE}")
 else()
-  message("FFTWWrappers was not able to find libmkl_core.a in ${MKLROOT}")
+  message("FFTWWrappers was not able to find mkl_core in ${MKLROOT}")
 endif()

 list(APPEND FFTWWrappers_MKL_LIBRARY_DIRS "${MKLROOT}/../compiler/lib/intel64")
@@ -149,9 +173,9 @@

 find_library(
   MKL_IOMP5
-  NAMES iomp5 libiomp5 libiomp5.a
+  NAMES iomp5 libiomp5.a libiomp5md
   PATHS ${MKLROOT} ${MKLROOT}/../compiler ${MKLROOT}/../tbb
-  PATH_SUFFIXES "lib/intel64_lin" "lib/intel64" "lib/intel64/gcc4.4"
+  PATH_SUFFIXES "lib" "lib/intel64_lin" "lib/intel64_mac" "lib/intel64_win" "lib/intel64" "lib/intel64/gcc4.4"
   NO_DEFAULT_PATH
   )

@@ -161,12 +185,14 @@

 endif()

-list(APPEND FFTWWrappers_MKL_LIBRARIES "m;dl")
+list(APPEND FFTWWrappers_MKL_LIBRARIES
+     $<$<NOT:$<C_COMPILER_ID:MSVC>>:m> "${CMAKE_DL_LIBS}")

 if(NOT FFTWWrappers_FIND_QUIETLY)
   message("++ FindFFTWWrappers")
   message("++ FFTWWrappers_GNU_LIBRARIES    : ${FFTWWrappers_GNU_LIBRARIES}")
   message("++ FFTWWrappers_INTEL_LIBRARIES  : ${FFTWWrappers_INTEL_LIBRARIES}")
+  message("++ FFTWWrappers_MSVS_LIBRARIES   : ${FFTWWrappers_MSVS_LIBRARIES}")
   message("++ FFTWWrappers_LIBRARY_DIR      : ${FFTWWrappers_LIBRARY_DIR}")
   message("++ FFTWWrappers_MKL_LIBRARIES    : ${FFTWWrappers_MKL_LIBRARIES}")
   message("++ FFTWWrappers_MKL_LIBRARY_DIRS : ${FFTWWrappers_MKL_LIBRARY_DIRS}")
@@ -185,15 +211,20 @@
     REQUIRED_VARS FFTWWrappers_MKL_INCLUDE_DIR
     )
   set(FFTWWrappers_LIBRARIES "${FFTWWrappers_GNU_LIBRARIES}")
-
-else()
+elseif(FFTWWrappers_INTEL_LIBRARIES)
   find_package_handle_standard_args(FFTWWrappers
     REQUIRED_VARS FFTWWrappers_INTEL_LIBRARIES
     REQUIRED_VARS FFTWWrappers_MKL_LIBRARIES
     REQUIRED_VARS FFTWWrappers_MKL_INCLUDE_DIR
     )
   set(FFTWWrappers_LIBRARIES "${FFTWWrappers_INTEL_LIBRARIES}")
-
+elseif(FFTWWrappers_MSVS_LIBRARIES)
+  find_package_handle_standard_args(FFTWWrappers
+    REQUIRED_VARS FFTWWrappers_MSVS_LIBRARIES
+    REQUIRED_VARS FFTWWrappers_MKL_LIBRARIES
+    REQUIRED_VARS FFTWWrappers_MKL_INCLUDE_DIR
+    )
+  set(FFTWWrappers_LIBRARIES "${FFTWWrappers_MSVS_LIBRARIES}")
 endif()

@@ -201,6 +232,7 @@
   FFTWWrappers_LIBRARIES
   FFTWWrappers_GNU_LIBRARIES
   FFTWWrappers_INTEL_LIBRARIES
+  FFTWWrappers_MSVS_LIBRARIES
   FFTWWrappers_LIBRARY_DIR
   FFTWWrappers_MKL_LIBRARIES
   FFTWWrappers_MKL_LIBRARY_DIR


[FEATURE] Move install location from share to lib for pckconfig and cmake.config

--- util/cmake/SeqAnBuildSystem.cmake
+++ util/cmake/SeqAnBuildSystem.cmake
@@ -372,10 +372,10 @@
         # Install pkg-config file, except on Windows.
         if (NOT CMAKE_SYSTEM_NAME MATCHES Windows)
             configure_file("util/pkgconfig/seqan.pc.in" "${CMAKE_BINARY_DIR}/util/pkgconfig/seqan-${SEQAN_VERSION_MAJOR}.pc" @ONLY)
-            install(FILES "${CMAKE_BINARY_DIR}/util/pkgconfig/seqan-${SEQAN_VERSION_MAJOR}.pc" DESTINATION share/pkgconfig)
+            install(FILES "${CMAKE_BINARY_DIR}/util/pkgconfig/seqan-${SEQAN_VERSION_MAJOR}.pc" DESTINATION lib/pkgconfig)
         endif (NOT CMAKE_SYSTEM_NAME MATCHES Windows)
         # Install FindSeqAn TODO(h-2) rename seqan-config.cmake to seqan-config${SEQAN_VERSION_MAJOR}.cmake after 2.x cycle
-        install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/util/cmake/seqan-config.cmake" DESTINATION share/cmake/seqan/)
+        install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/util/cmake/seqan-config.cmake" DESTINATION lib/cmake/seqan/)

         # Install headers
         file (GLOB HEADERS


New boost version

New boost version


ENH: ExternalData: Allow content links above CMAKE_SOURCE_DIR

Define ExternalData_SOURCE_ROOT as the highest allowed location of
content links and set to CMAKE_SOURCE_DIR by default.  A project may set
this when CMAKE_SOURCE_DIR does not lie at the top of the source
distribution.

--- CMake/ExternalData.cmake
+++ CMake/ExternalData.cmake
@@ -87,6 +87,12 @@
 # one of the locations in the list of URL templates (by means outside the
 # scope of this module).  The data fetch rule created for the content link
 # will use the staged object if it cannot be found using any URL template.
+#
+# The variable ExternalData_SOURCE_ROOT may be set to the highest source
+# directory containing any path named by a DATA{} reference.  The default is
+# CMAKE_SOURCE_DIR.  ExternalData_SOURCE_ROOT and CMAKE_SOURCE_DIR must refer
+# to directories within a single source distribution (e.g. they come together
+# in one tarball).

 #=============================================================================
 # Copyright 2010-2011 Kitware, Inc.
@@ -253,7 +259,7 @@
   file(RENAME "${name}" "${staged}")
   set("${var_ext}" "${ext}" PARENT_SCOPE)

-  file(RELATIVE_PATH relname "${CMAKE_SOURCE_DIR}" "${name}${ext}")
+  file(RELATIVE_PATH relname "${ExternalData_SOURCE_ROOT}" "${name}${ext}")
   message(STATUS "Linked ${relname} to ExternalData ${algo}/${hash}")
 endfunction()

@@ -267,7 +273,10 @@
   endif()

   # Convert to relative path under the source tree.
-  set(top_src "${CMAKE_SOURCE_DIR}")
+  if(NOT ExternalData_SOURCE_ROOT)
+    set(ExternalData_SOURCE_ROOT "${CMAKE_SOURCE_DIR}")
+  endif()
+  set(top_src "${ExternalData_SOURCE_ROOT}")
   file(RELATIVE_PATH reldata "${top_src}" "${absdata}")
   if(IS_ABSOLUTE "${reldata}" OR "${reldata}" MATCHES "^\\.\\./")
     message(FATAL_ERROR "Data file referenced by argument\n"


COMP: Update CTK to fix issues with Qt < 4.7.0

--- CMakeExternals/CTK.cmake
+++ CMakeExternals/CTK.cmake
@@ -15,7 +15,7 @@

   IF(NOT DEFINED CTK_DIR)

-    SET(revision_tag e80497a32aadaf2099f7)
+    SET(revision_tag 9a12568b2e79780e090b)
     IF(${proj}_REVISION_TAG)
       SET(revision_tag ${${proj}_REVISION_TAG})
     ENDIF()


Updated CTK version for superbuild

Updated CTK version for superbuild

--- CMakeExternals/CTK.cmake
+++ CMakeExternals/CTK.cmake
@@ -15,7 +15,7 @@

   if(NOT DEFINED CTK_DIR)

-    set(revision_tag f18114d2)
+    set(revision_tag 574e4f43)
     #IF(${proj}_REVISION_TAG)
     #  SET(revision_tag ${${proj}_REVISION_TAG})
     #ENDIF()
@@ -61,7 +61,7 @@
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
       URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_${revision_tag}.tar.gz
-      URL_MD5 03694d11d206a94284af6801aa9d8b5c
+      URL_MD5 fe37003ffab6c57e6f15c437fba4bacf
       UPDATE_COMMAND ""
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}


Update CMake module to find R

Update CMake module to find R

--- CMakeModules/FindR.cmake
+++ CMakeModules/FindR.cmake
@@ -11,6 +11,7 @@
 #
 include(CheckLibraryExists)
 include(CheckIncludeFile)
+include(FindPackageHandleStandardArgs)

 if(NOT R_EXECUTABLE)
   find_program(R_EXECUTABLE NAMES R)
@@ -26,6 +27,7 @@

 check_include_file(R.h HAVE_R_H)

+if(NOT WIN32)
 find_library(R_LIBRARY NAMES R libR PATHS ${R_LIBRARY_DIR})
 if(R_LIBRARY)
   check_library_exists(${R_LIBRARY} Rprintf "" HAVE_R_LIBRARY)
@@ -33,6 +35,8 @@
 if(HAVE_R_LIBRARY)
   set(R_LIBRARIES ${R_LIBRARY})
 endif(HAVE_R_LIBRARY)
-
-include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(R DEFAULT_MSG R_EXECUTABLE HAVE_R_LIBRARY HAVE_R_H)
+else()
+# On Windows there is no global R library to link against
+find_package_handle_standard_args(R DEFAULT_MSG R_EXECUTABLE HAVE_R_H)
+endif()


ceres use script - miniglog include directory

issue https://github.com/smanders/externpro/issues/248#issuecomment-540060014

--- projects/use/usexp-ceres-config.cmake
+++ projects/use/usexp-ceres-config.cmake
@@ -11,6 +11,7 @@
 set(verDir /${prj}_@VER@)
 unset(${PRJ}_INCLUDE_DIR CACHE)
 find_path(${PRJ}_INCLUDE_DIR ceres/ceres.h PATHS ${XP_ROOTDIR}/include${verDir} NO_DEFAULT_PATH)
+list(APPEND ${PRJ}_INCLUDE_DIR ${XP_ROOTDIR}/include${verDir}/ceres/internal/miniglog)
 # ceres installs a Targets file among other .cmake files
 include(${XP_ROOTDIR}/lib/cmake${verDir}/CeresTargets.cmake)
 set(${PRJ}_LIBRARIES ceres)


CMake: Bump version

CMake: Bump version

--- version.cmake
+++ version.cmake
@@ -2,9 +2,9 @@
 	set(PROJECT_NAME "mGBA")
 endif()
 set(LIB_VERSION_MAJOR 0)
-set(LIB_VERSION_MINOR 9)
+set(LIB_VERSION_MINOR 10)
 set(LIB_VERSION_PATCH 0)
-set(LIB_VERSION_ABI 0.9)
+set(LIB_VERSION_ABI 0.10)
 set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH})
 set(SUMMARY "${PROJECT_NAME} Game Boy Advance Emulator")


Split off 7.12.80

Split off 7.12.80

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

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


Graph Control 4.2.4-1 Gold

Graph Control 4.2.4-1 Gold

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

--- version.cmake
+++ version.cmake
@@ -5,8 +5,8 @@
 set ( HPCC_MAJOR 4 )
 set ( HPCC_MINOR 2 )
 set ( HPCC_POINT 4 )
-set ( HPCC_MATURITY "rc" )
-set ( HPCC_SEQUENCE 3 )
+set ( HPCC_MATURITY "release" )
+set ( HPCC_SEQUENCE 1 )
 ###
 IF ( ${HPCC_POINT} GREATER 65 )
   error ( "HPCC_POINT must be less than 66." )


Split off candidate-5.2.0

Split off candidate-5.2.0

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

--- version.cmake
+++ version.cmake
@@ -2,11 +2,11 @@
 ## Version Information
 ###
 set ( HPCC_PROJECT "community" )
-set ( HPCC_MAJOR 5 )
-set ( HPCC_MINOR 1 )
+set ( HPCC_MAJOR 6 )
+set ( HPCC_MINOR 0 )
 set ( HPCC_POINT 0 )
 set ( HPCC_MATURITY "trunk" )
-set ( HPCC_SEQUENCE 1 )
+set ( HPCC_SEQUENCE 0 )
 ###
 IF ( ${HPCC_POINT} GREATER 65 )
   error ( "HPCC_POINT must be less than 66." )


Split off 7.6.6

Split off 7.6.6

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

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


force OS X to package a drag and drop dmg

--- cpack-config.cmake
+++ cpack-config.cmake
@@ -7,4 +7,10 @@
 MESSAGE(STATUS "Setting cpack paths to ${PROJECT_SOURCE_DIR}/gfx/install/")
 SET(CPACK_DMG_BACKGROUND_IMAGE "${PROJECT_SOURCE_DIR}/gfx/install/install.png")
 SET(CPACK_DMG_DS_STORE "${PROJECT_SOURCE_DIR}/gfx/install/ds_store")
+
+IF(${APPLE})
+  SET(CPACK_GENERATOR DragNDrop)
+ENDIF()
+
+# this must always be last
 INCLUDE(CPack)


+ undo changes of 8b610aff on issue 0001375 because this was done in c7e41c

--- cMake/UseLibPack8x.cmake
+++ cMake/UseLibPack8x.cmake
@@ -428,22 +428,3 @@
         TRUE
     )
 endif(FREECAD_USE_FREETYPE)
-
-
-#  SHIBOKEN_INCLUDE_DIR        - Directories to include to use SHIBOKEN
-#  SHIBOKEN_LIBRARY            - Files to link against to use SHIBOKEN
-#  SHIBOKEN_BINARY             - Executable name
-
-SET(SHIBOKEN_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/shiboken)
-SET(SHIBOKEN_LIBRARY     optimized ${FREECAD_LIBPACK_DIR}/lib/shiboken-python2.6.lib debug ${FREECAD_LIBPACK_DIR}/lib/shiboken-python2.6_d.lib)
-set(SHIBOKEN_BINARY      ${FREECAD_LIBPACK_DIR}/bin/shiboken)
-
-#  PYSIDE_INCLUDE_DIR   - Directories to include to use PySide
-#  PYSIDE_LIBRARY       - Files to link against to use PySide
-#  PYSIDE_PYTHONPATH    - Path to where the PySide Python module files could be found
-#  PYSIDE_TYPESYSTEMS   - Type system files that should be used by other bindings extending PySide
-
-SET(PYSIDE_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/PySide)
-SET(PYSIDE_LIBRARY     optimized ${FREECAD_LIBPACK_DIR}/lib/pyside-python2.6.lib debug ${FREECAD_LIBPACK_DIR}/lib/pyside-python2.6_d.lib)
-SET(PYSIDE_PYTHONPATH  ${FREECAD_LIBPACK_DIR}/pyside/Lib/site-packages)
-SET(PYSIDE_TYPESYSTEMS ${FREECAD_LIBPACK_DIR}/pyside/share/PySide/typesystems)


ENH: Bump TubeTK to support internal and extern remote module

Needed to fix paths in CMakeLists.txt files throughout TubeTK
to support its use as with a remote module that is built during
the compilation of ITK or that is built externally, after ITK has been built.

--- Modules/Remote/TubeTK.remote.cmake
+++ Modules/Remote/TubeTK.remote.cmake
@@ -49,5 +49,5 @@
 "
   MODULE_COMPLIANCE_LEVEL 3
   GIT_REPOSITORY ${git_protocol}://github.com/KitwareMedical/ITKTubeTK.git
-  GIT_TAG a6d1ed624e453b32199f71b2e1d18fb63737dcfe
+  GIT_TAG 4b6b3651959f4017fce1dfdfc24c2e169c84ff0b
   )