Corrected an oversight in add_polywog_test.

--- cmake/Modules/add_polywog_test.cmake
+++ cmake/Modules/add_polywog_test.cmake
@@ -20,6 +20,7 @@
   endforeach()
   add_executable(${exe} ${sources})
   target_link_libraries(${exe} cmockery ${POLYWOG_LIBRARIES})
+  set_target_properties(${exe} PROPERTIES COMPILE_FLAGS "-DCMAKE_CURRENT_SOURCE_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"")
   if (HAVE_MPI EQUAL 1)
     foreach (proc ${procs})
       add_test(${exe}_${proc}_proc ${POLYMEC_MPIEXEC} ${POLYMEC_MPIEXEC_NUMPROC_FLAG} ${proc} ${POLYMEC_MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${exe} ${POLYMEC_MPIEXEC_POSTFLAGS})


Revert "Updated LLVM dependency."

Revert "Updated LLVM dependency."

This reverts commit 35ee22843b54ab7ac44b92835e86b9c975610c1b.

--- cmake/third_party/llvm-project.cmake
+++ cmake/third_party/llvm-project.cmake
@@ -37,8 +37,8 @@
   message(STATUS "Fetching LLVM")
   FetchContent_Declare(
     llvm-project
-    URL https://github.com/plaidml/llvm-project/archive/14732dd95a9eff28d4afbbb2a52083c9773fa350.tar.gz
-    URL_HASH SHA256=6caf34fbb54d77b21706fa5ccfac6bf4d27be6bc5208aba6f896bb69b7f5aa42
+    URL https://github.com/plaidml/llvm-project/archive/c64378c1ec6c0325ee1fc1abac89884657738657.tar.gz
+    URL_HASH SHA256=583f481050872e1ce8f90b101f3e10ec0fdc6b16dbb9d9ede8b68aaa891c4c83
   )
   # Check if population has already been performed
   FetchContent_GetProperties(llvm-project)


Make sign compare as a compile warning not error.

--- cmake/flags.cmake
+++ cmake/flags.cmake
@@ -96,6 +96,7 @@
     -Wno-unused-parameter
     -Wno-unused-function
     -Wno-error=literal-suffix
+    -Wno-error=sign-compare
     -Wno-error=unused-local-typedefs)

 set(GPU_COMMON_FLAGS
@@ -105,6 +106,7 @@
     -Wdelete-non-virtual-dtor
     -Wno-unused-parameter
     -Wno-unused-function
+    -Wno-error=sign-compare
     -Wno-error=literal-suffix
     -Wno-error=unused-local-typedefs
     -Wno-error=unused-function  # Warnings in Numpy Header.


modify flags.cmake to support modern gpu arch

Change-Id: Ie237127bb0f537998827ab29ffde2526c21c6dd1

--- cmake/flags.cmake
+++ cmake/flags.cmake
@@ -76,7 +76,7 @@

 function(specify_cuda_arch cuda_version cuda_arch)
     if(${cuda_version} VERSION_GREATER "8.0")
-        foreach(capability 60 61 62)
+        foreach(capability 61 62)
           if(${cuda_arch} STREQUAL ${capability})
             list(APPEND __arch_flags " -gencode arch=compute_${cuda_arch},code=sm_${cuda_arch}")
           endif()
@@ -90,12 +90,17 @@
     endif()
 endfunction()

-# Common cuda architectures
+# Common gpu architectures: Kepler, Maxwell
 foreach(capability 30 35 50)
     list(APPEND __arch_flags " -gencode arch=compute_${capability},code=sm_${capability}")
 endforeach()

-# Custom cuda architecture
+# Modern gpu architectures: Pascal
+if (CUDA_VERSION VERSION_GREATER "8.0")
+      list(APPEND __arch_flags " -gencode arch=compute_60,code=sm_60")
+endif()
+
+# Custom gpu architecture
 set(CUDA_ARCH)

 if(CUDA_ARCH)


add -Werror=format for macos (#47216)

add -Werror=format for macos (#47216)

--- cmake/flags.cmake
+++ cmake/flags.cmake
@@ -214,7 +214,7 @@
         CACHE STRING "Build architectures for OSX" FORCE)
   endif()
   # On Mac OS X register class specifier is deprecated and will cause warning error on latest clang 10.0
-  set(COMMON_FLAGS -Wno-deprecated-register)
+  set(COMMON_FLAGS -Wno-deprecated-register -Werror=format)
 endif()

 if(WITH_HETERPS AND WITH_PSLIB)


fptu: fix 'fetch_version' cmake macro.

fptu: fix 'fetch_version' cmake macro.

--- cmake/utils.cmake
+++ cmake/utils.cmake
@@ -71,15 +71,15 @@
       OUTPUT_STRIP_TRAILING_WHITESPACE
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

-    string(REGEX MATCH "^(v)?([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)?" git_version_valid ${${name}_GIT_DESCRIBE})
+    string(REGEX MATCH "^(v)?([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)?" git_version_valid "${${name}_GIT_DESCRIBE}")
     if(git_version_valid)
       string(REGEX REPLACE "^(v)?([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)?" "\\2;\\3;\\4" ${name}_GIT_VERSION ${${name}_GIT_DESCRIBE})
     else()
-      string(REGEX MATCH "^(v)?([0-9]+)\\.([0-9]+)(.*)?" git_version_valid ${${name}_GIT_DESCRIBE})
+      string(REGEX MATCH "^(v)?([0-9]+)\\.([0-9]+)(.*)?" git_version_valid "${${name}_GIT_DESCRIBE}")
        if(git_version_valid)
          string(REGEX REPLACE "^(v)?([0-9]+)\\.([0-9]+)(.*)?" "\\2;\\3;0" ${name}_GIT_VERSION ${${name}_GIT_DESCRIBE})
        else()
-        message(AUTHOR_WARNING "Bad ${name} version ${${name}_GIT_DESCRIBE}; falling back to 0.0.0 (have you made an initial release?)")
+        message(AUTHOR_WARNING "Bad ${name} version \"${${name}_GIT_DESCRIBE}\"; falling back to 0.0.0 (have you made an initial release?)")
         set(${name}_GIT_VERSION "0;0;0")
       endif()
     endif()
@@ -97,7 +97,7 @@
     endif()

     if (NOT ${name}_VERSION)
-      message (WARNING "Unable to retrive ${name} version from ${version_file} file.")
+      message (WARNING "Unable to retrive ${name} version from \"${version_file}\" file.")
       set(${name}_VERSION_LIST ${${name}_GIT_VERSION})
       string(REPLACE ";" "." ${name}_VERSION "${${name}_GIT_VERSION}")
     else()


ENH: Make IO factory registration manager optional for applications

Since commit 7adc806b (Configure built-in IO Factories Registration,
2011-03-15) the UseITK module has generated a header into the
application build tree, added an include directory for it, and defined
ITK_IO_FACTORY_REGISTER_MANAGER for the whole directory.  While this
achieves automatic registration of IO support for all available formats
in the application, not all applications need this magic.  Some may
prefer to register support only for the formats they need.

Conditionalize the behavior on "NOT ITK_NO_IO_FACTORY_REGISTER_MANAGER"
so that applications may disable it by setting the variable before
loading ITK.

--- CMake/UseITK.cmake
+++ CMake/UseITK.cmake
@@ -11,36 +11,39 @@
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${ITK_REQUIRED_LINK_FLAGS}")

 # Add include directories needed to use ITK.
-include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/ITKIOFactoryRegistration ${ITK_INCLUDE_DIRS})
+include_directories(BEFORE ${ITK_INCLUDE_DIRS})

 # Add link directories needed to use ITK.
 link_directories(${ITK_LIBRARY_DIRS})

+if(NOT ITK_NO_IO_FACTORY_REGISTER_MANAGER)
+  #
+  # Infrastructure for registering automatically the factories of commonly used IO formats
+  #
+  set(LIST_OF_FACTORIES_REGISTRATION "")
+  set(LIST_OF_FACTORY_NAMES "")

-#
-# Infrastructure for registering automatically the factories of commonly used IO formats
-#
-set(LIST_OF_FACTORIES_REGISTRATION "")
-set(LIST_OF_FACTORY_NAMES "")
+  foreach (ImageFormat  JPEG GDCM BMP LSM PNG TIFF VTK Stimulate BioRad Meta)
+    if (ITK-IO-${ImageFormat}_LOADED)
+      set (LIST_OF_FACTORIES_REGISTRATION "${LIST_OF_FACTORIES_REGISTRATION}void ${ImageFormat}ImageIOFactoryRegister__Private(void);")
+      set (LIST_OF_FACTORY_NAMES  "${LIST_OF_FACTORY_NAMES}${ImageFormat}ImageIOFactoryRegister__Private,")
+    endif()
+  endforeach()

+  foreach (ImageFormat  Nifti Nrrd Gipl)
+    string(TOUPPER ${ImageFormat} ImageFormat_UPPER)
+    if (ITK-IO-${ImageFormat_UPPER}_LOADED)
+      set (LIST_OF_FACTORIES_REGISTRATION "${LIST_OF_FACTORIES_REGISTRATION}void ${ImageFormat}ImageIOFactoryRegister__Private(void);")
+      set (LIST_OF_FACTORY_NAMES  "${LIST_OF_FACTORY_NAMES}${ImageFormat}ImageIOFactoryRegister__Private,")
+    endif()
+  endforeach()

-foreach (ImageFormat  JPEG GDCM BMP LSM PNG TIFF VTK Stimulate BioRad Meta)
-        if (ITK-IO-${ImageFormat}_LOADED)
-                set (LIST_OF_FACTORIES_REGISTRATION "${LIST_OF_FACTORIES_REGISTRATION}void ${ImageFormat}ImageIOFactoryRegister__Private(void);")
-                set (LIST_OF_FACTORY_NAMES  "${LIST_OF_FACTORY_NAMES}${ImageFormat}ImageIOFactoryRegister__Private,")
-        endif()
-endforeach()
+  get_filename_component(_selfdir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+  configure_file(${_selfdir}/itkImageIOFactoryRegisterManager.h.in
+   "${CMAKE_CURRENT_BINARY_DIR}/ITKIOFactoryRegistration/itkImageIOFactoryRegisterManager.h" @ONLY)
+  unset(LIST_OF_FACTORIES_REGISTRATION)
+  unset(LIST_OF_FACTORY_NAMES)

-foreach (ImageFormat  Nifti Nrrd Gipl)
-        string(TOUPPER ${ImageFormat} ImageFormat_UPPER)
-        if (ITK-IO-${ImageFormat_UPPER}_LOADED)
-                set (LIST_OF_FACTORIES_REGISTRATION "${LIST_OF_FACTORIES_REGISTRATION}void ${ImageFormat}ImageIOFactoryRegister__Private(void);")
-                set (LIST_OF_FACTORY_NAMES  "${LIST_OF_FACTORY_NAMES}${ImageFormat}ImageIOFactoryRegister__Private,")
-        endif()
-endforeach()
-
-get_filename_component(_selfdir "${CMAKE_CURRENT_LIST_FILE}" PATH)
-configure_file(${_selfdir}/itkImageIOFactoryRegisterManager.h.in
- "${CMAKE_CURRENT_BINARY_DIR}/ITKIOFactoryRegistration/itkImageIOFactoryRegisterManager.h" @ONLY)
-
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ITK_IO_FACTORY_REGISTER_MANAGER)
+  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ITK_IO_FACTORY_REGISTER_MANAGER)
+  include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/ITKIOFactoryRegistration)
+endif()


No need to search for gfortran

No need to search for gfortran

--- lib/TH/cmake/FindBLAS.cmake
+++ lib/TH/cmake/FindBLAS.cmake
@@ -112,7 +112,7 @@
   BLAS
   sgemm
   ""
-  "openblas;gfortran")
+  "openblas")
   if(BLAS_LIBRARIES)
     set(BLAS_INFO "open")
   endif(BLAS_LIBRARIES)
@@ -125,7 +125,7 @@
   BLAS
   sgemm
   ""
-  "openblas;gfortran;pthread")
+  "openblas;pthread")
   if(BLAS_LIBRARIES)
     set(BLAS_INFO "open")
   endif(BLAS_LIBRARIES)


Fixing some of the packaging properties

Fixing some of the packaging properties

--- Resources/CPack/PackageProject.cmake
+++ Resources/CPack/PackageProject.cmake
@@ -103,8 +103,8 @@

-set (OpenMBIR_WEBSITE_SERVER "www.bluequartz.net")
-set (OpenMBIR_WEBSITE_SERVER_PATH "/var/www/www.bluequartz.net/binaries/to81/.")
+set (OpenMBIR_WEBSITE_SERVER "www.openmbir.org")
+set (OpenMBIR_WEBSITE_SERVER_PATH "/var/www/www.openmbir.org/binaries/.")
 set (OpenMBIR_WEBSITE_SCP_USERNAME "mjackson")
 #-- Create a bash script file that will upload the latest version to the web server
 configure_file(${PROJECT_RESOURCES_DIR}/upload.sh.in
@@ -119,8 +119,8 @@
   # There is a bug in NSIS that does not handle full unix paths properly. Make
   # sure there is at least one set of four (4) backlasshes.
   SET(CPACK_NSIS_DISPLAY_NAME "OpenMBIR Software Tools")
-  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.bluequartz.net")
-  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.bluequartz.net")
+  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.openmbir.org")
+  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.openmbir.org")
   SET(CPACK_NSIS_CONTACT "mike.jackson@bluequartz.net")
   SET(CPACK_NSIS_MODIFY_PATH ON)
   SET(CPACK_GENERATOR "ZIP")


r9219/sofa : fix EXTERNAL_HAVE_EIGEN2 flag in SofaConstraint.cmake

Former-commit-id: 386348ae86cdc12bd24bca3e801da4bb401a1458

--- modules/sofa/component/SofaConstraint.cmake
+++ modules/sofa/component/SofaConstraint.cmake
@@ -63,7 +63,7 @@

     )

-if( SOFA_HAVE_EIGEN2 )
+if( EXTERNAL_HAVE_EIGEN2 )
 	list(APPEND HEADER_FILES "collision/BarycentricDistanceLMConstraintContact.h")
 	list(APPEND HEADER_FILES "collision/BarycentricDistanceLMConstraintContact.inl")
 	list(APPEND HEADER_FILES "constraintset/DOFBlockerLMConstraint.h")


rpmbuild-md5 is required for koji build in el5

--- Modules/PackRPM.cmake
+++ Modules/PackRPM.cmake
@@ -186,7 +186,7 @@

 	    # Don't worry about SRPMS, RPMS and BUILDROOT, it will be created by rpmbuild
 	    ADD_CUSTOM_COMMAND(OUTPUT ${_prj_srpm_path}
-		COMMAND ${RPMBUILD} -bs ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec
+		COMMAND ${RPMBUILD}-md5 -bs ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec
 		--define '_sourcedir ${RPM_BUILD_SOURCES}'
 		--define '_builddir ${RPM_BUILD_BUILD}'
 		--define '_srcrpmdir ${RPM_BUILD_SRPMS}'


CMake: Changed usage of `get_filename_component` function.

The built-in function `get_filename_component` has a legacy argument
'PATH' which is used for CMake versions <= 2.8.11.  The argument is
renamed to 'DIRECTORY' in later versions of CMake.

Since we support CMake down to 2.8.10, we need to use the legacy
argument instead of the newer one.

--- 3rdparty/stout/cmake/GroupSource.cmake
+++ 3rdparty/stout/cmake/GroupSource.cmake
@@ -71,10 +71,15 @@
     # Get relative directory of source file, use to generate a source group
     # that resembles the directory tree.
     get_filename_component(SOURCE_FILE_REALPATH ${SOURCE_FILE} REALPATH)
-    file(RELATIVE_PATH SOURCE_FILE_RELATIVE ${RELATIVE_TO}
-         ${SOURCE_FILE_REALPATH})
-    get_filename_component(SOURCE_DIRECTORY_RELATIVE ${SOURCE_FILE_RELATIVE}
-                           DIRECTORY)
+
+    file(RELATIVE_PATH SOURCE_FILE_RELATIVE
+      ${RELATIVE_TO} ${SOURCE_FILE_REALPATH})
+
+    get_filename_component(
+      SOURCE_DIRECTORY_RELATIVE
+      ${SOURCE_FILE_RELATIVE}
+      PATH)
+
     set(SOURCE_GROUP "${GROUP_NAME}\\${SOURCE_DIRECTORY_RELATIVE}")

     # This is necessary because source group names require '\' rather than '/'
@@ -91,7 +96,8 @@
     get_filename_component(
       SOURCE_DIRECTORY
       "${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_FILE}"
-      DIRECTORY)
+      PATH)
+
     file(
       GLOB
       SOURCE_GROUP_FILES


Update DF to include the MS5607 driver

Update DF to include the MS5607 driver

--- cmake/configs/posix_bebop_default.cmake
+++ cmake/configs/posix_bebop_default.cmake
@@ -4,6 +4,7 @@

 add_definitions(
   -D__PX4_POSIX_BEBOP
+  -D__BEBOP
 	)

 set(CMAKE_PROGRAM_PATH


Adding hook for look up packages

Adding hook for look up packages

Hooks should consist of scripts in a given directory (per hook) with a given filename (per package).
A function exists to write these hooks as cmake scripts. Only one hook is currently called:
POST_LOOKUP. It is executed if the recipe has already been included once.

--- scripts/PackageLookup.cmake
+++ scripts/PackageLookup.cmake
@@ -169,6 +169,14 @@

 # Looks for a lookup package file and includes it.
 macro(lookup_package package)
+
+    # include potential post lookup script
+    if(${package}_BUILT_AS_EXTERNAL_PROJECT)
+        if(EXISTS "${EXTERNAL_ROOT}/post_lookup/${package}.cmake")
+            include("${EXTERNAL_ROOT}/post_lookup/${package}.cmake")
+        endif()
+    endif()
+
     string(TOUPPER "${package}" PACKAGE)
     cmake_parse_arguments(${package}
         "DOWNLOAD_BY_DEFAULT;REQUIRED;QUIET;KEEP;NOFIND;CHECK_EXTERNAL"
@@ -198,8 +206,12 @@
     # If package is not found, then look for a recipe to download and build it
     if(NOT ${package}_FOUND OR ${package}_LOOKUP_BUILD)
         _perform_actual_lookup(${package})
-    endif()
-endmacro()
+        # Sets a variable saying we are building this source externally
+        set(${package}_BUILT_AS_EXTERNAL_PROJECT TRUE CACHE INTERNAL
+            "${package} is the result of a local install")
+    endif()
+endmacro()
+

 # Makes target depend on external dependencies
 macro(depends_on_lookups TARGET)
@@ -250,10 +262,34 @@
                 message(FATAL_ERROR "[${name}] Could not be downloaded and installed")
             endif()
         endif()
-        # Sets a variable saying we are building this source externally
-        set(${name}_BUILT_AS_EXTERNAL_PROJECT TRUE)
-    endif()
-endmacro()
+    endif()
+
+endmacro()
+
+# A script that is executed once a package has been built locally
+# This function should be called from the lookup recipe
+function(write_lookup_hook hook package)
+    cmake_parse_arguments(_wpls${package} "APPEND" "" "" ${ARGN})
+    # checks the hook argument for correctness
+    string(TOUPPER "${hook}" hook)
+    set(hooks POST_LOOKUP)
+    list(FIND hooks "${hook}" correct_hook)
+    if(correct_hook EQUAL -1)
+        message(FATAL_ERROR "Hook argument(${hook}) should be one of ${hooks}.")
+    endif()
+
+    # Sets filename. That's the only difference between hooks, in practice.
+    if("${hook}" STREQUAL "POST_LOOKUP")
+        set(filename "${EXTERNAL_ROOT}/post_lookup/${package}.cmake")
+    endif()
+
+    # Then write or append to file.
+    if(_wpls${package}_APPEND)
+        file(APPEND "${filename}" ${_wpls${package}_UNPARSED_ARGUMENTS})
+    else()
+        file(WRITE "${filename}" ${_wpls${package}_UNPARSED_ARGUMENTS})
+    endif()
+endfunction()

 # Avoids anoying cmake warning, by actually using the variables.
 # The will be if the appropriate find_* is used. But won't be otherwise.


cmake: set CMAKE_CXX_FLAGS in FBCompilerSettingsUnix.cmake

Summary:
It looks like the various CMAKE_CXX_FLAGS_* are simply ineffective, and I'm not
sure why, setting CMAKE_CXX_FLAGS does work though, and CMake appears to add
some release/debug flags to it when generating Ninja files.

Reviewed By: fanzeyi

Differential Revision: D27862117

fbshipit-source-id: a89f6182b5bae9a087f8fcfd4c5f9526f91e2adf

--- build/fbcode_builder/CMake/FBCompilerSettingsUnix.cmake
+++ build/fbcode_builder/CMake/FBCompilerSettingsUnix.cmake
@@ -6,6 +6,4 @@
 # to these shared compiler settings in order to avoid accidentally
 # breaking a build in another project!

-set(CMAKE_CXX_FLAGS_COMMON "-g -Wall -Wextra -Wno-deprecated -Wno-deprecated-declarations")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_COMMON}")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_COMMON} -O3")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -Wno-deprecated -Wno-deprecated-declarations")


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 02)

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


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   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 06)

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


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   28)
+SET(KWSYS_DATE_STAMP_DAY   29)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


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 02)

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


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 10)

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


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 02)

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


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   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 12)

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


SuperBuild: safe to trust on git commit rather than master

--- SuperBuild/CMake/External_openjpeg.cmake
+++ SuperBuild/CMake/External_openjpeg.cmake
@@ -30,7 +30,7 @@
 ExternalProject_Add(OPENJPEG
   PREFIX OPENJPEG
   GIT_REPOSITORY "https://github.com/uclouvain/openjpeg.git"
-  GIT_TAG master
+  GIT_TAG d0babeb6f6cdd1887308137df37bb2b4724a6592
   BINARY_DIR ${OPENJPEG_SB_BUILD_DIR}
   INSTALL_DIR ${SB_INSTALL_PREFIX}
   DOWNLOAD_DIR ${DOWNLOAD_LOCATION}


PKG: build patchelf with -static #jira 1259

--- SuperBuild/CMake/External_pkgtools.cmake
+++ SuperBuild/CMake/External_pkgtools.cmake
@@ -29,7 +29,6 @@
 #This variable is referenced in CreateCMakeProjects.cmake
 set(PATCHELF_PROGRAM "${PATCHELF_SOURCE_DIR}/src/patchelf")

-
 set(MAKESELF_SOURCE_DIR  "${PKGTOOLS_SB_PREFIX_DIR}/src/makeself")
 # MAKESELF_SOURCE_DIR is same as MAKESELF_BINARY_DIR and MAKESELF_INSTALL_DIR
 set(MAKESELF_STAMP_DIR   "${PKGTOOLS_SB_PREFIX_DIR}/stamp/makeself")
@@ -51,6 +50,7 @@

 include(ExternalProject)

+set(PATCHELF_ENV_CONFIGURE_CMD "${SB_ENV_CONFIGURE_CMD};CXXFLAGS='-static'")

 if(APPLE)
   add_custom_target(PATCHELF)
@@ -65,7 +65,9 @@
     INSTALL_DIR         "${PATCHELF_INSTALL_DIR}"
     STAMP_DIR           "${PATCHELF_STAMP_DIR}"
     TMP_DIR             "${PATCHELF_TMP_DIR}"
-    CONFIGURE_COMMAND "./configure" "--prefix" "${PATCHELF_INSTALL_DIR}"
+    CONFIGURE_COMMAND
+    ${PATCHELF_ENV_CONFIGURE_CMD}
+    ${PATCHELF_SOURCE_DIR}/configure
     INSTALL_COMMAND ""
     )
 endif()


BUG: Mantis-1424: fix missing proj.dll in windows packages

--- SuperBuild/Packaging/PackageHelper.cmake
+++ SuperBuild/Packaging/PackageHelper.cmake
@@ -311,8 +311,10 @@
   endif()

   # special case for msvc: ucrtbase.dll must be explicitly vetted.
+  # for proj.dll, see Mantis-1424
   if(MSVC AND NOT PKG_GENERATE_XDK)
     list(APPEND PKG_PEFILES "ucrtbase.dll")
+    list(APPEND PKG_PEFILES "proj.dll")
   endif()

   file(GLOB OTB_APPS_LIST "${OTB_APPLICATIONS_DIR}/otbapp_*${LIB_EXT}") # /lib/otb


Update wxWidgets to the newest version

Update wxWidgets to the newest version

--- CMake/Conan.cmake
+++ CMake/Conan.cmake
@@ -24,7 +24,7 @@
     list(
       APPEND
       CONAN_DEPENDENCIES
-      wxwidgets/3.1.2@bincrafters/stable
+      wxwidgets/3.1.4@bincrafters/stable
       fmt/7.0.3
       span-lite/0.6.0
     )


changed opengm.cmake test command and git url

--- opengm.cmake
+++ opengm.cmake
@@ -19,7 +19,7 @@
 message ("Installing ${opengm_NAME} into FlyEM build area: ${BUILDEM_DIR} ...")
 ExternalProject_Add(${opengm_NAME}
     PREFIX              ${BUILDEM_DIR}
-    URL                 ${opengm_URL}
+    GIT_REPOSITORY      ${opengm_URL}
     # URL_MD5             ${opengm_MD5}
     UPDATE_COMMAND      ""
     PATCH_COMMAND       "" #${BUILDEM_ENV_STRING} ${PATCH_EXE}
@@ -34,7 +34,7 @@

     BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
     INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make check
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} make test
 )

 set_target_properties(${opengm_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)


Set default for git revision

Set default for git revision

--- revision.cmake
+++ revision.cmake
@@ -1,4 +1,6 @@
 # Copyright (c) 2011 Stefan Eilemann <eile@eyescale.ch>
+
+set(GIT_REVISION 0)

 if(CMAKE_VERSION VERSION_LESS 2.8)
   message(STATUS "No revision version support, git not found")


SuperBuild: use list instead of cmake global property

--- SuperBuild/CMake/SuperBuild_Macro.cmake
+++ SuperBuild/CMake/SuperBuild_Macro.cmake
@@ -69,9 +69,9 @@
 macro(ADDTO_DEPENDENCIES_IF_NOT_SYSTEM project)
   foreach(dep ${ARGN})
     if(NOT USE_SYSTEM_${dep})
-#      get_property(old_${project}_DEPENDENCIES GLOBAL PROPERTY prop_${project}_DEPENDENCIES)
+      #      get_property(old_${project}_DEPENDENCIES GLOBAL PROPERTY prop_${project}_DEPENDENCIES)
       list(APPEND ${project}_DEPENDENCIES "${dep}")
- #     set_property(GLOBAL PROPERTY prop_${project}_DEPENDENCIES "${old_${project}_DEPENDENCIES}")
+      #     set_property(GLOBAL PROPERTY prop_${project}_DEPENDENCIES "${old_${project}_DEPENDENCIES}")
     endif()
     string(TOLOWER ${dep} dep_lower)
     include(External_${dep_lower})


cmake: findlapack template

cmake: findlapack template

--- cmake/Modules/FindLAPACK.cmake
+++ cmake/Modules/FindLAPACK.cmake
@@ -74,6 +74,10 @@
 * Atlas http://math-atlas.sourceforge.net/errata.html#LINK
 * MKL LAPACKE (C, C++): https://software.intel.com/en-us/mkl-linux-developer-guide-calling-lapack-blas-and-cblas-routines-from-c-c-language-environments
 #]=======================================================================]
+
+# clear to avoid endless appending on subsequent calls
+set(LAPACK_LIBRARY)
+set(LAPACK_INCLUDE_DIR)

 # ===== functions ==========


explicity added cov to g++

explicity added cov to g++

--- cmake/set_compiler_flags.cmake
+++ cmake/set_compiler_flags.cmake
@@ -33,9 +33,13 @@

     # for code coverage
     add_cxx_compiler_flag("-O0" "DEBUG")
-    add_cxx_compiler_flag("-fprofile-arcs" "DEBUG")
-    add_cxx_compiler_flag("-ftest-coverage" "DEBUG")
-    add_cxx_compiler_flag("--coverage" "DEBUG")
+    # add_cxx_compiler_flag("-fprofile-arcs" "DEBUG")
+    # add_cxx_compiler_flag("-ftest-coverage" "DEBUG")
+    # add_cxx_compiler_flag("--coverage" "DEBUG")
+    check_cxx_compiler_flag(--coverage COMPILER_SUPPORT_COVERAGE)
+    if(COMPILER_SUPPORT_COVERAGE)
+      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} --coverage")
+    endif()

     add_cxx_compiler_flag("-g0" "RELEASE")
     add_cxx_compiler_flag("-O3" "RELEASE")


cmake: Add support for MSVC12 in ZeroMQ finder.

--- cmake_modules/FindZeroMQ.cmake
+++ cmake_modules/FindZeroMQ.cmake
@@ -55,7 +55,9 @@
     ZMQ_VERSION_LOOKUP(${ZeroMQ_INCLUDE_DIR} ZMQ_VERSION_MAJOR ZMQ_VERSION_MINOR ZMQ_VERSION_PATCH ZeroMQ_VERSION)
     set(ZeroMQ_LIB_VERSION "${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")

-    if(MSVC_VERSION MATCHES "1700")
+    if(MSVC12)
+      set(ZMQ_COMPILER_STRING "-v120")
+    elseif(MSVC11)
       set(ZMQ_COMPILER_STRING "-v110")
     elseif(MSVC10)
       set(ZMQ_COMPILER_STRING "-v100")


ignored directories named 'CMakeFiles' while parsing apps/, to avoid CMake errors for non-off-tree builds

--- cmakemodules/UtilsMacros.cmake
+++ cmakemodules/UtilsMacros.cmake
@@ -57,9 +57,9 @@
   set(list_of_dirs "")
   foreach(dir ${sub_dir})
     string(SUBSTRING ${dir} 0 1 dir1st)
-    if(IS_DIRECTORY ${curdir}/${dir} AND NOT "${dir1st}" STREQUAL ".")
+    if(IS_DIRECTORY ${curdir}/${dir} AND NOT "${dir1st}" STREQUAL "." AND NOT ${dir} STREQUAL "CMakeFiles")
         set(list_of_dirs ${list_of_dirs} ${dir})
-    endif(IS_DIRECTORY ${curdir}/${dir} AND NOT "${dir1st}" STREQUAL ".")
+    endif(IS_DIRECTORY ${curdir}/${dir} AND NOT "${dir1st}" STREQUAL "." AND NOT ${dir} STREQUAL "CMakeFiles")
   endforeach(dir)
   set(${retval} ${list_of_dirs})
 endmacro(list_subdirectories)


gmio_core: there was still old FOUG_ prefixes in config.h.cmake

--- src/gmio_core/config.h.cmake
+++ src/gmio_core/config.h.cmake
@@ -1,26 +1,26 @@
 /* Generated by CMake */

-#ifndef FOUG_CONFIG_H_CMAKE
-#define FOUG_CONFIG_H_CMAKE
+#ifndef GMIO_CONFIG_H_CMAKE
+#define GMIO_CONFIG_H_CMAKE

-#ifndef FOUG_HAVE_STDINT_H
-#cmakedefine FOUG_HAVE_STDINT_H
+#ifndef GMIO_HAVE_STDINT_H
+#cmakedefine GMIO_HAVE_STDINT_H
 #endif

-#ifndef FOUG_HAVE_STRTOF_FUNC
-#cmakedefine FOUG_HAVE_STRTOF_FUNC
+#ifndef GMIO_HAVE_STRTOF_FUNC
+#cmakedefine GMIO_HAVE_STRTOF_FUNC
 #endif

-#ifndef FOUG_HAVE_GCC_BUILTIN_BSWAP16_FUNC
-#cmakedefine FOUG_HAVE_GCC_BUILTIN_BSWAP16_FUNC
+#ifndef GMIO_HAVE_GCC_BUILTIN_BSWAP16_FUNC
+#cmakedefine GMIO_HAVE_GCC_BUILTIN_BSWAP16_FUNC
 #endif

-#ifndef FOUG_HAVE_GCC_BUILTIN_BSWAP32_FUNC
-#cmakedefine FOUG_HAVE_GCC_BUILTIN_BSWAP32_FUNC
+#ifndef GMIO_HAVE_GCC_BUILTIN_BSWAP32_FUNC
+#cmakedefine GMIO_HAVE_GCC_BUILTIN_BSWAP32_FUNC
 #endif

-#ifndef FOUG_HAVE_MSVC_BUILTIN_BSWAP_FUNC
-#cmakedefine FOUG_HAVE_MSVC_BUILTIN_BSWAP_FUNC
+#ifndef GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC
+#cmakedefine GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC
 #endif

-#endif /* FOUG_CONFIG_H_CMAKE */
+#endif /* GMIO_CONFIG_H_CMAKE */


Make sure that targets using style checks depend on file imports.

This is done by forcing clients to pass the name of the import
target so that we can add a dependency.

--- VeraPPUtilities.cmake
+++ VeraPPUtilities.cmake
@@ -273,7 +273,8 @@
 function (_verapp_profile_check_sources_conformance_for_target VERAPP_DIRECTORY
                                                                SOURCES_VAR
                                                                PROFILE
-                                                               TARGET)
+                                                               TARGET
+                                                               IMPORT_TARGET)

     # ERROR passes --error to vera++ so that it
     # returns a nonzero exit code on failure
@@ -303,6 +304,8 @@
                             WORKING_DIRECTORY ${VERAPP_DIRECTORY})
     endforeach ()

+    add_dependencies (${TARGET} ${IMPORT_TARGET})
+
 endfunction (_verapp_profile_check_sources_conformance_for_target)

 # verapp_profile_check_source_files_list_conformance_for_target
@@ -320,6 +323,7 @@
                                                                    SOURCES_LIST_VAR
                                                                    PROFILE
                                                                    TARGET
+                                                                   IMPORT_TARGET
                                                                    MODE)

     _verapp_check_sources_conformance_invariants (${MODE})
@@ -328,6 +332,7 @@
                                                           ${SOURCES_LIST_VAR}
                                                           ${PROFILE}
                                                           ${TARGET}
+                                                          ${IMPORT_TARGET}
                                                           ${MODE})

 endfunction (verapp_profile_check_source_files_conformance_for_target)
@@ -348,6 +353,7 @@
                                                         SOURCES_DIRECTORY
                                                         PROFILE
                                                         TARGET
+                                                        IMPORT_TARGET
                                                         MODE)

     _verapp_check_sources_conformance_invariants (${MODE})
@@ -367,6 +373,7 @@
                                                           _sources
                                                           ${PROFILE}
                                                           ${TARGET}
+                                                          ${IMPORT_TARGET}
                                                           ${MODE})

 endfunction (verapp_profile_check_source_files_conformance)


First look for libigl as subdir in main proj dir

--- cmake/FindLIBIGL.cmake
+++ cmake/FindLIBIGL.cmake
@@ -11,6 +11,7 @@
    ${PROJECT_SOURCE_DIR}/../../include
    ${PROJECT_SOURCE_DIR}/../include
    ${PROJECT_SOURCE_DIR}/include
+   ${PROJECT_SOURCE_DIR}/libigl/include
    ${PROJECT_SOURCE_DIR}/../libigl/include
    ${PROJECT_SOURCE_DIR}/../../libigl/include
    $ENV{LIBIGL}/include


Some improvements to FindOpenCL for linux

--- cmake/FindOpenCL.cmake
+++ cmake/FindOpenCL.cmake
@@ -118,18 +118,21 @@
   endif()
 else()
   find_library(OpenCL_LIBRARY
-    NAMES OpenCL)
+    NAMES OpenCL
+    PATHS
+      /usr/local/cuda/lib64
+      ENV AMDAPPSDKROOT/lib/sdk
+    )
 endif()

 set(OpenCL_LIBRARIES ${OpenCL_LIBRARY})
 set(OpenCL_INCLUDE_DIRS ${OpenCL_INCLUDE_DIR})
-message(STATUS "OpenCL_INCLUDE_DIRS " ${OpenCL_INCLUDE_DIRS})

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   OpenCL
   FOUND_VAR OpenCL_FOUND
-  REQUIRED_VARS OpenCL_LIBRARY OpenCL_INCLUDE_DIR
+  REQUIRED_VARS OpenCL_LIBRARY
   VERSION_VAR OpenCL_VERSION_STRING)

 mark_as_advanced(


cmake: extended zephyr_library_amend description with an extra example

Add some more example to the description of zephyr_library_amend().
This should help users to get input of the extra possibilities that this
function provides.

See: #35770

Signed-off-by: Torsten Rasmussen <a7c5b1d5a1f41fce6edfa3f7c2392ae0c59deafe@nordicsemi.no>
Signed-off-by: Andrzej Głąbek <6788b8d556a8a447102338fc996c42180ecff44e@nordicsemi.no>

--- cmake/extensions.cmake
+++ cmake/extensions.cmake
@@ -435,6 +435,17 @@
 # with content:
 # zephyr_library_amend()
 # zephyr_libray_add_sources(...)
+#
+# It is also possible to use generator expression when amending to Zephyr
+# libraries.
+#
+# For example, in case it is required to expose the Zephyr library's folder as
+# include path then the following is possible:
+# zephyr_library_amend()
+# zephyr_library_include_directories($<TARGET_PROPERTY:SOURCE_DIR>)
+#
+# See the CMake documentation for more target properties or generator
+# expressions.
 #
 macro(zephyr_library_amend)
   # This is a macro because we need to ensure the ZEPHYR_CURRENT_LIBRARY and


removed find cyclopts

removed find cyclopts

--- src/CMake/FindCYCLOPTS.cmake
+++ src/CMake/FindCYCLOPTS.cmake
@@ -1,36 +0,0 @@
-
-IF(NOT DEFINED CYCLOPTS_ROOT_DIR)
-    SET(CYCLOPTS_ROOT_DIR "$ENV{CYCLOPTS_ROOT_DIR}")
-ENDIF(NOT DEFINED CYCLOPTS_ROOT_DIR)
-
-MESSAGE(STATUS "CYCLOPTS_ROOT_DIR hint is : ${CYCLOPTS_ROOT_DIR}")
-
-# if installed in a non-standard location,
-# the include directory must be added to the PATH variable
-FIND_PATH(CYCLOPTS_INCLUDE_DIR cyclopts/Variable.h
-  HINTS "${CYCLOPTS_INCLUDE_DIR}"
-  HINTS "${CYCLOPTS_ROOT_DIR}"
-  HINTS "${CYCLOPTS_ROOT_DIR}/include"
-  HINTS /usr/
-  HINTS /usr/include/
-  HINTS /usr/local/
-  HINTS /usr/local/include/
-  HINTS /usr/cyclopts/
-  HINTS /usr/local/cyclopts/
-  HINTS ${CYCLOPTS_HINT}/
-)
-
-set(CYCLOPTS_INCLUDE_DIR ${CYCLOPTS_INCLUDE_DIR}/cyclopts)
-#MESSAGE("\tCYCLOPTS Include Dir: ${CYCLOPTS_INCLUDE_DIR}")
-
-FIND_LIBRARY(CYCLOPTS_LIBRARY
-  NAMES cyclopts libcyclopts
-  HINTS ${CYCLOPTS_INCLUDE_DIR}/../../lib
-)
-
-# let us know if we found it
-IF(CYCLOPTS_INCLUDE_DIR)
-  MESSAGE("\tFound CYCLOPTS Include Dir: ${CYCLOPTS_INCLUDE_DIR}")
-ELSE(CYCLOPTS_INCLUDE_DIR)
-  MESSAGE("\tCYCLOPTS Include Dir NOT FOUND")
-ENDIF(CYCLOPTS_INCLUDE_DIR)


Add convenience function to check if a dependency is satisfied.

--- VigraAddDep.cmake
+++ VigraAddDep.cmake
@@ -261,6 +261,15 @@
   endfunction()
 endfunction()

+function(vad_dep_satisfied NAME)
+  get_property(_VAD_DEP_${NAME}_SATISFIED GLOBAL PROPERTY VAD_DEP_${NAME}_SATISFIED)
+  if(_VAD_DEP_${NAME}_SATISFIED)
+    set(VAD_DEP_${NAME}_SATISFIED TRUE PARENT_SCOPE)
+  else()
+    set(VAD_DEP_${NAME}_SATISFIED FALSE PARENT_SCOPE)
+  endif()
+endfunction()
+
 function(vigra_add_dep NAME)
   # Reset the hooks.
   vad_reset_hooks()
@@ -278,8 +287,8 @@
   endif()

   # Check if the dependency is already satisfied.
-  get_property(_VAD_DEP_${NAME}_SATISFIED GLOBAL PROPERTY VAD_DEP_${NAME}_SATISFIED)
-  if(_VAD_DEP_${NAME}_SATISFIED)
+  vad_dep_satisfied(${NAME})
+  if(VAD_DEP_${NAME}_SATISFIED)
     message(STATUS "Dependency '${NAME}' already satisfied, skipping.")
     return()
   endif()


Fixed compiler name macro

Fixed compiler name macro

--- build/macros.cmake
+++ build/macros.cmake
@@ -173,20 +173,20 @@
 macro(get_compiler_name _var)
 	if(MSVC)
 		if(MSVC11)
-			set(_var vc11)
+			set(${_var} "vc11")
 		elseif(MSVC12)
-			set(_var vc12)
+			set(${_var} "vc12")
 		elseif(MSVC14)
-			set(_var vc14)
+			set(${_var} "vc14")
 		endif()
 	elseif(DEFINED CMAKE_COMPILER_IS_GNUCC)
-		set(_var gcc)
+		set(${_var} "gcc")
 	elseif(DEFINED CMAKE_COMPILER_IS_GNUCXX)
-		set(_var gxx)
+		set(${_var} "gxx")
 	elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		set(_var clang)
+		set(${_var} "clang")
 	elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-		set(_var icc)
+		set(${_var} "icc")
 	else()
 		message(FATAL_ERROR "Compiler not recognized")
 	endif()


rename variable to not use underscore prefix

--- cmake/find_ros1_interface_packages.cmake
+++ cmake/find_ros1_interface_packages.cmake
@@ -16,10 +16,10 @@
   # rosmsg/rossrv require the ROS 1 packages to be first in the PYTHONPATH
   # therefore we temporarily remove every ROS 2 path from the PYTHONPATH
   file(TO_CMAKE_PATH "$ENV{AMENT_PREFIX_PATH}" AMENT_PREFIX_PATH)
-  set(_ORIG_PYTHONPATH "$ENV{PYTHONPATH}")
-  file(TO_CMAKE_PATH "${_ORIG_PYTHONPATH}" PYTHONPATH)
+  set(PYTHONPATH "$ENV{PYTHONPATH}")
+  file(TO_CMAKE_PATH "${PYTHONPATH}" CMAKE_PYTHONPATH)
   set(PYTHONPATH_WITHOUT_ROS2 "")
-  foreach(python_path IN LISTS PYTHONPATH)
+  foreach(python_path IN LISTS CMAKE_PYTHONPATH)
     set(match FALSE)
     foreach(ament_prefix_path IN LISTS AMENT_PREFIX_PATH)
       if(python_path MATCHES "^${ament_prefix_path}/")
@@ -50,7 +50,7 @@
   )

   # restore PYTHONPATH
-  set(ENV{PYTHONPATH} ${_ORIG_PYTHONPATH})
+  set(ENV{PYTHONPATH} ${PYTHONPATH})

   if(NOT rosmsg_error STREQUAL "" OR NOT rossrv_error STREQUAL "")
     message(FATAL_ERROR "${rosmsg_error}\n${rossrv_error}\nFailed to call rosmsg/rossrv")


version 0.0.0.8

version 0.0.0.8

--- PluginConfig.cmake
+++ PluginConfig.cmake
@@ -8,7 +8,7 @@
 set(PLUGIN_NAME "FBVLC")
 set(PLUGIN_PREFIX "FBVLC")
 set(COMPANY_NAME "RSATom")
-set(PLUGIN_VERSION "0.0.0.7")
+set(PLUGIN_VERSION "0.0.0.8")

 #if you want embed vlc into FBVLC distribution:
 # 1) place vlc into FBVLC\Win\WiX\vlc-${VLC_VERSION}


translate INSTALL_RPATH to Linux

translate INSTALL_RPATH to Linux

--- Shared/CMake/JamomaUtilFunctions.cmake
+++ Shared/CMake/JamomaUtilFunctions.cmake
@@ -5,9 +5,13 @@
 	# Filename
 	set_property(TARGET ${LIBNAME}
 				 PROPERTY OUTPUT_NAME Jamoma${LIBNAME})
+    if(APPLE)
 	set_property(TARGET ${PROJECT_NAME}
 				 PROPERTY INSTALL_RPATH "@loader_path/../../../../support;@loader_path")
-
+    else(NOT WIN32)
+        set_property(TARGET ${PROJECT_NAME}
+                                 PROPERTY INSTALL_RPATH "\$ORIGIN/../support;\$ORIGIN")
+    endif()

 	# Version
 	set_property(TARGET ${LIBNAME}
@@ -112,9 +116,13 @@
 	target_link_libraries(${PROJECT_NAME} ${JAMOMA_CURRENT_LIBRARY_NAME})

 	# Rpath
+    if(APPLE)
 	set_property(TARGET ${PROJECT_NAME}
 				 PROPERTY INSTALL_RPATH "@loader_path")
-
+    elseif(NOT WIN)
+        set_property(TARGET ${PROJECT_NAME}
+                                 PROPERTY INSTALL_RPATH "\$ORIGIN")
+    endif()
 	# Install the extension
 	if(APPLE)
 		set(JAMOMA_EXTENSION_FOLDER "extensions")


window-clang.cmake: disable CRT deprecated warnings, fix release vs debug C runtime lib

--- cmake-toolchains/windows-clang.cmake
+++ cmake-toolchains/windows-clang.cmake
@@ -24,24 +24,24 @@
 set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "@")

 # C++ flags
-set(CMAKE_CXX_FLAGS "-std=c++11 -fstrict-aliasing -Wno-multichar -Wall -Wextra -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-missing-field-initializers")
+set(CMAKE_CXX_FLAGS "-std=c++11 -fstrict-aliasing -Wno-deprecated-declarations -Wno-multichar -Wall -Wextra -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-missing-field-initializers")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -D_DEBUG_ -D_DEBUG -DFIPS_DEBUG=1")

 # C flags
-set(CMAKE_C_FLAGS "-fstrict-aliasing -Wno-multichar -Wall -Wextra -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-missing-field-initializers")
+set(CMAKE_C_FLAGS "-fstrict-aliasing -Wno-deprecated-declarations -Wno-multichar -Wall -Wextra -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-missing-field-initializers")
 set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
 set(CMAKE_C_FLAGS_DEBUG "-g -O0 -D_DEBUG_ -D_DEBUG -DFIPS_DEBUG=1")

 # exe linker flags
-set(CMAKE_EXE_LINKER_FLAGS "-llibcmt")
-set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g")
+set(CMAKE_EXE_LINKER_FLAGS "")
+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-lllibcmt")
+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g -llibcmtd")

 # DLL linker flags
-set(CMAKE_SHARED_LINKER_FLAGS "-llibcmt")
-set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "")
-set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-g")
+set(CMAKE_SHARED_LINKER_FLAGS "")
+set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "-llibcmt")
+set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-g -llibcmtd")

 # exceptions on/off?
 if (NOT FIPS_EXCEPTIONS)


From D. Berzano:
add build option to control afdsmgrd builds under cmake.

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@44332 27541ba8-7e3a-0410-8455-c3a389f83636

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -55,74 +55,75 @@
   set(explicitlink_defvalue ON)
 endif()

-ROOT_BUILD_OPTION(afs OFF "AFS support, requires AFS libs and objects")
-ROOT_BUILD_OPTION(alien ON "AliEn support, requires libgapiUI from ALICE")
-ROOT_BUILD_OPTION(asimage ON "Image processing support, requires libAfterImage")
+ROOT_BUILD_OPTION(afdsmgrd OFF "Dataset manager for PROOF-based analysis facilities")
+ROOT_BUILD_OPTION(afs OFF "AFS support, requires AFS libs and objects")
+ROOT_BUILD_OPTION(alien ON "AliEn support, requires libgapiUI from ALICE")
+ROOT_BUILD_OPTION(asimage ON "Image processing support, requires libAfterImage")
 ROOT_BUILD_OPTION(astiff ON "Include tiff support in image processing")
-ROOT_BUILD_OPTION(bonjour ON "Bonjour support, requires libdns_sd and/or Avahi")
+ROOT_BUILD_OPTION(bonjour ON "Bonjour support, requires libdns_sd and/or Avahi")
 ROOT_BUILD_OPTION(builtin_afterimage OFF "Built included libAfterImage, or use system libAfterImage")
-ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
-ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
+ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
+ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
 ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
-ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
-ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
-ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
-ROOT_BUILD_OPTION(builtin_gsl OFF "Built the GSL library internally (downloading tarfile from the Web)")
-ROOT_BUILD_OPTION(builtin_cfitsio OFF "Built the FITSIO library internally (downloading tarfile from the Web)")
-ROOT_BUILD_OPTION(builtin_xrootd OFF "Built the XROOTD internally (downloading tarfile from the Web)")
-ROOT_BUILD_OPTION(castor ON "CASTOR support, requires libshift from CASTOR >= 1.5.2")
-ROOT_BUILD_OPTION(chirp ON "Chirp support (Condor remote I/O), requires libchirp_client")
-ROOT_BUILD_OPTION(cintex ON "Build the libCintex Reflex interface library")
+ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
+ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
+ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
+ROOT_BUILD_OPTION(builtin_gsl OFF "Built the GSL library internally (downloading tarfile from the Web)")
+ROOT_BUILD_OPTION(builtin_cfitsio OFF "Built the FITSIO library internally (downloading tarfile from the Web)")
+ROOT_BUILD_OPTION(builtin_xrootd OFF "Built the XROOTD internally (downloading tarfile from the Web)")
+ROOT_BUILD_OPTION(castor ON "CASTOR support, requires libshift from CASTOR >= 1.5.2")
+ROOT_BUILD_OPTION(chirp ON "Chirp support (Condor remote I/O), requires libchirp_client")
+ROOT_BUILD_OPTION(cintex ON "Build the libCintex Reflex interface library")
 ROOT_BUILD_OPTION(clarens ON "Clarens RPC support, optionally used by PROOF")
 ROOT_BUILD_OPTION(cling ON "Enable new CLING C++ interpreter")
-ROOT_BUILD_OPTION(cocoa OFF "Use native Cocoa/Quartz graphics backend (MacOS X only)")
-ROOT_BUILD_OPTION(dcache ON "dCache support, requires libdcap from DESY")
-ROOT_BUILD_OPTION(exceptions ON "Turn on compiler exception handling capability")
-ROOT_BUILD_OPTION(explicitlink ${explicitlink_defvalue} "Explicitly link with all dependent libraries")
-ROOT_BUILD_OPTION(fftw3 ON "Fast Fourier Transform support, requires libfftw3")
-ROOT_BUILD_OPTION(fitsio ON "Read images and data from FITS files, requires cfitsio")
-ROOT_BUILD_OPTION(gviz ON "Graphs visualization support, requires graphviz")
-ROOT_BUILD_OPTION(gdml OFF "GDML writer and reader")
-ROOT_BUILD_OPTION(genvector ON "Build the new libGenVector library" )
-ROOT_BUILD_OPTION(gfal ON "GFAL support, requires libgfal")
-ROOT_BUILD_OPTION(glite ON "gLite support, requires libglite-api-wrapper v.3 from GSI (https://subversion.gsi.de/trac/dgrid/wiki)")
-ROOT_BUILD_OPTION(globus OFF "Globus authentication support, requires Globus toolkit")
+ROOT_BUILD_OPTION(cocoa OFF "Use native Cocoa/Quartz graphics backend (MacOS X only)")
+ROOT_BUILD_OPTION(dcache ON "dCache support, requires libdcap from DESY")
+ROOT_BUILD_OPTION(exceptions ON "Turn on compiler exception handling capability")
+ROOT_BUILD_OPTION(explicitlink ${explicitlink_defvalue} "Explicitly link with all dependent libraries")
+ROOT_BUILD_OPTION(fftw3 ON "Fast Fourier Transform support, requires libfftw3")
+ROOT_BUILD_OPTION(fitsio ON "Read images and data from FITS files, requires cfitsio")
+ROOT_BUILD_OPTION(gviz ON "Graphs visualization support, requires graphviz")
+ROOT_BUILD_OPTION(gdml OFF "GDML writer and reader")
+ROOT_BUILD_OPTION(genvector ON "Build the new libGenVector library")
+ROOT_BUILD_OPTION(gfal ON "GFAL support, requires libgfal")
+ROOT_BUILD_OPTION(glite ON "gLite support, requires libglite-api-wrapper v.3 from GSI (https://subversion.gsi.de/trac/dgrid/wiki)")
+ROOT_BUILD_OPTION(globus OFF "Globus authentication support, requires Globus toolkit")
 ROOT_BUILD_OPTION(gsl_shared OFF "Enable linking against shared libraries for GSL (default no)")
-ROOT_BUILD_OPTION(hdfs ON "HDFS support; requires libhdfs from HDFS >= 0.19.1")
-ROOT_BUILD_OPTION(krb5 ON "Kerberos5 support, requires Kerberos libs")
-ROOT_BUILD_OPTION(ldap ON "LDAP support, requires (Open)LDAP libs")
-ROOT_BUILD_OPTION(mathmore ON "Build the new libMathMore extended math library, requires GSL (vers. >= 1.8)")
-ROOT_BUILD_OPTION(memstat ${memstat_defvalue} "A memory statistics utility, helps to detect memory leaks")
-ROOT_BUILD_OPTION(minuit2 OFF "Build the new libMinuit2 minimizer library")
-ROOT_BUILD_OPTION(monalisa ON "Monalisa monitoring support, requires libapmoncpp")
-ROOT_BUILD_OPTION(mysql ON "MySQL support, requires libmysqlclient")
-ROOT_BUILD_OPTION(odbc ON "ODBC support, requires libiodbc or libodbc")
-ROOT_BUILD_OPTION(opengl ON "OpenGL support, requires libGL and libGLU")
-ROOT_BUILD_OPTION(oracle ON "Oracle support, requires libocci")
-ROOT_BUILD_OPTION(pch ON)
-ROOT_BUILD_OPTION(peac ON "PEAC, PROOF Enabled Analysis Center, requires Clarens")
-ROOT_BUILD_OPTION(pgsql ON "PostgreSQL support, requires libpq")
-ROOT_BUILD_OPTION(pythia6 ON "Pythia6 EG support, requires libPythia6")
-ROOT_BUILD_OPTION(pythia8 ON "Pythia8 EG support, requires libPythia8")
-ROOT_BUILD_OPTION(python ON "Python ROOT bindings, requires python >= 2.2")
-ROOT_BUILD_OPTION(qt OFF "Qt graphics backend, requires libqt >= 4.x")
-ROOT_BUILD_OPTION(qtgsi OFF "GSI's Qt integration, requires libqt >= 3")
-ROOT_BUILD_OPTION(reflex ON "Build the libReflex dictionary library")
-ROOT_BUILD_OPTION(roofit OFF "Build the libRooFit advanced fitting package")
-ROOT_BUILD_OPTION(ruby OFF "Ruby ROOT bindings, requires ruby >= 1.8")
-ROOT_BUILD_OPTION(rfio ON "RFIO support, requires libshift from CASTOR >= 1.5.2")
-ROOT_BUILD_OPTION(rpath OFF "Set run-time library load path on executables and shared libraries (at installation area)")
-ROOT_BUILD_OPTION(sapdb ON "MaxDB/SapDB support, requires libsqlod and libsqlrte")
-ROOT_BUILD_OPTION(shadowpw ON "Shadow password support")
-ROOT_BUILD_OPTION(shared ON "Use shared 3rd party libraries if possible")
-ROOT_BUILD_OPTION(soversion OFF "Set version number in sonames (recommended)")
-ROOT_BUILD_OPTION(srp ON "SRP support, requires SRP source tree")
-ROOT_BUILD_OPTION(ssl ON "SSL encryption support, requires openssl")
-ROOT_BUILD_OPTION(table OFF "Build libTable contrib library")
-ROOT_BUILD_OPTION(tmva ON "Build TMVA multi variate analysis library")
-ROOT_BUILD_OPTION(unuran OFF "UNURAN - package for generating non-uniform random numbers")
-ROOT_BUILD_OPTION(winrtdebug OFF "Link against the Windows debug runtime library")
-ROOT_BUILD_OPTION(xft ON "Xft support (X11 antialiased fonts)")
+ROOT_BUILD_OPTION(hdfs ON "HDFS support; requires libhdfs from HDFS >= 0.19.1")
+ROOT_BUILD_OPTION(krb5 ON "Kerberos5 support, requires Kerberos libs")
+ROOT_BUILD_OPTION(ldap ON "LDAP support, requires (Open)LDAP libs")
+ROOT_BUILD_OPTION(mathmore ON "Build the new libMathMore extended math library, requires GSL (vers. >= 1.8)")
+ROOT_BUILD_OPTION(memstat ${memstat_defvalue} "A memory statistics utility, helps to detect memory leaks")
+ROOT_BUILD_OPTION(minuit2 OFF "Build the new libMinuit2 minimizer library")
+ROOT_BUILD_OPTION(monalisa ON "Monalisa monitoring support, requires libapmoncpp")
+ROOT_BUILD_OPTION(mysql ON "MySQL support, requires libmysqlclient")
+ROOT_BUILD_OPTION(odbc ON "ODBC support, requires libiodbc or libodbc")
+ROOT_BUILD_OPTION(opengl ON "OpenGL support, requires libGL and libGLU")
+ROOT_BUILD_OPTION(oracle ON "Oracle support, requires libocci")
+ROOT_BUILD_OPTION(pch ON)
+ROOT_BUILD_OPTION(peac ON "PEAC, PROOF Enabled Analysis Center, requires Clarens")
+ROOT_BUILD_OPTION(pgsql ON "PostgreSQL support, requires libpq")
+ROOT_BUILD_OPTION(pythia6 ON "Pythia6 EG support, requires libPythia6")
+ROOT_BUILD_OPTION(pythia8 ON "Pythia8 EG support, requires libPythia8")
+ROOT_BUILD_OPTION(python ON "Python ROOT bindings, requires python >= 2.2")
+ROOT_BUILD_OPTION(qt OFF "Qt graphics backend, requires libqt >= 4.x")
+ROOT_BUILD_OPTION(qtgsi OFF "GSI's Qt integration, requires libqt >= 3")
+ROOT_BUILD_OPTION(reflex ON "Build the libReflex dictionary library")
+ROOT_BUILD_OPTION(roofit OFF "Build the libRooFit advanced fitting package")
+ROOT_BUILD_OPTION(ruby OFF "Ruby ROOT bindings, requires ruby >= 1.8")
+ROOT_BUILD_OPTION(rfio ON "RFIO support, requires libshift from CASTOR >= 1.5.2")
+ROOT_BUILD_OPTION(rpath OFF "Set run-time library load path on executables and shared libraries (at installation area)")
+ROOT_BUILD_OPTION(sapdb ON "MaxDB/SapDB support, requires libsqlod and libsqlrte")
+ROOT_BUILD_OPTION(shadowpw ON "Shadow password support")
+ROOT_BUILD_OPTION(shared ON "Use shared 3rd party libraries if possible")
+ROOT_BUILD_OPTION(soversion OFF "Set version number in sonames (recommended)")
+ROOT_BUILD_OPTION(srp ON "SRP support, requires SRP source tree")
+ROOT_BUILD_OPTION(ssl ON "SSL encryption support, requires openssl")
+ROOT_BUILD_OPTION(table OFF "Build libTable contrib library")
+ROOT_BUILD_OPTION(tmva ON "Build TMVA multi variate analysis library")
+ROOT_BUILD_OPTION(unuran OFF "UNURAN - package for generating non-uniform random numbers")
+ROOT_BUILD_OPTION(winrtdebug OFF "Link against the Windows debug runtime library")
+ROOT_BUILD_OPTION(xft ON "Xft support (X11 antialiased fonts)")
 ROOT_BUILD_OPTION(xml ON "XML parser interface")
 ROOT_BUILD_OPTION(x11 ${x11_defvalue} "X11 support")
 ROOT_BUILD_OPTION(xrootd ON "Build xrootd file server and its client (if supported)")


Disable builtin cfitsio since it triggers failures on ARM

fitsio does not work on ARM 64bits. Reverting the activation by default
of the builtin fitsio.

--- cmake/modules/RootBuildOptions.cmake
+++ cmake/modules/RootBuildOptions.cmake
@@ -67,7 +67,7 @@
 ROOT_BUILD_OPTION(astiff ON "Include tiff support in image processing")
 ROOT_BUILD_OPTION(bonjour OFF "Bonjour support, requires libdns_sd and/or Avahi")
 ROOT_BUILD_OPTION(builtin_afterimage ON "Build included libAfterImage, or use system libAfterImage")
-ROOT_BUILD_OPTION(builtin_cfitsio ON "Build the FITSIO library internally (downloading tarfile from the Web)")
+ROOT_BUILD_OPTION(builtin_cfitsio OFF "Build the FITSIO library internally (downloading tarfile from the Web)")
 ROOT_BUILD_OPTION(builtin_davix OFF "Build the Davix library internally (downloading tarfile from the Web)")
 ROOT_BUILD_OPTION(builtin_fftw3 OFF "Build the FFTW3 library internally (downloading tarfile from the Web)")
 ROOT_BUILD_OPTION(builtin_freetype OFF "Build included libfreetype, or use system libfreetype")


Enable C along with the test language in the mini project to check whether
the test language compiler is missing or broken.  CMake-2.8.x checks
languages slightly differently if a C compiler is present so this change is
made to be consistent with how the languages are enabled for PLplot itself.
Of course, a much better solution than workaround_9220 is to fix CMake bug
9220, but that has not happened yet.

svn path=/trunk/; revision=10812

--- cmake/modules/language_support.cmake
+++ cmake/modules/language_support.cmake
@@ -9,7 +9,7 @@
 function(workaround_9220 language language_works)
   #message("DEBUG: language = ${language}")
   set(text
-    "project(test NONE)
+    "project(test C)
 # Locations where PLplot cmake build system first looks for cmake modules.
 if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
   set(CMAKE_MODULE_PATH


Handle new CMake 3.0 policy: CMP0026

Handle new CMake 3.0 policy: CMP0026

--- cmakemodules/script_init_cmake.cmake
+++ cmakemodules/script_init_cmake.cmake
@@ -1,8 +1,9 @@
-# --------------------------------------------------------------
-# Indicate CMake 2.7 and above that we don't want to mix relative
-#  and absolute paths in linker lib lists.
-# Run "cmake --help-policy CMP0003" for more information.
-# --------------------------------------------------------------
 if(COMMAND cmake_policy)
-      cmake_policy(SET CMP0003 NEW)
+	# We don't want to mix relative and absolute paths in linker lib lists.
+	cmake_policy(SET CMP0003 NEW)
+
+	# Allow using the LOCATION target property.
+	if(NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 3.0)
+		cmake_policy(SET CMP0026 OLD)
+	endif(NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 3.0)
 endif(COMMAND cmake_policy)


add doc about CMake variables for environment hooks

--- ament_cmake_core/ament_cmake_package_templates-extras.cmake
+++ ament_cmake_core/ament_cmake_package_templates-extras.cmake
@@ -43,4 +43,8 @@
 endif()

 # load extracted variables into cmake
+# for each environment hook defined in `ament_package`
+# (e.g. `library_path.bat|sh`) a CMake variable is defined starting with
+# `ament_cmake_package_templates_ENVIRONMENT_HOOK_`
+# (e.g. `ament_cmake_package_templates_ENVIRONMENT_HOOK_LIBRARY_PATH`)
 include("${_generated_file}")


Split off 7.6.40

Split off 7.6.40

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 39 )
+set ( HPCC_POINT 41 )
 set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 0 )
 ###


Split off candidate-4.0.2 branch

Split off candidate-4.0.2 branch

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

--- version.cmake
+++ version.cmake
@@ -3,10 +3,10 @@
 ###
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 4 )
-set ( HPCC_MINOR 1 )
-set ( HPCC_POINT 0 )
+set ( HPCC_MINOR 0 )
+set ( HPCC_POINT 3 )
 set ( HPCC_MATURITY "closedown" )
-set ( HPCC_SEQUENCE 1 )
+set ( HPCC_SEQUENCE 0 )
 ###
 IF ( ${HPCC_POINT} GREATER 65 )
   error ( "HPCC_POINT must be less than 66." )


[ioninja] release 3.3.2

[ioninja] release 3.3.2

[axl] release 5.3.5
[jancy] release 1.5.2

--- version.cmake
+++ version.cmake
@@ -1,6 +1,6 @@
 set (VERSION_MAJOR     1)
 set (VERSION_MINOR     5)
-set (VERSION_REVISION  1)
+set (VERSION_REVISION  2)
 set (VERSION_TAG)

 set (VERSION_FILE_SUFFIX "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
@@ -13,4 +13,4 @@
 endif ()

 set (VERSION_COMPANY   "Tibbo Technology Inc")
-set (VERSION_YEARS     "2007-2014")
+set (VERSION_YEARS     "2007-2015")


ENH: path to ${ITK_BINARY_DIR}/Code/Common is only needed when explicit instantiation is ON

--- itkIncludeDirectories.cmake
+++ itkIncludeDirectories.cmake
@@ -43,9 +43,11 @@
 )

 # For explicit instantiation.  Probably should make it ${ITK_BINARY_DIR}/Code/Common
-SET(ITK_INCLUDE_DIRS_BUILD_TREE ${ITK_INCLUDE_DIRS_BUILD_TREE}
-  ${ITK_BINARY_DIR}/Code/Common
-)
+IF(ITK_EXPLICIT_INSTANTIATION)
+  SET(ITK_INCLUDE_DIRS_BUILD_TREE ${ITK_INCLUDE_DIRS_BUILD_TREE}
+    ${ITK_BINARY_DIR}/Code/Common
+    )
+ENDIF(ITK_EXPLICIT_INSTANTIATION)

 # Directories needed when using FFTW
 IF(USE_FFTWF OR USE_FFTWD)


Correct version.cmake

Correct version.cmake

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

--- version.cmake
+++ version.cmake
@@ -1,7 +1,8 @@
 ###
 ## Version Information
 ###
-set ( HPCC_PROJECT "community" )
+set ( HPCC_NAME "Nagios Monitoring" )
+set ( HPCC_PROJECT "nagios-monitoring" )
 set ( HPCC_MAJOR 7 )
 set ( HPCC_MINOR 4 )
 set ( HPCC_POINT 0 )


Bump version number

Bump version number

--- version.cmake
+++ version.cmake
@@ -1 +1 @@
-set(LeapIPC_VERSION 0.1.0)
+set(LeapIPC_VERSION 0.1.1)


HTCONDOR-1113 Don't set rpath on test binaries on macOS.

Binaries built with condor_exe_test() go into src/condor_tests of the
build tree, not the install directory. And they aren't distributed.
Thus, there's no need to rewrite their library paths, and doing so makes
it harder to run them for their intended purpose.

--- build/cmake/macros/CondorExeTest.cmake
+++ build/cmake/macros/CondorExeTest.cmake
@@ -41,13 +41,6 @@
 		add_dependencies(${LOCAL_${_CNDR_TARGET}} condor_version_obj)
 		condor_set_link_libs( ${LOCAL_${_CNDR_TARGET}} "${_LINK_LIBS};condor_version_obj" )

-		if ( DARWIN )
-			add_custom_command( TARGET ${LOCAL_${_CNDR_TARGET}}
-				POST_BUILD
-				WORKING_DIRECTORY ${TEST_TARGET_DIR}
-				COMMAND ${CMAKE_SOURCE_DIR}/src/condor_scripts/macosx_rewrite_libs ${LOCAL_${_CNDR_TARGET}} )
-		endif()
-
 		APPEND_VAR( CONDOR_TESTS ${LOCAL_${_CNDR_TARGET}} )

 	endif(BUILD_TESTING)


Fix CMake syntax

Fix CMake syntax

--- cmake/FindCg.cmake
+++ cmake/FindCg.cmake
@@ -38,7 +38,7 @@
     )
 ELSE (APPLE)
   IF (WIN32)
-		IF (CMAKE_SIZEOF_VOID_P EQUALS 8)
+		IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
 			SET(CG_BIN_SEARCH_PATH "$ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/bin.x64")
 		ELSE()
 			SET(CG_BIN_SEARCH_PATH "$ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/bin")
@@ -66,7 +66,7 @@
       ${CG_COMPILER_DIR}
       DOC "The directory where Cg/cg.h resides"
       )
-		IF (CMAKE_SIZEOF_VOID_P EQUALS 8)
+		IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
 			SET(CG_LIB_SEARCH_PATH "$ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/lib.x64")
 		ELSE()
 			SET(CG_LIB_SEARCH_PATH "$ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/lib")


Improve generate config-public-compiler.h when using CMake (#170)

When CMake in-source build, the source directory and the binary directory are the same.

CMake set the same value for `AC_CONFIG_H_IN` and `CM_CONFIG_H_IN`.
`file(WRITE "${CM_CONFIG_H_IN}" "")` command is clear file contents so that the generated `config-public-compiler.h` is also empty.

This problem can be avoided by changing the value of `CM_CONFIG_H_IN`.

--- cmake/config.cmake
+++ cmake/config.cmake
@@ -76,7 +76,7 @@
 set(CMAKE_REQUIRED_QUIET OFF)

 set(AC_CONFIG_H_IN "${PROJECT_SOURCE_DIR}/include/pqxx/config.h.in")
-set(CM_CONFIG_H_IN "${PROJECT_BINARY_DIR}/include/pqxx/config.h.in")
+set(CM_CONFIG_H_IN "${PROJECT_BINARY_DIR}/include/pqxx/config_cmake.h.in")
 set(CM_CONFIG_PUB "${PROJECT_BINARY_DIR}/include/pqxx/config-public-compiler.h")
 set(CM_CONFIG_INT "${PROJECT_BINARY_DIR}/include/pqxx/config-internal-compiler.h")
 message(STATUS "Generating config.h")


Enable non-QUIET Python lookup

Enable non-QUIET Python lookup

Investigating AppVeyor failures (see #1165).

--- cmake/python.cmake
+++ cmake/python.cmake
@@ -1,8 +1,8 @@
 #
 # Python
 #
-find_package(PythonInterp QUIET )
-find_package(PythonLibs QUIET 2.4)
+find_package(PythonInterp)
+find_package(PythonLibs 2.4)
 set_package_properties(PythonInterp PROPERTIES TYPE REQUIRED)
 if(PYTHONLIBS_FOUND)
     set(CMAKE_REQUIRED_LIBRARIES "${PYTHON_LIBRARY}")
@@ -10,6 +10,6 @@
     add_definitions(-DHAVE_PYTHON=1)
     set(PDAL_HAVE_PYTHON 1)

-    find_package(NumPy QUIET 1.5 REQUIRED)
+    find_package(NumPy 1.5 REQUIRED)
     include_directories(SYSTEM ${NUMPY_INCLUDE_DIR})
 endif()


fix(build): Improve finding the check library on win32

--- tools/cmake/FindCheck.cmake
+++ tools/cmake/FindCheck.cmake
@@ -16,11 +16,17 @@
 #  BSD license.
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.

-
-find_package(PkgConfig REQUIRED)
-
-# Take care about check.pc settings
-PKG_SEARCH_MODULE( CHECK check )
+if(WIN32)
+  # Manually define CHECK_INSTALL_DIR if vcpkg is not used
+  if(DEFINED VCPKG_INSTALLED_DIR)
+    set(CHECK_INSTALL_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+    # find_package(check CONFIG REQUIRED)
+  endif()
+else()
+    # Take care about check.pc settings
+    find_package(PkgConfig REQUIRED)
+    PKG_SEARCH_MODULE( CHECK check )
+endif()

 # Look for CHECK include dir and libraries
 IF( NOT CHECK_FOUND )


CMake: some work on simplifying the deployment of plugins' external binaries (#966).

--- cmake/common.cmake
+++ cmake/common.cmake
@@ -770,7 +770,9 @@
                 IF(NOT "${EXTERNAL_BINARIES_DIR}" STREQUAL "")
                     FOREACH(EXTERNAL_BINARY ${EXTERNAL_BINARIES})
                         IF(WIN32)
-                            STRING(REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+                            STRING(REPLACE "^${CMAKE_SHARED_LIBRARY_PREFIX}" "${CMAKE_IMPORT_LIBRARY_PREFIX}"
+                                   IMPORT_EXTERNAL_BINARY "${EXTERNAL_BINARY}")
+                            STRING(REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}$" "${CMAKE_IMPORT_LIBRARY_SUFFIX}"
                                    IMPORT_EXTERNAL_BINARY "${EXTERNAL_BINARY}")

                             TARGET_LINK_LIBRARIES(${TEST_NAME}


Minor improvement to our common CMake file.

--- cmake/common.cmake
+++ cmake/common.cmake
@@ -313,10 +313,8 @@
     SET(PLUGIN_FILENAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PLUGIN_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})

     IF(APPLE)
-        SET(ORIG_PLUGINS_DIR ${CMAKE_BINARY_DIR}/lib)
         SET(DEST_PLUGINS_DIR ${MAC_OS_X_PROJECT_BINARY_DIR}/Contents/PlugIns/${MAIN_PROJECT_NAME})
     ELSE()
-        SET(ORIG_PLUGINS_DIR ${CMAKE_BINARY_DIR})
         SET(DEST_PLUGINS_DIR ${CMAKE_BINARY_DIR}/plugins/${MAIN_PROJECT_NAME})
     ENDIF()

@@ -326,7 +324,7 @@
     ENDIF()

     ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
-                       COMMAND ${CMAKE_COMMAND} -E copy ${ORIG_PLUGINS_DIR}/${PLUGIN_FILENAME} ${DEST_PLUGINS_DIR}/${PLUGIN_FILENAME})
+                       COMMAND ${CMAKE_COMMAND} -E copy ${LIBRARY_OUTPUT_PATH}/${PLUGIN_FILENAME} ${DEST_PLUGINS_DIR}/${PLUGIN_FILENAME})

     # Add some more definitions


Fix a typo in cmake/luajit.cmake

Fix a typo in cmake/luajit.cmake

Pass LDFLAGS flags properly to fix packaging on Debian Stretch/Sid.

Fixes #1935

--- cmake/luajit.cmake
+++ cmake/luajit.cmake
@@ -139,7 +139,7 @@
     #
     # This stuff is extremely fragile, proceed with caution.
     set (luajit_cflags ${CMAKE_C_FLAGS})
-    set (luajut_ldflags ${CMAKE_EXE_LINKER_FLAGS})
+    set (luajit_ldflags ${CMAKE_EXE_LINKER_FLAGS})
     separate_arguments(luajit_cflags)
     separate_arguments(luajit_ldflags)
     if(CC_HAS_WNO_PARENTHESES_EQUALITY)


cmake: find python3 on windows when multiarch are installed

Fixes: #24692

This commit fixes an issue where FindPython3 could wrongly select the
Python version not in environment path.

If user installed both 32 and 64 bit versions of the same Python, for
example 3.7.x, the current search would only specify that 3.7 is needed.

In some cases, FindPython3 could select the 32 bit version, even if the
64 bit version is the one on %PATH%.

This is fixed, by setting Python3_ROOT_DIR to point to the tested Python
in %PATH%.

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

--- cmake/python.cmake
+++ cmake/python.cmake
@@ -24,10 +24,18 @@
                        OUTPUT_STRIP_TRAILING_WHITESPACE)

      if(version VERSION_LESS PYTHON_MINIMUM_REQUIRED)
-       set_property (CACHE PYTHON_PREFER_EXECUTABLE PROPERTY VALUE "PYTHON_PREFER_EXECUTABLE-NOTFOUND")
+       set(PYTHON_PREFER_EXECUTABLE "PYTHON_PREFER_EXECUTABLE-NOTFOUND")
      else()
        set(PYTHON_MINIMUM_REQUIRED ${version})
        set(PYTHON_EXACT EXACT)
+       # Python3_ROOT_DIR ensures that location will be preferred by FindPython3.
+       # On Linux, this has no impact as it will usually be /usr/bin
+       # but on Windows it solve issues when both 32 and 64 bit versions are
+       # installed, as version is not enough and FindPython3 might pick the
+       # version not on %PATH%. Setting Python3_ROOT_DIR ensures we are using
+       # the version we just tested.
+       get_filename_component(PYTHON_PATH ${PYTHON_PREFER_EXECUTABLE} DIRECTORY)
+       set(Python3_ROOT_DIR ${PYTHON_PATH})
        break()
      endif()
   endif()


CMake: MARK_AS_ADVANCED some advanced vars in CppUnit detection.

--- salome_adm/cmake_files/FindSalomeCppUnit.cmake
+++ salome_adm/cmake_files/FindSalomeCppUnit.cmake
@@ -25,4 +25,4 @@
 #

 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(CppUnit CPPUNIT_INCLUDE_DIRS 1)
-MARK_AS_ADVANCED(CPPUNIT_INCLUDE_DIRS CPPUNIT_LIBRARIES)
+MARK_AS_ADVANCED(CPPUNIT_INCLUDE_DIRS CPPUNIT_LIBRARIES CPPUNIT_CONFIG_BIN CPPUNIT_SUBLIB_cppunit CPPUNIT_SUBLIB_dl)


Bump the version of CUB in cmake build.

Bump the version of CUB in cmake build.

PiperOrigin-RevId: 187244251

--- tensorflow/contrib/cmake/external/cub.cmake
+++ tensorflow/contrib/cmake/external/cub.cmake
@@ -14,8 +14,8 @@
 # ==============================================================================
 include (ExternalProject)

-set(cub_URL https://mirror.bazel.build/github.com/NVlabs/cub/archive/1.7.4.zip)
-set(cub_HASH SHA256=20a1a39fd97e5da7f40f5f2e7fd73fd2ea59f9dc4bb8a6c5f228aa543e727e31)
+set(cub_URL https://mirror.bazel.build/github.com/NVlabs/cub/archive/1.8.0.zip)
+set(cub_HASH SHA256=6bfa06ab52a650ae7ee6963143a0bbc667d6504822cbd9670369b598f18c58c3)
 set(cub_BUILD ${CMAKE_CURRENT_BINARY_DIR}/cub/src/cub)
 set(cub_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/cub/src/cub)
 set(cub_ARCHIVE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/cub_archive)


Minor fix.

Minor fix.

--- cmake/FindLibXml2.cmake
+++ cmake/FindLibXml2.cmake
@@ -65,7 +65,7 @@

 # handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if
 # all listed variables are TRUE
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2
                                   REQUIRED_VARS LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR
                                   VERSION_VAR LIBXML2_VERSION_STRING)


Added ability to skip full LL driver use using `NO_STM32LL_FULL_DRIVER`

--- cmake/FindSTM32LL.cmake
+++ cmake/FindSTM32LL.cmake
@@ -83,7 +83,9 @@

 ENDIF()

-ADD_DEFINITIONS(-DUSE_FULL_LL_DRIVER)
+IF(NOT NO_STM32LL_FULL_DRIVER)
+    ADD_DEFINITIONS(-DUSE_FULL_LL_DRIVER)
+ENDIF()

 FOREACH(cmp ${LL_REQUIRED_COMPONENTS})
 	LIST(FIND STM32LL_FIND_COMPONENTS ${cmp} STM32LL_FOUND_INDEX)


Detect tolua++ lib from the deps package.

--- cmake/FindTOLUAPP.cmake
+++ cmake/FindTOLUAPP.cmake
@@ -4,9 +4,15 @@
 include(FindPackageHandleStandardArgs)

 find_path(TOLUAPP_H_PATH NAMES tolua++.h)
-find_library(TOLUAPP_LIB NAMES tolua++5.1 tolua++)
-find_library(TOLUAPP_LIB_DBG NAMES tolua++5.1_d tolua++_d)
+find_library(TOLUAPP_LIB NAMES tolua++5.1 tolua++ toluapp PATH_SUFFIXES dynamic)
+find_library(TOLUAPP_LIB_DBG NAMES tolua++5.1_d tolua++_d toluapp_d PATH_SUFFIXES dynamic)
 mark_as_advanced(TOLUAPP_H_PATH TOLUAPP_LIB TOLUAPP_LIB_DBG)
+
+if (WIN32 OR APPLE)
+    find_library(TOLUAPP_LIB_STATIC NAMES tolua++5.1 tolua++ toluapp PATH_SUFFIXES static)
+    find_library(TOLUAPP_LIB_STATIC_DBG NAMES tolua++5.1_d tolua++_d toluapp_d PATH_SUFFIXES static)
+    mark_as_advanced(TOLUAPP_LIB_STATIC TOLUAPP_LIB_STATIC_DBG)
+endif()

 find_package_handle_standard_args(TOLUAPP DEFAULT_MSG TOLUAPP_LIB TOLUAPP_H_PATH)

@@ -18,9 +24,17 @@
     if (TOLUAPP_LIB_DBG)
         set (TOLUAPP_LIBRARIES_DBG ${TOLUAPP_LIB_DBG})
     endif()
+    if (TOLUAPP_LIB_STATIC)
+        set (TOLUAPP_LIBRARIES_STATIC ${TOLUAPP_LIB_STATIC})
+    endif()
+    if (TOLUAPP_LIB_STATIC_DBG)
+        set (TOLUAPP_LIBRARIES_STATIC_DBG ${TOLUAPP_LIB_STATIC_DBG})
+    endif()
 else()
     set (TOLUAPP_INCLUDE_DIR)
     set (TOLUAPP_LIBRARIES)
     set (TOLUAPP_LIBRARIES_DBG)
+    set (TOLUAPP_LIBRARIES_STATIC)
+    set (TOLUAPP_LIBRARIES_STATIC_DBG)
 endif()


Revert ugly fix

Revert ugly fix

--- cmake/FindTinyXML.cmake
+++ cmake/FindTinyXML.cmake
@@ -1,124 +1,74 @@
+##################################################################################################
+#
+# CMake script for finding TinyXML.
+#
+# Input variables:
+#
+# - TinyXML_ROOT_DIR (optional): When specified, header files and libraries will be searched for in
+#     ${TinyXML_ROOT_DIR}/include
+#     ${TinyXML_ROOT_DIR}/libs
+#   respectively, and the default CMake search order will be ignored. When unspecified, the default
+#   CMake search order is used.
+#   This variable can be specified either as a CMake or environment variable. If both are set,
+#   preference is given to the CMake variable.
+#   Use this variable for finding packages installed in a nonstandard location, or for enforcing
+#   that one of multiple package installations is picked up.
+#
+#
+# Cache variables (not intended to be used in CMakeLists.txt files)
+#
+# - TinyXML_INCLUDE_DIR: Absolute path to package headers.
+# - TinyXML_LIBRARY: Absolute path to library.
+#
+#
+# Output variables:
+#
+# - TinyXML_FOUND: Boolean that indicates if the package was found
+# - TinyXML_INCLUDE_DIRS: Paths to the necessary header files
+# - TinyXML_LIBRARIES: Package libraries
+#
+#
+# Example usage:
+#
+#  find_package(TinyXML)
+#  if(NOT TinyXML_FOUND)
+#    # Error handling
+#  endif()
+#  ...
+#  include_directories(${TinyXML_INCLUDE_DIRS} ...)
+#  ...
+#  target_link_libraries(my_target ${TinyXML_LIBRARIES})
+#
+##################################################################################################

+# Get package location hint from environment variable (if any)
+if(NOT TinyXML_ROOT_DIR AND DEFINED ENV{TinyXML_ROOT_DIR})
+  set(TinyXML_ROOT_DIR "$ENV{TinyXML_ROOT_DIR}" CACHE PATH
+      "TinyXML base directory location (optional, used for nonstandard installation paths)")
+endif()

-if(DEFINED __STANDARD_FIND_MODULE_INCLUDED)
-  return()
+# Search path for nonstandard package locations
+if(TinyXML_ROOT_DIR)
+  set(TinyXML_INCLUDE_PATH PATHS "${TinyXML_ROOT_DIR}/include" NO_DEFAULT_PATH)
+  set(TinyXML_LIBRARY_PATH PATHS "${TinyXML_ROOT_DIR}/lib"     NO_DEFAULT_PATH)
 endif()
-set(__STANDARD_FIND_MODULE_INCLUDED TRUE)

+# Find headers and libraries
+find_path(TinyXML_INCLUDE_DIR NAMES tinyxml.h PATH_SUFFIXES "tinyxml" ${TinyXML_INCLUDE_PATH})
+find_library(TinyXML_LIBRARY  NAMES tinyxml   PATH_SUFFIXES "tinyxml" ${TinyXML_LIBRARY_PATH})

+mark_as_advanced(TinyXML_INCLUDE_DIR
+                 TinyXML_LIBRARY)
+
+# Output variables generation
 include(FindPackageHandleStandardArgs)
-include(CMakeParseArguments)
-include(SelectLibraryConfigurations)
-include(ExtractVersion)
+find_package_handle_standard_args(TinyXML DEFAULT_MSG TinyXML_LIBRARY
+                                                      TinyXML_INCLUDE_DIR)

-macro(STANDARD_FIND_MODULE _name _pkgconfig_name)
-    string(TOUPPER ${_name} _NAME)
-    cmake_parse_arguments(_OPT_${_NAME} "NOT_REQUIRED;SKIP_CMAKE_CONFIG;SKIP_PKG_CONFIG" "" "" "${ARGN}")
+set(TinyXML_FOUND ${TINYXML_FOUND}) # Enforce case-correctness: Set appropriately cased variable...
+unset(TINYXML_FOUND) # ...and unset uppercase variable generated by find_package_handle_standard_args

-    # Try to use CMake Config file to locate the package
-    if(NOT _OPT_${_NAME}_SKIP_CMAKE_CONFIG)
-        set(_${_name}_FIND_QUIETLY ${${_name}_FIND_QUIETLY})
-        find_package(${_name} QUIET NO_MODULE)
-        set(${_name}_FIND_QUIETLY ${_${_name}_FIND_QUIETLY})
-        mark_as_advanced(${_name}_DIR)
-
-        if(${_name}_FOUND)
-            find_package_handle_standard_args(${_name} CONFIG_MODE)
-        endif()
-    endif()
-
-    if(NOT ${_name}_FOUND AND NOT _OPT_${_NAME}_SKIP_PKG_CONFIG)
-        # No CMake Config file was found. Try using PkgConfig
-        find_package(PkgConfig QUIET)
-        if(PKG_CONFIG_FOUND)
-
-            if(${_name}_FIND_VERSION)
-                if(${_name}_FIND_VERSION_EXACT)
-                    pkg_check_modules(_PC_${_NAME} QUIET ${_pkgconfig_name}=${${_name}_FIND_VERSION})
-                else(${_name}_FIND_VERSION_EXACT)
-                    pkg_check_modules(_PC_${_NAME} QUIET ${_pkgconfig_name}>=${${_name}_FIND_VERSION})
-                endif(${_name}_FIND_VERSION_EXACT)
-            else(${_name}_FIND_VERSION)
-                pkg_check_modules(_PC_${_NAME} QUIET ${_pkgconfig_name})
-            endif(${_name}_FIND_VERSION)
-
-
-            if(_PC_${_NAME}_FOUND)
-                set(${_name}_INCLUDE_DIRS ${_PC_${_NAME}_INCLUDE_DIRS} CACHE PATH "${_name} include directory")
-                set(${_name}_DEFINITIONS ${_PC_${_NAME}_CFLAGS_OTHER} CACHE STRING "Additional compiler flags for ${_name}")
-
-                set(${_name}_LIBRARIES)
-                foreach(_library IN ITEMS ${_PC_${_NAME}_LIBRARIES})
-                    string(TOUPPER ${_library} _LIBRARY)
-                    find_library(${_name}_${_LIBRARY}_LIBRARY_RELEASE
-                                 NAMES ${_library}
-                                 PATHS ${_PC_${_NAME}_LIBRARY_DIRS})
-                    list(APPEND ${_name}_LIBRARIES ${${_name}_${_LIBRARY}_LIBRARY_RELEASE})
-                    select_library_configurations(${_name}_${_LIBRARY})
-                    if(STANDARD_FIND_MODULE_DEBUG OR STANDARD_FIND_MODULE_DEBUG_${_name})
-                        message(STATUS "${_name}_${_LIBRARY}_FOUND = ${${_name}_${_LIBRARY}_FOUND}")
-                        message(STATUS "${_name}_${_LIBRARY}_LIBRARY_RELEASE = ${${_name}_${_LIBRARY}_LIBRARY_RELEASE}")
-                        message(STATUS "${_name}_${_LIBRARY}_LIBRARY_DEBUG = ${${_name}_${_LIBRARY}_LIBRARY_DEBUG}")
-                        message(STATUS "${_name}_${_LIBRARY}_LIBRARY = ${${_name}_${_LIBRARY}_LIBRARY}")
-                    endif()
-                endforeach()
-
-                set(${_name}_VERSION ${_PC_${_NAME}_VERSION})
-
-            endif(_PC_${_NAME}_FOUND)
-
-            mark_as_advanced(${_name}_INCLUDE_DIRS
-                             ${_name}_DEFINITIONS)
-
-            # If NOT_REQUIRED unset the _FIND_REQUIRED variable and save it for later
-            if(_OPT_${_NAME}_NOT_REQUIRED AND DEFINED ${_name}_FIND_REQUIRED)
-                set(_${_name}_FIND_REQUIRED ${${_name}_FIND_REQUIRED})
-                set(_${_name}_FIND_QUIETLY ${${_name}_FIND_QUIETLY})
-                unset(${_name}_FIND_REQUIRED)
-                set(${_name}_FIND_QUIETLY 1)
-            endif()
-
-            find_package_handle_standard_args(${_name} DEFAULT_MSG ${_name}_LIBRARIES)
-
-            # If NOT_REQUIRED reset the _FIND_REQUIRED variable
-            if(_OPT_${_NAME}_NOT_REQUIRED AND DEFINED _${_name}_FIND_REQUIRED)
-                set(${_name}_FIND_REQUIRED ${_${_name}_FIND_REQUIRED})
-                set(${_name}_FIND_QUIETLY ${_${_name}_FIND_QUIETLY})
-            endif()
-
-        endif()
-    endif()
-
-    # ${_name}_FOUND is uppercase after find_package_handle_standard_args
-    set(${_name}_FOUND ${${_NAME}_FOUND})
-
-    # Extract version numbers
-    if(${_name}_FOUND)
-        extract_version(${_name})
-    endif()
-
-
-    # Print some debug output if either STANDARD_FIND_MODULE_DEBUG
-    # or STANDARD_FIND_MODULE_DEBUG_${_name} is set to TRUE
-    if(STANDARD_FIND_MODULE_DEBUG OR STANDARD_FIND_MODULE_DEBUG_${_name})
-        message(STATUS "${_name}_FOUND = ${${_name}_FOUND}")
-        message(STATUS "${_name}_INCLUDE_DIRS = ${${_name}_INCLUDE_DIRS}")
-        message(STATUS "${_name}_LIBRARIES = ${${_name}_LIBRARIES}")
-        message(STATUS "${_name}_DEFINITIONS = ${${_name}_DEFINITIONS}")
-        message(STATUS "${_name}_VERSION = ${${_name}_VERSION}")
-        message(STATUS "${_name}_MAJOR_VERSION = ${${_name}_MAJOR_VERSION}")
-        message(STATUS "${_name}_MINOR_VERSION = ${${_name}_MINOR_VERSION}")
-        message(STATUS "${_name}_PATCH_VERSION = ${${_name}_PATCH_VERSION}")
-        message(STATUS "${_name}_TWEAK_VERSION = ${${_name}_TWEAK_VERSION}")
-    endif()
-
-endmacro()
-
-
-standard_find_module(TinyXML tinyxml)
-
-# Set package properties if FeatureSummary was included
-if(COMMAND set_package_properties)
-    set_package_properties(TinyXML PROPERTIES DESCRIPTION "A small, simple XML parser for the C++ language"
-                                              URL "http://www.grinninglizard.com/tinyxml/index.html")
+if(TinyXML_FOUND)
+  set(TinyXML_INCLUDE_DIRS ${TinyXML_INCLUDE_DIR})
+  set(TinyXML_LIBRARIES ${TinyXML_LIBRARY})
 endif()


Bump version to 1.3.2

Bump version to 1.3.2

Signed-off-by: Lim Siew Hoon <e412356d7e67dbdde94e841e5d46937fb9f4e623@intel.com>

--- cmake/ProjectInfo.cmake
+++ cmake/ProjectInfo.cmake
@@ -1,6 +1,6 @@
 set(GstMfx_VERSION_MAJOR   1)
 set(GstMfx_VERSION_MINOR   3)
-set(GstMfx_VERSION_PATCH   1)
+set(GstMfx_VERSION_PATCH   2)
 set(GstMfx_PACKAGE         "gstmfx")
 set(GstMfx_PACKAGE_NAME    "GStreamer Media SDK")
 set(GstMfx_PACKAGE_TARNAME "gstreamer-msdk")


ERR: Add DICOMParser include directories.

--- vtkIncludeDirectories.cmake
+++ vtkIncludeDirectories.cmake
@@ -149,7 +149,4 @@
 VTK_THIRD_PARTY_INCLUDE(PNG  png)
 VTK_THIRD_PARTY_INCLUDE(TIFF tiff)
 VTK_THIRD_PARTY_INCLUDE(EXPAT expat)
-
-IF(VTK_USE_ANSI_STDLIB)
-  VTK_THIRD_PARTY_INCLUDE(DICOMParser DICOMParser)
-ENDIF(VTK_USE_ANSI_STDLIB)
+VTK_THIRD_PARTY_INCLUDE(DICOMParser DICOMParser)


use ThriftCppLibrary.cmake from fbcode_builder

Summary:
Update fboss to use `ThriftCppLibrary.cmake` directly from fbcode_builder
rather than maintaining its own copy of this file.

Reviewed By: chadaustin

Differential Revision: D17005421

fbshipit-source-id: a64df426118df6088b47f09410dad7b8b7e79a43

--- build/fbcode_builder/CMake/ThriftCppLibrary.cmake
+++ build/fbcode_builder/CMake/ThriftCppLibrary.cmake
@@ -1,6 +1,4 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
-# NOTE: If you change this file, fbcode/fboss/github/ThriftCppLibrary.cmake also
-# needs to be changed.  TODO: this should be handled via shipit.

 include(FBCMakeParseArgs)


skip generating CATKIN_IGNORE marker file when build space equals source space (fix #459)

--- cmake/catkin_generate_environment.cmake
+++ cmake/catkin_generate_environment.cmake
@@ -5,7 +5,10 @@
   set(SETUP_DIR ${CATKIN_DEVEL_PREFIX})

   # generate empty file to prevent searching for packages in binary dir
-  file(WRITE "${CMAKE_BINARY_DIR}/CATKIN_IGNORE" "")
+  # except if source space and build space are identical (which is the case for dry eclipse projects)
+  if(NOT "${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+    file(WRITE "${CMAKE_BINARY_DIR}/CATKIN_IGNORE" "")
+  endif()

   # generate Python setup util
   configure_file(${catkin_EXTRAS_DIR}/templates/_setup_util.py.in


Add ffile-prefix-map to cflags

Add ffile-prefix-map to cflags

- ffile-prefix-map lets you replace prefixes in the __FILE__ define that
  gcc sets. In our case, replace the CMAKE_SOURCE_DIR with nothing.
- Initial impetus for this was that building in a directory with a
  really long path would cause linking failures in an M4 executable -
  path names are embedded in the output for assert, so your output size
  was dependent on the directory.
- As an added bonus, this should ensure that the strings are the same no
  matter where you build -- one step closer to proper reproducible builds.

Change-Id: I74e56bbc3f9181fd38ce03628429f3f4f725f044
GitOrigin-RevId: d15ba0da9b93acb5de4008c628f072e70f6350e5

--- cmake/toolchain-arm-none-eabi-gcc.cmake
+++ cmake/toolchain-arm-none-eabi-gcc.cmake
@@ -57,6 +57,7 @@
     "--specs=nano.specs"
     "--specs=nosys.specs"
     "-u _printf_float"
+    "-ffile-prefix-map=${CMAKE_SOURCE_DIR}="
 )
 if (VALIANT_BOARD_REVISION STREQUAL EVK)
     list(APPEND COMMON_C_FLAGS "-DBOARD_REVISION_EVK")


remove tracking external (unused)

remove tracking external (unused)

--- externals/CMakeExternals.cmake
+++ externals/CMakeExternals.cmake
@@ -72,38 +72,6 @@
       PROJECT IceT
       LIBRARY ${ICET_MPI_LIB})

-  # tracking
-  elseif (NAME STREQUAL "tracking")
-    if (TARGET tracking)
-      return()
-    endif ()
-
-    if (NOT WIN32)
-      message(WARNING "External 'tracking' requested, but not available on non-Windows systems")
-    endif ()
-
-    set(TRACKING_LIB "lib/tracking.lib")
-    set(TRACKING_NATNET_LIB "lib/NatNetLib.lib")
-
-    add_external_project(tracking STATIC
-      GIT_REPOSITORY https://github.com/UniStuttgart-VISUS/mm-tracking.git
-      GIT_TAG "v2.0"
-      BUILD_BYPRODUCTS
-        "<INSTALL_DIR>/${TRACKING_LIB}"
-        "<INSTALL_DIR>/${TRACKING_NATNET_LIB}"
-      CMAKE_ARGS
-        -DCREATE_TRACKING_TEST_PROGRAM=OFF)
-
-    add_external_library(tracking
-      LIBRARY ${TRACKING_LIB})
-
-    add_external_library(natnet
-      PROJECT tracking
-      LIBRARY ${TRACKING_NATNET_LIB})
-
-    external_get_property(tracking SOURCE_DIR)
-    set(tracking_files "${SOURCE_DIR}/tracking/conf/tracking.conf" PARENT_SCOPE)
-
   # vr interop mwk-mint
   elseif(NAME STREQUAL "mwk-mint")
     if(TARGET mwk-mint)


Grammar in doc

Grammar in doc

--- conan.cmake
+++ conan.cmake
@@ -537,7 +537,7 @@

 function(conan_add_remote)
     # Adds a remote
-    # Arguments URL and NAME are required, INDEX and COMMAND is optional
+    # Arguments URL and NAME are required, INDEX and COMMAND are optional
     # Example usage:
     #    conan_add_remote(NAME bincrafters INDEX 1
     #       URL https://api.bintray.com/conan/bincrafters/public-conan)


Update DeployQt4.

Update DeployQt4.

--- cmake/DeployQt4.cmake
+++ cmake/DeployQt4.cmake
@@ -3,20 +3,24 @@
 # Qt4 applications.
 #
 # The following functions are provided by this module:
+#   write_qt4_conf
 #   fixup_qt4_bundle
 #   install_qt4_app
 # Requires CMake 2.6 or greater and depends on BundleUtilities.cmake.
 #
-#  FIXUP_QT4_BUNDLE(<app> <qtplugins> [<libs> <dirs> <plugins_dir>])
+#  WRITE_QT4_CONF(<qt_conf_dir> <qt_conf_contents>)
+# Writes a qt.conf file with the given contents into the given directory.
+#
+#  FIXUP_QT4_BUNDLE(<app> [<qtplugins> <libs> <dirs> <plugins_dir>])
 # Copies Qt plugins, writes a Qt configuration file (if needed) and fixes up a
 # Qt4 executable using BundleUtilities.
 #
-#  INSTALL_QT4_APP(<executable> <qtplugins> [<libs> <dirs> <plugins_dir>])
+#  INSTALL_QT4_APP(<executable> <qtplugins> [<libs> <dirs> <plugins_dir> <request_qt_conf])
 # Installs plugins, writes a Qt configuration file (if needed) and fixes up a
 # Qt4 executable using BundleUtilties.

 #=============================================================================
-# Copyright 2011 KDAB
+# Copyright 2011 Mike McQuaid <mike@mikemcquaid.com>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -25,115 +29,145 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the License for more information.
 #=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)

 # The functions defined in this file depend on the fixup_bundle function
 # (and possibly others) found in BundleUtilities.cmake
 #
-get_filename_component(DeployQt4_cmake_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+#get_filename_component(DeployQt4_cmake_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+#include("${DeployQt4_cmake_dir}/BundleUtilities.cmake")
 include(BundleUtilities)

+function(write_qt4_conf qt_conf_dir qt_conf_contents)
+	set(qt_conf_path "${qt_conf_dir}/qt.conf")
+	message(STATUS "Writing ${qt_conf_path}")
+	file(WRITE "${qt_conf_path}" "${qt_conf_contents}")
+endfunction(write_qt4_conf)
+
+
 function(fixup_qt4_bundle app qtplugins)
-    set(libs ${ARGV2})
-    set(dirs ${ARGV3})
-    set(plugins_dir ${ARGV4})
+	set(libs ${ARGV2})
+	set(dirs ${ARGV3})
+	set(plugins_dir ${ARGV4})
+	set(request_qt_conf ${ARGV5})

-    message(STATUS "fixup_qt4_bundle")
-    message(STATUS "  app='${app}'")
-    message(STATUS "  qtplugins='${qtplugins}'")
-    message(STATUS "  libs='${libs}'")
-    message(STATUS "  dirs='${dirs}'")
-    message(STATUS "  plugins_dir='${plugins_dir}'")
+	message(STATUS "fixup_qt4_bundle")
+	message(STATUS "  app='${app}'")
+	message(STATUS "  qtplugins='${qtplugins}'")
+	message(STATUS "  libs='${libs}'")
+	message(STATUS "  dirs='${dirs}'")
+	message(STATUS "  plugins_dir='${plugins_dir}'")
+	message(STATUS "  request_qt_conf='${request_qt_conf}'")

-    if(QT_LIBRARY_DIR)
-        list(APPEND dirs "${QT_LIBRARY_DIR}")
-    endif()
+	if(QT_LIBRARY_DIR)
+		list(APPEND dirs "${QT_LIBRARY_DIR}")
+	endif()

-    if(APPLE)
-        if(NOT plugins_dir)
-            set(plugins_dir "PlugIns")
-        endif()
-        set(plugins_path "${app}/Contents/${plugins_dir}")
-        set(qt_conf_dir "${app}/Contents/Resources")
-        set(write_qt_conf 1)
-    else()
-        if(NOT plugins_dir)
-            set(plugins_dir "plugins")
-        endif()
-        set(plugins_dir ${plugin_inst_dir})
-        get_filename_component(app_path "${app}" PATH)
-        set(plugins_path "${app_path}/${plugins_dir}")
-        set(qt_conf_dir "")
-        set(write_qt_conf 0)
-    endif()
+	if(APPLE)
+		if(NOT plugins_dir)
+			set(plugins_dir "PlugIns")
+		endif()
+		set(plugins_path "${app}/Contents/${plugins_dir}")
+		set(qt_conf_dir "${app}/Contents/Resources")
+		set(write_qt_conf TRUE)
+	else()
+		if(NOT plugins_dir)
+			set(plugins_dir "plugins")
+		endif()
+		set(plugins_dir ${plugin_inst_dir})
+		get_filename_component(app_path "${app}" PATH)
+		set(plugins_path "${app_path}/${plugins_dir}")
+		set(qt_conf_dir "")
+		set(write_qt_conf ${request_qt_conf})
+	endif()

-    foreach(plugin ${qtplugins})
-        if(EXISTS "${plugin}")
-            set(plugin_group "")
+	foreach(plugin ${qtplugins})
+		if(EXISTS "${plugin}")
+			set(plugin_group "")

-            get_filename_component(plugin_path "${plugin}" PATH)
-            get_filename_component(plugin_parent_path "${plugin_path}" PATH)
-            get_filename_component(plugin_parent_dir_name "${plugin_parent_path}" NAME)
-            get_filename_component(plugin_name "${plugin}" NAME)
-            string(TOLOWER "${plugin_parent_dir_name}" plugin_parent_dir_name)
+			get_filename_component(plugin_path "${plugin}" PATH)
+			get_filename_component(plugin_parent_path "${plugin_path}" PATH)
+			get_filename_component(plugin_parent_dir_name "${plugin_parent_path}" NAME)
+			get_filename_component(plugin_name "${plugin}" NAME)
+			string(TOLOWER "${plugin_parent_dir_name}" plugin_parent_dir_name)

-            if("${plugin_parent_dir_name}" STREQUAL "plugins")
-                get_filename_component(plugin_group "${plugin_path}" NAME)
-                message(STATUS "Matched ${plugin_name} to plugin group ${plugin_group}")
-            endif()
+			if("${plugin_parent_dir_name}" STREQUAL "plugins")
+				get_filename_component(plugin_group "${plugin_path}" NAME)
+				message(STATUS "Matched ${plugin_name} to plugin group ${plugin_group}")
+			endif()

-            set(plugin_path "${plugins_path}/${plugin_group}")
-            message(STATUS "Copying ${plugin_name} to ${plugin_path}")
-            file(MAKE_DIRECTORY "${plugin_path}")
-            file(COPY "${plugin}" DESTINATION "${plugin_path}")
+			set(plugin_path "${plugins_path}/${plugin_group}")
+			message(STATUS "Copying ${plugin_name} to ${plugin_path}")
+			file(MAKE_DIRECTORY "${plugin_path}")
+			file(COPY "${plugin}" DESTINATION "${plugin_path}")

-            list(APPEND libs "${plugin_path}/${plugin_name}")
-        else()
-            message(FATAL_ERROR "Plugin ${plugin} not found")
-        endif()
-    endforeach()
+			list(APPEND libs "${plugin_path}/${plugin_name}")
+		else()
+			message(FATAL_ERROR "Plugin ${plugin} not found")
+		endif()
+	endforeach()

-    if(qtplugins AND write_qt_conf)
-        set(qt_conf_path "${qt_conf_dir}/qt.conf")
-        set(qt_conf_contents "[Paths]\nPlugins = ${plugins_dir}")
-        message(STATUS "Writing to ${qt_conf_dir}/qt.conf:\n${qt_conf_contents}")
-        file(WRITE "${qt_conf_path}" "${qt_conf_contents}")
-    endif()
+	if(qtplugins AND write_qt_conf)
+		set(qt_conf_contents "[Paths]\nPlugins = ${plugins_dir}")
+		write_qt4_conf("${qt_conf_dir}" "${qt_conf_contents}")
+	endif()

-    fixup_bundle("${app}" "${libs}" "${dirs}")
+	fixup_bundle("${app}" "${libs}" "${dirs}")
 endfunction(fixup_qt4_bundle)

-function(install_qt4_app executable qtplugins)
-    set(libs ${ARGV2})
-    set(dirs ${ARGV3})
-    set(plugins_dir ${ARGV4})
-    if(QT_LIBRARY_DIR)
-        list(APPEND dirs "${QT_LIBRARY_DIR}")
-    endif()

-    get_filename_component(executable_absolute "${executable}" ABSOLUTE)
-    gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY}" qtcore_type)
-    if(qtcore_type STREQUAL "system")
-        set(qt_plugins_dir "")
-    endif()
+function(install_qt4_app executable)
+	set(qtplugins ${ARGV1})
+	set(libs ${ARGV2})
+	set(dirs ${ARGV3})
+	set(plugins_dir ${ARGV4})
+	if(QT_LIBRARY_DIR)
+		list(APPEND dirs "${QT_LIBRARY_DIR}")
+	endif()

-    foreach(plugin ${qtplugins})
-        string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var)
-        if(NOT "${plugin}" AND EXISTS "${${plugin_var}_RELEASE}")
-            set(plugin "${${plugin_var}_RELEASE}")
-        elseif(NOT "${plugin}" AND EXISTS "${plugin_var}_DEBUG")
-            set(plugin "${${plugin_var}_DEBUG}")
-        endif()
+	get_filename_component(executable_absolute "${executable}" ABSOLUTE)
+	gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY}" qtcore_type)
+	if(qtcore_type STREQUAL "system")
+		set(qt_plugins_dir "")
+	endif()

-        if(NOT EXISTS "${plugin}")
-            message(FATAL_ERROR "Plugin ${plugin} not found")
-        endif()
+	if(NOT qtplugins AND QT_LIBRARIES_PLUGINS)
+		set(qtplugins_default TRUE)
+		set(qtplugins "${QT_LIBRARIES_PLUGINS}")
+	endif()
+
+	foreach(plugin ${qtplugins})
+		if(NOT EXISTS "${plugin}")
+			string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var)
+			set(release_regex "Release|RelWithDebInfo|MinSizeRel")
+			if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+				if(CMAKE_CONFIGURATION_TYPES MATCHES "${release_regex}" OR CMAKE_BUILD_TYPE MATCHES "${release_regex}")
+					set(plugin_var "${plugin_var}_RELEASE")
+				endif()
+				if(CMAKE_CONFIGURATION_TYPES MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "Debug")
+					set(plugin_var "${plugin_var}_DEBUG")
+				endif()
+			else()
+				set(plugin_var "${plugin_var}_RELEASE")
+			endif()

-        list(APPEND "${plugin}" qtplugins_paths)
-    endforeach()
+			set(plugin_path "${${plugin_var}}")
+			if(NOT EXISTS "${plugin_path}" AND NOT qtplugins_default)
+				message(FATAL_ERROR "${plugin} plugin requested but ${plugin_var} does not exist")
+			endif()
+		else()
+			set(plugin_path "${plugin}")
+		endif()

-    install(CODE
-" INCLUDE( \"${CMAKE_MODULE_PATH}/DeployQt4.cmake\" )
-  SET( BU_CHMOD_BUNDLE_ITEMS TRUE )
-  FIXUP_QT4_BUNDLE( \"\${CMAKE_INSTALL_PREFIX}/${executable}\" \"${qtplugins_paths}\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" ) "
-    )
+		if(EXISTS "${plugin_path}")
+			list(APPEND qtplugins_paths "${plugin_path}")
+		endif()
+	endforeach()
+
+	install(CODE
+		" INCLUDE( \"${CMAKE_ROOT}/Modules/DeployQt4.cmake\" )
+		SET( BU_CHMOD_BUNDLE_ITEMS TRUE )
+		FIXUP_QT4_BUNDLE( \"\${CMAKE_INSTALL_PREFIX}/${executable}\" \"${qtplugins_paths}\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" ) "
+	)
 endfunction(install_qt4_app)


upgrade to glfw 3.1.1

upgrade to glfw 3.1.1

--- cmake/EmbedGlfw.cmake
+++ cmake/EmbedGlfw.cmake
@@ -11,8 +11,8 @@

 ExternalProject_Add(
   project_glfw
-  URL https://github.com/glfw/glfw/archive/3.1.zip
-  URL_MD5 8493932ac9db71351e5f3753ce654f0c
+  URL https://github.com/glfw/glfw/archive/3.1.1.zip
+  URL_MD5 cce362cc9e46883d2d7b6669ca2e02c6
   PREFIX "${CMAKE_CURRENT_BINARY_DIR}/glfw"
   CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_DOCS=0 -DGLFW_BUILD_EXAMPLES=0 -DGLFW_BUILD_TESTS=0 -DGLFW_INSTALL=0 ${GLFW_ADDITIONAL_CMAKE_ARGS}
   INSTALL_COMMAND ""


Modification de CEGUI pour windows

Modification de CEGUI pour windows

--- cmake/FindCEGUI.cmake
+++ cmake/FindCEGUI.cmake
@@ -33,49 +33,37 @@
     FIND_LIBRARY(${MYLIBRARIES}
         NAMES ${MYLIBRARIESNAMES}
         PATHS
+        #Windows
+        $ENV{CEGUI_DIR}
         $ENV{CEGUI_DIR}/lib
-        $ENV{CEGUI_DIR}
-        $ENV{CEGUIDIR}/lib
-        $ENV{CEGUIDIR}
+        $ENV{CEGUI_ROOT}
         $ENV{CEGUI_ROOT}/lib
         $ENV{CEGUI_HOME}
         $ENV{CEGUI_HOME}/lib
-        ${DELTA3D_EXT_DIR}/lib
-        $ENV{DELTA_ROOT}/ext/lib
-        ~/LIBRARIES/Frameworks
-        /LIBRARIES/Frameworks
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;CEGUI_ROOT]/lib
+        #Linux
         /usr/local/lib
         /usr/lib
-        /usr/lib/cegui-0.7.1
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
         /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;CEGUI_ROOT]/lib
-        /usr/freeware/lib64
     )
 ENDMACRO(FIND_CEGUI_LIBRARIES LIBRARIES LIBRARIESNAME)

-FIND_PATH(CEGUI_INCLUDE_DIR
-CEGUI
-PATHS
-$ENV{CEGUI_DIR}
-$ENV{CEGUI_DIR}/include
-$ENV{CEGUIDIR}
-$ENV{CEGUIDIR}/include
-$ENV{CEGUI_ROOT}
-$ENV{CEGUI_ROOT}/include
-$ENV{CEGUI_ROOT}/cegui/include
-$ENV{CEGUI_HOME}
-$ENV{CEGUI_HOME}/include
-/usr/local/include
-/usr/include
-/sw/include
-/opt/local/include
-/opt/csw/include
-/opt/include
-PATH_SUFFIXES cegui CEGUI
+FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
+    PATHS
+    #Windows
+	$ENV{CEGUI_HOME}
+	$ENV{CEGUI_HOME}/include
+	$ENV{CEGUI_DIR}
+	$ENV{CEGUI_DIR}/cegui/include
+	$ENV{CEGUI_ROOT}
+	$ENV{CEGUI_ROOT}/cegui/include
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;CEGUI_ROOT]/cegui/include
+    #Linux
+    /usr/local/include/CEGUI
+    /usr/include/CEGUI
+    /opt/include/CEGUI
 )
+

 SET(CEGUIList CEGUIBase CEGUI)
 FIND_CEGUI_LIBRARIES(CEGUI_LIBRARIES "${CEGUIList}")
@@ -111,7 +99,6 @@
 FIND_CEGUI_LIBRARIES(CEGUI_EXPAT_LIBRARIES "${CEGUIExpatList}")

-
 #Debug
 FIND_CEGUI_LIBRARIES(CEGUI_LIBRARIES_DEBUG CEGUIBase_d)
 FIND_CEGUI_LIBRARIES(CEGUI_OPENGL_LIBRARIES_DEBUG OpenGLGUIRenderer_d)
@@ -120,22 +107,21 @@
 MESSAGE(STATUS "Looking for CEGUI...")
 IF(CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR)
 	SET(CEGUI_FOUND "YES")
-	SET(CEGUI_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI")
 	MESSAGE(STATUS "Found CEGUI: ${CEGUI_LIBRARIES}")

 	IF(CEGUI_OGRE_LIBRARIES)
 		MESSAGE(STATUS "-- Found CEGUI Ogre Renderer: ${CEGUI_OGRE_LIBRARIES}")
-		SET(CEGUI_OGRE_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI/RendererModules/Ogre")
+		SET(CEGUI_OGRE_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/RendererModules/Ogre")
 	ENDIF(CEGUI_OGRE_LIBRARIES)

 	IF(CEGUI_OPENGL_LIBRARIES)
 		MESSAGE(STATUS "-- Found CEGUI OpenGL Renderer: ${CEGUI_OGRE_LIBRARIES}")
-		SET(CEGUI_OPENGL_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI/RendererModules/OpenGL")
+		SET(CEGUI_OPENGL_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/RendererModules/OpenGL")
 	ENDIF(CEGUI_OPENGL_LIBRARIES)

 	IF(CEGUI_FALAGARD_LIBRARIES)
 		MESSAGE(STATUS "-- Found CEGUI Falagard: ${CEGUI_FALAGARD_LIBRARIES}")
-		SET(CEGUI_FALAGARD_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI/falagard")
+		SET(CEGUI_FALAGARD_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/falagard")
 	ENDIF(CEGUI_FALAGARD_LIBRARIES)

 	IF(CEGUI_SAMPLEHELPER_LIBRARIES)
@@ -144,32 +130,32 @@

 	IF(CEGUI_IMAGECODEC_FREEIMAGE_LIBRARIES)
 		MESSAGE(STATUS "-- Found CEGUI FreeImage ImageCodec: ${CEGUI_IMAGECODEC_FREEIMAGE_LIBRARIES}")
-		SET(CEGUI_IMAGECODEC_FREEIMAGE_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI/ImageCodecModules/FreeImageImageCodec")
+		SET(CEGUI_IMAGECODEC_FREEIMAGE_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/ImageCodecModules/FreeImageImageCodec")
 	ENDIF(CEGUI_IMAGECODEC_FREEIMAGE_LIBRARIES)

 	IF(CEGUI_IMAGECODEC_SILLY_LIBRARIES)
 		MESSAGE(STATUS "-- Found CEGUI SILLY ImageCodec: ${CEGUI_IMAGECODEC_SILLY_LIBRARIES}")
-		SET(CEGUI_IMAGECODEC_SILLY_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI/ImageCodecModules/SILLYImageCodec")
+		SET(CEGUI_IMAGECODEC_SILLY_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/ImageCodecModules/SILLYImageCodec")
 	ENDIF(CEGUI_IMAGECODEC_SILLY_LIBRARIES)

 	IF(CEGUI_IMAGECODEC_STB_LIBRARIES)
 		MESSAGE(STATUS "-- Found CEGUI STB ImageCodec: ${CEGUI_IMAGECODEC_STB_LIBRARIES}")
-		SET(CEGUI_IMAGECODEC_STB_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI/ImageCodecModules/STBImageCodec")
+		SET(CEGUI_IMAGECODEC_STB_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/ImageCodecModules/STBImageCodec")
 	ENDIF(CEGUI_IMAGECODEC_STB_LIBRARIES)

 	IF(CEGUI_IMAGECODEC_TGA_LIBRARIES)
 		MESSAGE(STATUS "-- Found CEGUI TGA ImageCodec: ${CEGUI_IMAGECODEC_TGA_LIBRARIES}")
-		SET(CEGUI_IMAGECODEC_TGA_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI/ImageCodecModules/TGAImageCodec")
+		SET(CEGUI_IMAGECODEC_TGA_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/ImageCodecModules/TGAImageCodec")
 	ENDIF(CEGUI_IMAGECODEC_TGA_LIBRARIES)

 	IF(CEGUI_TINYXML_LIBRARIES)
 		MESSAGE(STATUS "-- Found CEGUI TinyXML Parser: ${CEGUI_TINYXML_LIBRARIES}")
-		SET(CEGUI_TINYXML_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI/XMLParserModules/TinyXMLParser")
+		SET(CEGUI_TINYXML_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/XMLParserModules/TinyXMLParser")
 	ENDIF(CEGUI_TINYXML_LIBRARIES)

 	IF(CEGUI_EXPAT_LIBRARIES)
 		MESSAGE(STATUS "-- Found CEGUI Expat Parser: ${CEGUI_EXPAT_LIBRARIES}")
-		SET(CEGUI_EXPAT_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/CEGUI/XMLParserModules/ExpatParser")
+		SET(CEGUI_EXPAT_INCLUDE_DIR "${CEGUI_INCLUDE_DIR}/XMLParserModules/ExpatParser")
 	ENDIF(CEGUI_EXPAT_LIBRARIES)