modules: updated FindCorrade.cmake.

modules: updated FindCorrade.cmake.

--- modules/FindCorrade.cmake
+++ modules/FindCorrade.cmake
@@ -41,7 +41,8 @@
 #  CORRADE_BUILD_STATIC         - Defined if compiled as static libraries
 #  CORRADE_TARGET_UNIX          - Defined if compiled for some Unix flavor
 #   (Linux, BSD, OS X)
-#  CORRADE_TARGET_APPLE         - Defined if compiled for OS X
+#  CORRADE_TARGET_APPLE         - Defined if compiled for Apple platforms
+#  CORRADE_TARGET_IOS           - Defined if compiled for iOS
 #  CORRADE_TARGET_WINDOWS       - Defined if compiled for Windows
 #  CORRADE_TARGET_WINDOWS_RT    - Defined if compiled for Windows RT
 #  CORRADE_TARGET_NACL          - Defined if compiled for Google Chrome
@@ -211,6 +212,7 @@
     BUILD_STATIC
     TARGET_UNIX
     TARGET_APPLE
+    TARGET_IOS
     TARGET_WINDOWS
     TARGET_WINDOWS_RT
     TARGET_NACL


Changed access to maven_libraries.cmake and pip_libraries.cmake to allow using GooglifyCMake as a submodule in another project

--- ThirdPartyLibraries.cmake
+++ ThirdPartyLibraries.cmake
@@ -7,8 +7,9 @@
 set(BOOST_TIME_ZONE_CSV "" CACHE STRING "Boost time zone csv datafile")

+set(SUPPORT_DIR ${CMAKE_CURRENT_LIST_DIR}/support)
 set(THIRD_PARTY_BINARY_DIR ${PROJECT_BINARY_DIR}/third_party)
-set(THIRD_PARTY_SOURCE_DIR ${PROJECT_SOURCE_DIR}/third_party)
+set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/third_party)

 # Escaping architectures.
@@ -64,8 +65,8 @@
   message(FATAL_ERROR "Please install SVN available at http://subversion.apache.org/.")
 endif ()

-set(SET_INSTALL_NAMES "${PROJECT_SOURCE_DIR}/support/set_install_names.sh")
-set(CREATE_FAT_LIBS "${PROJECT_SOURCE_DIR}/support/create_fat_libs.sh")
+set(SET_INSTALL_NAMES "${SUPPORT_DIR}/set_install_names.sh")
+set(CREATE_FAT_LIBS "${SUPPORT_DIR}/create_fat_libs.sh")

 # A few convenient functions to define third-party libraries.
 function(set_prefix OUT PREFIX)
@@ -1540,12 +1541,12 @@
 set(MAVEN_CLASSPATH_UPDATE "${THIRD_PARTY_BINARY_DIR}/java/classpath_update")
 add_custom_command(
   OUTPUT ${MAVEN_LAST_DOWNLOAD}
-  COMMAND ${MVN} -f ${PROJECT_SOURCE_DIR}/third_party/pom.xml
+  COMMAND ${MVN} -f ${THIRD_PARTY_SOURCE_DIR}/pom.xml
       -q dependency:copy-dependencies
   COMMAND date > ${MAVEN_LAST_DOWNLOAD}
-  MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/third_party/pom.xml)
+  MAIN_DEPENDENCY ${THIRD_PARTY_SOURCE_DIR}/pom.xml)
 set(GENERATE_CLASSPATH_FOR_MAVEN_LIBS
-    ${PROJECT_SOURCE_DIR}/support/generate_classpath_for_maven_libs.py)
+    ${SUPPORT_DIR}/generate_classpath_for_maven_libs.py)
 add_custom_command(
   OUTPUT ${MAVEN_CLASSPATH_UPDATE}
   COMMAND ${GENERATE_CLASSPATH_FOR_MAVEN_LIBS} "${MVN}"
@@ -2439,5 +2440,5 @@
 ################################################################################
 # External dependency management.
 ################################################################################
-include(${PROJECT_SOURCE_DIR}/third_party/maven_libraries.cmake)
-include(${PROJECT_SOURCE_DIR}/third_party/pip_libraries.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/third_party/maven_libraries.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/third_party/pip_libraries.cmake)


fix: basis_get_target_location of script targets for MSVS and Xcode [BASIS]

--- CMake/Basis/CommonTools.cmake
+++ CMake/Basis/CommonTools.cmake
@@ -3464,6 +3464,20 @@
           get_target_property (DIRECTORY ${TARGET_UID} INSTALL_DIRECTORY)
         else ()
           get_target_property (DIRECTORY ${TARGET_UID} OUTPUT_DIRECTORY)
+          if (DIRECTORY AND CMAKE_GENERATOR MATCHES "Visual Studio|Xcode")
+            set (DIRECTORY "${DIRECTORY}/$<CONFIGURATION>")
+          endif ()
+        endif ()
+        get_target_property (FNAME ${TARGET_UID} OUTPUT_NAME)
+      elseif (TYPE STREQUAL "^SCRIPT_MODULE$")
+        if (PART MATCHES "POST_INSTALL")
+          get_target_property (DIRECTORY ${TARGET_UID} INSTALL_DIRECTORY)
+        else ()
+          get_target_property (COMPILE   ${TARGET_UID} COMPILE)
+          get_target_property (DIRECTORY ${TARGET_UID} OUTPUT_DIRECTORY)
+          if (DIRECTORY AND (COMPILE OR CMAKE_GENERATOR MATCHES "Visual Studio|Xcode"))
+            set (DIRECTORY "${DIRECTORY}/$<CONFIGURATION>")
+          endif ()
         endif ()
         get_target_property (FNAME ${TARGET_UID} OUTPUT_NAME)
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Closer to compiling with Clang

Closer to compiling with Clang

Summary:
This brings us closer to being able to compile the open
source version of Folly with Clang. There are a few other
open pull requests that need to be addressed to allow us to
compile on Clang without any warnings that aren't already
explicitly disabled. See pull requests #745 and #756.

Closes https://github.com/facebook/folly/pull/772

Reviewed By: simpkins

Differential Revision: D7021595

Pulled By: yfeldblum

fbshipit-source-id: 350b972c74502ca2bc147f21428c622b19805b89

--- CMake/FollyCompilerUnix.cmake
+++ CMake/FollyCompilerUnix.cmake
@@ -11,7 +11,7 @@
       "FOLLY_XLOG_STRIP_PREFIXES=\"${FOLLY_DIR_PREFIXES}\""
   )
   target_compile_options(${THETARGET}
-    PUBLIC
+    PRIVATE
       -g
       -std=gnu++14
       -finput-charset=UTF-8
@@ -23,6 +23,7 @@
       -Wno-error=deprecated-declarations
       -Wno-sign-compare
       -Wno-unused
+      -Wno-inconsistent-missing-override
       -Wunused-label
       -Wunused-result
       -Wnon-virtual-dtor


CMake: another OSX fix for FindOgre

CMake: another OSX fix for FindOgre

--- CMake/Packages/FindOGRE.cmake
+++ CMake/Packages/FindOGRE.cmake
@@ -406,7 +406,7 @@
   # find link libraries for plugins
   set(OGRE_${PLUGIN}_LIBRARY_NAMES "${PLUGIN}${OGRE_LIB_SUFFIX}")
   get_debug_names(OGRE_${PLUGIN}_LIBRARY_NAMES)
-  set(OGRE_${PLUGIN}_LIBRARY_FWK ${OGRE_LIBRARY_FWK})
+  #set(OGRE_${PLUGIN}_LIBRARY_FWK ${OGRE_LIBRARY_FWK})
   find_library(OGRE_${PLUGIN}_LIBRARY_REL NAMES ${OGRE_${PLUGIN}_LIBRARY_NAMES}
     HINTS "${OGRE_BUILD}/lib" ${OGRE_LIBRARY_DIRS} PATH_SUFFIXES "" OGRE opt release release/opt relwithdebinfo relwithdebinfo/opt minsizerel minsizerel/opt)
   find_library(OGRE_${PLUGIN}_LIBRARY_DBG NAMES ${OGRE_${PLUGIN}_LIBRARY_NAMES_DBG}


New Revision tag 4a49a318

New Revision tag 4a49a318

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

 if(BUILD_TESTING)

-  set(revision_tag c33a2097)
+  set(revision_tag 4a49a318)
 #                  ^^^^^^^^  these are just to check correct length of hash part

   ExternalProject_Add(${proj}


Removed FindOpenAL.cmake as it is provided

--- modules/CMakeModules/FindOpenAL.cmake
+++ modules/CMakeModules/FindOpenAL.cmake
@@ -1,20 +0,0 @@
-FIND_PATH(OPENAL_INCLUDE_DIR AL)
-
-FIND_LIBRARY(OPENAL_LIBRARY NAMES openal OpenAL32)
-IF(NOT OPENAL_LIBRARY)
-    MESSAGE(SEND_ERROR "OpenAL not found")
-ENDIF(NOT OPENAL_LIBRARY)
-
-IF(OPENAL_INCLUDE_DIR AND OPENAL_LIBRARY)
-   SET(OPENAL_FOUND TRUE)
-ENDIF(OPENAL_INCLUDE_DIR AND OPENAL_LIBRARY)
-
-IF(OPENAL_FOUND)
-   IF (NOT OpenAL_FIND_QUIETLY)
-      MESSAGE(STATUS "Found OpenAL: ${OPENAL_LIBRARY}")
-   ENDIF (NOT OpenAL_FIND_QUIETLY)
-ELSE(OPENAL_FOUND)
-   IF (OpenAL_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find OpenAL")
-   ENDIF (OpenAL_FIND_REQUIRED)
-ENDIF(OPENAL_FOUND)


[perftest][cmake] Standardize on using ${source} instead of ${srcdir}/${module_name_path}.swift.

This is an intermediate commit in a series of commits towards being able to
build the perf test suite from *.sib files.

Doing so will enable us to:

1. Stress the serialization pipeline.
2. Provide an interesting test case for verifying that executables compiled
from *.sib yield the same object files as if we compiled directly to *.o files.

Keep in mind this is a longer term effort that I am doing on the side.

--- benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
+++ benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
@@ -107,7 +107,7 @@
           "-module-name" "${module_name}"
           "-emit-sib"
           "-o" "${sibfile}"
-          "${srcdir}/${module_name_path}.swift" ${extra_sources})
+          "${source}" ${extra_sources})
     endif()
   endforeach()

@@ -116,6 +116,7 @@

     set(objfile "${objdir}/${module_name}.o")
     set(swiftmodule "${objdir}/${module_name}.swiftmodule")
+    set(source "${srcdir}/${module_name_path}.swift")
     list(APPEND bench_library_objects "${objfile}")
     add_custom_command(
         OUTPUT "${objfile}"
@@ -129,7 +130,7 @@
         "-module-name" "${module_name}"
         "-emit-module" "-emit-module-path" "${swiftmodule}"
         "-o" "${objfile}"
-        "${srcdir}/${module_name_path}.swift" ${extra_sources})
+        "${source}" ${extra_sources})
     if (SWIFT_BENCHMARK_EMIT_SIB)
       set(sibfile "${objdir}/${module_name}.sib")
       list(APPEND bench_library_sibfiles "${sibfile}")
@@ -145,7 +146,7 @@
           "-module-name" "${module_name}"
           "-emit-sib"
           "-o" "${sibfile}"
-          "${srcdir}/${module_name_path}.swift" ${extra_sources})
+          "${source}" ${extra_sources})
     endif()
   endforeach()

@@ -157,6 +158,7 @@
     if(module_name)
       set(objfile "${objdir}/${module_name}.o")
       set(swiftmodule "${objdir}/${module_name}.swiftmodule")
+      set(source "${srcdir}/${module_name_path}.swift")
       list(APPEND SWIFT_BENCH_OBJFILES "${objfile}")
       add_custom_command(
           OUTPUT "${objfile}"
@@ -171,7 +173,7 @@
           "-emit-module" "-emit-module-path" "${swiftmodule}"
           "-I" "${objdir}"
           "-o" "${objfile}"
-          "${srcdir}/${module_name_path}.swift")
+          "${source}")
       if (SWIFT_BENCHMARK_EMIT_SIB)
         set(sibfile "${objdir}/${module_name}.sib")
         list(APPEND SWIFT_BENCH_SIBFILES "${sibfile}")
@@ -188,7 +190,7 @@
             "-I" "${objdir}"
             "-emit-sib"
             "-o" "${sibfile}"
-            "${srcdir}/${module_name_path}.swift")
+            "${source}")
       endif()
     endif()
   endforeach()


Find binaries on Windows in libzeug find script

--- libzeug-config.cmake
+++ libzeug-config.cmake
@@ -3,41 +3,49 @@

 # LIBZEUG_LIBRARIES
 # LIBZEUG_INCLUDES
+# LIBZEUG_BINARIES (Windows only)

 # LIBZEUG_SIGNAL_LIBRARY
 # LIBZEUG_SIGNAL_LIBRARY_RELEASE
 # LIBZEUG_SIGNAL_LIBRARY_DEBUG
 # LIBZEUG_SIGNAL_INCLUDE_DIR
+# LIBZEUG_SIGNAL_BINARY (Windows only)

 # LIBZEUG_REFLECTION_LIBRARY
 # LIBZEUG_REFLECTION_LIBRARY_RELEASE
 # LIBZEUG_REFLECTION_LIBRARY_DEBUG
 # LIBZEUG_REFLECTION_INCLUDE_DIR
+# LIBZEUG_REFLECTION_BINARY (Windows only)

 # LIBZEUG_PROPERTYGUI_LIBRARY
 # LIBZEUG_PROPERTYGUI_LIBRARY_RELEASE
 # LIBZEUG_PROPERTYGUI_LIBRARY_DEBUG
 # LIBZEUG_PROPERTYGUI_INCLUDE_DIR
+# LIBZEUG_PROPERTYGUI_BINARY (Windows only)

 # LIBZEUG_IO_LIBRARY
 # LIBZEUG_IO_LIBRARY_RELEASE
 # LIBZEUG_IO_LIBRARY_DEBUG
 # LIBZEUG_IO_INCLUDE_DIR
+# LIBZEUG_IO_BINARY (Windows only)

 # LIBZEUG_THREADING_LIBRARY
 # LIBZEUG_THREADING_LIBRARY_RELEASE
 # LIBZEUG_THREADING_LIBRARY_DEBUG
 # LIBZEUG_THREADING_INCLUDE_DIR
+# LIBZEUG_THREADING_BINARY (Windows only)

 # LIBZEUG_SCRIPT_LIBRARY
 # LIBZEUG_SCRIPT_LIBRARY_RELEASE
 # LIBZEUG_SCRIPT_LIBRARY_DEBUG
 # LIBZEUG_SCRIPT_INCLUDE_DIR
+# LIBZEUG_SCRIPT_BINARY (Windows only)

 # LIBZEUG_LOGGING_LIBRARY
 # LIBZEUG_LOGGING_LIBRARY_RELEASE
 # LIBZEUG_LOGGING_LIBRARY_DEBUG
 # LIBZEUG_LOGGING_INCLUDE_DIR
+# LIBZEUG_LOGGING_BINARY (Windows only)

@@ -104,8 +112,21 @@
         set(${LIB_NAME_UPPER}_LIBRARY ${${LIB_NAME_UPPER}_LIBRARY_DEBUG})
     endif()

+    if (${LIB_NAME_UPPER}_LIBRARY AND WIN32)
+        find_file(${LIB_NAME_UPPER}_BINARY
+            NAMES ${LIBNAME}.dll
+            PATHS
+            ${LIBZEUG_DIR}/bin
+            ${LIBZEUG_DIR}/build/Release
+            ${LIBZEUG_DIR}/build/Debug
+            ${LIBZEUG_DIR}/build-release
+            ${LIBZEUG_DIR}/build-debug
+            DOC "The ${LIBNAME} binary")
+    endif()
+
     set(LIBZEUG_INCLUDES  ${LIBZEUG_INCLUDES}  ${${LIB_NAME_UPPER}_INCLUDE_DIR})
     set(LIBZEUG_LIBRARIES ${LIBZEUG_LIBRARIES} ${${LIB_NAME_UPPER}_LIBRARY})
+    set(LIBZEUG_BINARIES  ${LIBZEUG_BINARIES}  ${${LIB_NAME_UPPER}_BINARY})

     # DEBUG
     #message("${LIB_NAME_UPPER}_INCLUDE_DIR     = ${${LIB_NAME_UPPER}_INCLUDE_DIR}")


BUG: Fixed quotes

BUG: Fixed quotes

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -43,7 +43,7 @@
       -DITK_USE_OPTIMIZED_REGISTRATION_METHODS:BOOL=ON
     INSTALL_COMMAND ""
     )
-  set( ITK_DIR ${base}/Insight-Build )
+  set( ITK_DIR "${base}/Insight-Build" )

 endif(NOT USE_SYSTEM_ITK)

@@ -69,7 +69,7 @@
     -DBUILD_TESTING:BOOL=OFF
   INSTALL_COMMAND ""
   )
-set( TCLAP_DIR ${base}/tclap-Build )
+set( TCLAP_DIR "${base}/tclap-Build" )

 ##
@@ -101,7 +101,7 @@
   INSTALL_COMMAND ""
   DEPENDS ${ModuleDescriptionParser_DEPENDS}
   )
-set( ModuleDescriptionParser_DIR ${base}/ModuleDescriptionParser-Build )
+set( ModuleDescriptionParser_DIR "${base}/ModuleDescriptionParser-Build" )

 ##
@@ -131,7 +131,7 @@
     "tclap"
     "ModuleDescriptionParser"
   )
-set( GenerateCLP_DIR ${base}/GenerateCLP-Build )
+set( GenerateCLP_DIR "${base}/GenerateCLP-Build" )
 set( TubeTK_DEPENDS ${TubeTK_DEPENDS} "GenerateCLP" )

@@ -156,7 +156,7 @@
       -DBUILD_TESTING:BOOL=OFF
     INSTALL_COMMAND ""
     )
-  set( OpenIGTLink_DIR ${CMAKE_BINARY_DIR}/OpenIGTLink-Build )
+  set( OpenIGTLink_DIR "${CMAKE_BINARY_DIR}/OpenIGTLink-Build" )
   set( TubeTK_DEPENDS ${TubeTK_DEPENDS} "OpenIGTLink" )
 else( TubeTK_USE_OpenIGTLink )
   set( OpenIGTLink_DIR "" )
@@ -198,7 +198,7 @@
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
     INSTALL_COMMAND ""
     )
-  set( CTK_DIR ${CMAKE_BINARY_DIR}/${proj}-Build )
+  set( CTK_DIR "${CMAKE_BINARY_DIR}/${proj}-Build" )
   set( TubeTK_DEPENDS ${TubeTK_DEPENDS} "CTK" )
 endif( TubeTK_USE_CTK )


Remove legacy_stdio_definitions.lib

Remove legacy_stdio_definitions.lib

Dependency was added by PR #1566. No longer needed now that DX SDK has
been replaced.

--- Tools/CMake/torque3d.cmake
+++ Tools/CMake/torque3d.cmake
@@ -642,13 +642,6 @@

    if(TORQUE_OPENGL)
       addLib(OpenGL32.lib)
-   endif()
-
-   # JTH: DXSDK is compiled with older runtime, and MSVC 2015+ is when __vsnprintf is undefined.
-   # This is a workaround by linking with the older legacy library functions.
-   # See this for more info: http://stackoverflow.com/a/34230122
-   if (MSVC14)
-      addLib(legacy_stdio_definitions.lib)
    endif()
 endif()


VAD_HendriksWrappers: fix rel/abs header copy

Change-Id: I89a9515af7bf2b3141782dc6649762e137f08b1d

--- VAD_HendriksWrappers.cmake
+++ VAD_HendriksWrappers.cmake
@@ -46,10 +46,13 @@

   set(_HEADER_DEPLIST)
   foreach(_H ${_vad_headers_UNPARSED_ARGUMENTS})
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/${_HEADER_PREFIX}/${_H}
-                       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_H} ${CMAKE_CURRENT_BINARY_DIR}/include/${_HEADER_PREFIX}/${_H}
-                       DEPENDS ${_H})
-    list(APPEND _HEADER_DEPLIST ${CMAKE_CURRENT_BINARY_DIR}/include/${_HEADER_PREFIX}/${_H})
+    get_filename_component(_H_ABS ${_H} ABSOLUTE)
+    get_filename_component(_H_NAME ${_H} NAME)
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/${_HEADER_PREFIX}/${_H_NAME}
+                       COMMAND ${CMAKE_COMMAND} -E copy ${_H_ABS} ${CMAKE_CURRENT_BINARY_DIR}/include/${_HEADER_PREFIX}/${_H_NAME}
+                       DEPENDS ${_H_ABS})
+    list(APPEND _HEADER_DEPLIST ${CMAKE_CURRENT_BINARY_DIR}/include/${_HEADER_PREFIX}/${_H_NAME})
   endforeach()

   #only for local source


use force to set OpenCV flags and disable static CRT

--- VAD_OpenCV.cmake
+++ VAD_OpenCV.cmake
@@ -18,9 +18,10 @@
   string(REPLACE "set_target_properties(uninstall " "set_target_properties(uninstall-opencv " FILECONTENT ${FILECONTENT})
   file(WRITE "${VAD_EXTERNAL_ROOT}/OpenCV/cmake/OpenCVExtraTargets.cmake" ${FILECONTENT})

-  set(BUILD_TESTS OFF)
-  set(BUILD_PERF_TESTS OFF)
-  set(BUILD_EXAMPLES OFF)
+  set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
+  set(BUILD_PERF_TESTS OFF CACHE BOOL "" FORCE)
+  set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+  set(BUILD_WITH_STATIC_CRT OFF CACHE BOOL "" FORCE)

   # example of disabling something
   #set(BUILD_opencv_flann OFF CACHE BOOL "" FORCE)


ENH: Do not pollute the global link_directories namespace

link_directories and include_directories affects
every subsequent compile invocation.  Explicitly
include link/include directories only where needed.

--- CMake/itkExternal_FFTW.cmake
+++ CMake/itkExternal_FFTW.cmake
@@ -61,7 +61,6 @@
 set(FFTW_OPTIMIZATION_CONFIGURATION "" CACHE INTERNAL "architecture flags: --enable-sse --enable-sse2 --enable-altivec --enable-mips-ps --enable-cell")
 if(ITK_USE_SYSTEM_FFTW)
   find_package( FFTW )
-  link_directories(${FFTW_LIBDIR})
 else()

   if(WIN32 AND NOT MINGW)
@@ -148,8 +147,6 @@
     endif()
     set(FFTW_INCLUDE_PATH ${ITK_BINARY_DIR}/fftw/include)
     set(FFTW_LIBDIR ${ITK_BINARY_DIR}/fftw/lib)
-    link_directories(${FFTW_LIBDIR})
-    include_directories(${FFTW_INCLUDE_PATH})
     #
     # copy libraries into install tree
     install(CODE


Use source permissions when installing QtWebEngineProcess

--- CMake/mitkInstallRules.cmake
+++ CMake/mitkInstallRules.cmake
@@ -54,10 +54,10 @@
     set(_install_DESTINATION "../Frameworks/QtWebEngineCore.framework")

     get_filename_component(_real_path "${_qmake_path}/../lib/QtWebEngineCore.framework/Helpers" REALPATH)
-    MITK_INSTALL(DIRECTORY ${_real_path})
+    MITK_INSTALL(DIRECTORY ${_real_path} USE_SOURCE_PERMISSIONS)

-    get_filename_component(_real_path "${_qmake_path}/../lib/QtWebEngineCore.framework/Resources" REALPATH)
-    MITK_INSTALL(DIRECTORY ${_real_path})
+    # Translations are included in the Resources directory of
+    # QtWebEngineCore.framework and are installed by default.
   else()
     set(_install_DESTINATION "")


Fix the FindDirect3D.cmake module to be compatible with older CMake. [ci only: master, AppVeyor]

--- CMake/Modules/FindDirect3D.cmake
+++ CMake/Modules/FindDirect3D.cmake
@@ -108,6 +108,6 @@

 # DIRECT3D_INCLUDE_DIRS is not required for Windows SDK, it is required for DirectX SDK but it is implied when DIRECT3D_LIBRARIES can be set
 include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (Direct3D FOUND_VAR DIRECT3D_FOUND REQUIRED_VARS DIRECT3D_LIBRARIES FAIL_MESSAGE ${FAIL_MESSAGE})
+find_package_handle_standard_args (Direct3D REQUIRED_VARS DIRECT3D_LIBRARIES FAIL_MESSAGE ${FAIL_MESSAGE})

 mark_as_advanced (DIRECT3D_INCLUDE_DIRS DIRECT3D_LIBRARIES)


CMP 0074 only available in 3.1.2

CMP 0074 only available in 3.1.2

--- CMakeModules/KrisLibraryDependencies.cmake
+++ CMakeModules/KrisLibraryDependencies.cmake
@@ -22,7 +22,9 @@
 if(CMAKE_VERSION VERSION_LESS "3.1.0")
   MESSAGE("Old version of CMAKE - can't check compiler")
 else(CMAKE_VERSION VERSION_LESS "3.1.0")
-  cmake_policy(SET CMP0074 NEW)
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.1.2")
+    cmake_policy(SET CMP0074 NEW)
+  endif(CMAKE_VERSION VERSION_GREATER_EQUAL "3.1.2")
   include(CheckCXXCompilerFlag)
   CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)


Unset CMake cache variables like ^SimpleITKBasicFiltersGeneratedSource_

This variable was just accumulating in length with each CMake
configuration.

--- CMake/sitkGenerateFilterSource.cmake
+++ CMake/sitkGenerateFilterSource.cmake
@@ -218,7 +218,7 @@
   get_cmake_property( _varNames VARIABLES )
   foreach (_varName ${_varNames})
     if(_varName MATCHES "^SimpleITKBasicFiltersGeneratedSource_")
-      unset(${varName} CACHE)
+      unset(${_varName} CACHE)
     endif()
   endforeach()


small cleanup in cmake

small cleanup in cmake

git-svn-id: 65dd0ccd495961f396d5302e5521154b071f0302@2409 5b2332b8-efa3-11de-8684-7d64432d61a3

--- CMakeModules/ConfigurePackages.cmake
+++ CMakeModules/ConfigurePackages.cmake
@@ -13,18 +13,16 @@
     endif ()

     if (APPLE)
-        sagase_configure_package (BOOST
-    	    NAMES Boost boost
-            COMPONENTS boost_date_time boost_filesystem boost_system boost_thread boost_program_options boost_unit_test_framework
-
-            PREFIXES ${ENV_NAALI_DEP_PATH})
+            set (BOOST_COMPONENTS boost_date_time boost_filesystem boost_system boost_thread boost_program_options boost_unit_test_framework)
     else ()
-        sagase_configure_package (BOOST
-    	    NAMES Boost boost
-            COMPONENTS date_time filesystem system thread program_options unit_test_framework
-            PREFIXES ${ENV_NAALI_DEP_PATH})
+            set (BOOST_COMPONENTS date_time filesystem system thread program_options unit_test_framework)
     endif ()

+    sagase_configure_package (BOOST
+        NAMES Boost boost
+        COMPONENTS ${BOOST_COMPONENTS}
+        PREFIXES ${ENV_NAALI_DEP_PATH})
+
     if (APPLE)
         set (BOOST_LIBRARY_DIRS ${ENV_NAALI_DEP_PATH}/lib)
         set (BOOST_INCLUDE_DIRS ${ENV_NAALI_DEP_PATH}/include)


COMP: Add CLI modules to SlicerCIP

COMP: Add CLI modules to SlicerCIP

Use SlicerCIPIntegration branch of ChestImagingPlatform, which defines
CLI module output and install destinations explicitly

--- SuperBuild/External_CIP.cmake
+++ SuperBuild/External_CIP.cmake
@@ -25,12 +25,13 @@
   ExternalProject_Add(${proj}
     ${${proj}_EP_ARGS}
     GIT_REPOSITORY "${git_protocol}://github.com/acil-bwh/ChestImagingPlatform.git"
-    GIT_TAG "769fba64dfd0e6f67e22c4c1e8021aa9641029b1" # include changes for ITK 64-bit and using Slicer Python in CIP develop branch
+    GIT_TAG "79c752196385124f592776e796c918c2176b0c1f" # use SlicerCIPIntegration branch to include CLI modules
     #DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E echo "Remove this line and uncomment GIT_REPOSITORY and GIT_TAG"
     SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
     BINARY_DIR ${proj}-build
     CMAKE_CACHE_ARGS
       -DCIP_SUPERBUILD:BOOL=OFF
+      -DCIP_INTEGRATE_WITH_SLICER:BOOL=ON
       -DITK_DIR:PATH=${ITK_DIR}
       -DVTK_DIR:PATH=${VTK_DIR}
       -DVTK_SOURCE_DIR:PATH=${VTK_SOURCE_DIR}
@@ -38,9 +39,17 @@
       -DLIBXML2_INCLUDE_DIR:PATH=${vtklibxml2_INCLUDE_DIRS}
       -DLIBXML2_LIBRARIES:PATH=${vtklibxml2_LIBRARIES}
       -DBUILD_GENERATEMODEL:BOOL=OFF
-	  -DCIP_BUILD_TESTING_PYTHON:BOOL=OFF # to exclude cip_python from CIP build
-	  -DSLICER_PYTHON_CMD:FILEPATH=${PYTHON_EXECUTABLE}
+      -DBUILD_GENERATESIMPLELUNGMASK:BOOL=OFF # temporarily off due to lack of VtkGlue
+      -DBUILD_ComputeAirwayWallFromParticles:BOOL=OFF # temporarily off due to lack of VtkGlue
+      -DCIP_BUILD_TESTING_PYTHON:BOOL=OFF # to exclude cip_python from CIP build
+      -DSLICER_PYTHON_CMD:FILEPATH=${PYTHON_EXECUTABLE}
       -DSlicerExecutionModel_DIR:STRING=${SlicerExecutionModel_DIR}
+      -DCIP_CLI_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_BINARY_DIR}/${EXTENSION_BUILD_SUBDIRECTORY}/${Slicer_CLIMODULES_LIB_DIR}
+      -DCIP_CLI_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_BINARY_DIR}/${EXTENSION_BUILD_SUBDIRECTORY}/${Slicer_CLIMODULES_LIB_DIR}
+      -DCIP_CLI_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_BINARY_DIR}/${EXTENSION_BUILD_SUBDIRECTORY}/${Slicer_CLIMODULES_BIN_DIR}
+      -DCIP_CLI_INSTALL_LIBRARY_DESTINATION:PATH=${Slicer_INSTALL_CLIMODULES_LIB_DIR}
+      -DCIP_CLI_INSTALL_ARCHIVE_DESTINATION:PATH=${Slicer_INSTALL_CLIMODULES_LIB_DIR}
+      -DCIP_CLI_INSTALL_RUNTIME_DESTINATION:PATH=${Slicer_INSTALL_CLIMODULES_BIN_DIR}
       -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
       -DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}
       -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}


SVN_SILENT made messages (.desktop file)

--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -54,7 +54,7 @@
 Comment[es]=Iniciar una conversación con cualquiera de sus contactos de MI o cambiar su estado de MI
 Comment[et]=Vestluse alustamine mõne oma kiirsuhtluskontaktiga või enda kiirsuhtlusoleku muutmine
 Comment[fi]=Aloita keskustelu muun pikaviestinkäyttäjän kanssa tai vaihda pikaviestintilaasi
-Comment[fr]=Démarre une discussion avec n'importe lequel de vos contacts de messagerie instantanée ou change l'état de celle-ci
+Comment[fr]=Démarre une conversation avec n'importe lequel de vos contacts de messagerie instantanée ou change l'état de celle-ci
 Comment[gl]=Inicie unha conversa con calquera dos seus contactos ou cambie seu estado na IM
 Comment[hu]=Csevegés indítása az azonnali üzenetküldési partnerei valamelyikével vagy az azonnali üzenetküldési állapotának módosítása
 Comment[ia]=Initia conversation con qualcunque de tu contactos de IM o modifica tu status de IM


Set ABI=8 as default for Houdini and lock H18.5 to ABI=7

Signed-off-by: Dan Bailey <39b6ae1dd30d9ab3cd77a2d084b277520f14c203@ilm.com>

--- cmake/OpenVDBHoudiniSetup.cmake
+++ cmake/OpenVDBHoudiniSetup.cmake
@@ -145,6 +145,8 @@
   endif()
 endif()

+set(Houdini_VERSION_MAJOR_MINOR "${Houdini_VERSION_MAJOR}.${Houdini_VERSION_MINOR}")
+
 find_package(PackageHandleStandardArgs)
 find_package_handle_standard_args(Houdini
   REQUIRED_VARS _houdini_install_root Houdini_FOUND
@@ -329,14 +331,12 @@
 # Explicitly configure the OpenVDB ABI version depending on the Houdini
 # version.

-if(Houdini_VERSION VERSION_LESS 17)
-  set(OPENVDB_HOUDINI_ABI 4)
-elseif(Houdini_VERSION VERSION_LESS 18)
-  set(OPENVDB_HOUDINI_ABI 5)
-elseif(Houdini_VERSION VERSION_LESS 18.5)
+if(Houdini_VERSION_MAJOR_MINOR VERSION_EQUAL 18.0)
   set(OPENVDB_HOUDINI_ABI 6)
+elseif(Houdini_VERSION_MAJOR_MINOR VERSION_EQUAL 18.5)
+  set(OPENVDB_HOUDINI_ABI 7)
 else()
-  set(OPENVDB_HOUDINI_ABI 7)
+  set(OPENVDB_HOUDINI_ABI 8)
 endif()

 # ------------------------------------------------------------------------


CMake: updated library dependencies.

CMake: updated library dependencies.

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

--- cmake/modules/LLVMLibDeps.cmake
+++ cmake/modules/LLVMLibDeps.cmake
@@ -21,58 +21,66 @@
 # must contain all targets, not just X86.

-set(MSVC_LIB_DEPS_LLVMARMAsmPrinter LLVMARMInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMARMAsmPrinter LLVMARMCodeGen LLVMARMInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMARMCodeGen LLVMARMInfo LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMARMInfo LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMARMInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMAlphaAsmPrinter LLVMAlphaInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMAlphaCodeGen LLVMAlphaInfo LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMAlphaInfo LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMAlphaInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMArchive LLVMBitReader LLVMCore LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMAsmParser LLVMCore LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMAsmPrinter LLVMAnalysis LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMAsmPrinter LLVMAnalysis LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMBitReader LLVMCore LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMBitWriter LLVMCore LLVMSupport LLVMSystem)
+set(MSVC_LIB_DEPS_LLVMBlackfinAsmPrinter LLVMAsmPrinter LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSupport LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMBlackfinInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMCBackend LLVMAnalysis LLVMCBackendInfo LLVMCodeGen LLVMCore LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils LLVMipa)
 set(MSVC_LIB_DEPS_LLVMCBackendInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMCellSPUAsmPrinter LLVMAsmPrinter LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSupport LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMCellSPUInfo LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMCodeGen LLVMAnalysis LLVMCore LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
+set(MSVC_LIB_DEPS_LLVMCodeGen LLVMAnalysis LLVMCore LLVMMC LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
 set(MSVC_LIB_DEPS_LLVMCore LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMCppBackend LLVMCore LLVMCppBackendInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMCppBackendInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMDebugger LLVMAnalysis LLVMBitReader LLVMCore LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMExecutionEngine LLVMCore LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMHello LLVMCore LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMInstrumentation LLVMCore LLVMScalarOpts LLVMSupport LLVMSystem LLVMTransformUtils)
 set(MSVC_LIB_DEPS_LLVMInterpreter LLVMCodeGen LLVMCore LLVMExecutionEngine LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMJIT LLVMCodeGen LLVMCore LLVMExecutionEngine LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMLinker LLVMArchive LLVMBitReader LLVMCore LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMMSIL LLVMAnalysis LLVMCodeGen LLVMCore LLVMMSILInfo LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils LLVMipa)
-set(MSVC_LIB_DEPS_LLVMMSILInfo LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMMSILInfo LLVMCore LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMMSP430 LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMSP430Info LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMSP430Info LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMMipsAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMipsCodeGen LLVMMipsInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMipsCodeGen LLVMCodeGen LLVMCore LLVMMipsInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMipsInfo LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMPIC16 LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMPIC16Info LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMPIC16 LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPIC16Info LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPIC16Info LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMPowerPCAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMPowerPCInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPowerPCCodeGen LLVMCodeGen LLVMCore LLVMPowerPCInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMPowerPCInfo LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMPowerPCInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMScalarOpts LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
 set(MSVC_LIB_DEPS_LLVMSelectionDAG LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSparcAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSparcCodeGen LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMSparcInfo LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMSparcInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMTarget LLVMCore LLVMSupport LLVMSystem)
+set(MSVC_LIB_DEPS_LLVMSystem:)
+set(MSVC_LIB_DEPS_LLVMSystemZAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMSystemZInfo LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMSystemZCodeGen LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSupport LLVMSystemZInfo LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMSystemZInfo LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMTarget LLVMCore LLVMMC LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMTransformUtils LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget LLVMipa)
-set(MSVC_LIB_DEPS_LLVMX86AsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget LLVMX86CodeGen LLVMX86Info)
+set(MSVC_LIB_DEPS_LLVMX86AsmParser LLVMMC LLVMX86Info)
+set(MSVC_LIB_DEPS_LLVMX86AsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMTarget LLVMX86CodeGen LLVMX86Info)
 set(MSVC_LIB_DEPS_LLVMX86CodeGen LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget LLVMX86Info)
-set(MSVC_LIB_DEPS_LLVMX86Info LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMX86Info LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMXCore LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget LLVMXCoreInfo)
 set(MSVC_LIB_DEPS_LLVMXCoreInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMipa LLVMAnalysis LLVMCore LLVMSupport LLVMSystem)


Remove lock if build directory that made lock not exists

--- cmake/modules/hunter_lock.cmake
+++ cmake/modules/hunter_lock.cmake
@@ -22,20 +22,29 @@
   hunter_status_debug("lock directory")

   set(lock_file "${HUNTER_ROOT}/Base/hunter-build.lock")
+  set(binary_dir_file "${HUNTER_ROOT}/Base/binary-dir.lock")
+
   if(EXISTS "${lock_file}")
-    file(READ "${lock_file}" build_info)
-    message(
-      "\n"
-      "Another project is using directory right now:\n\n"
-      "    ${HUNTER_ROOT}\n\n"
-      "Build info: \n\n"
-      "${build_info}\n\n"
-      "If that build cancelled (interrupted by user or some other reason), "
-      "please remove this file manually:\n\n"
-      "    ${lock_file}\n\n"
-      "Then run CMake again."
-    )
-    hunter_fatal_error("Directory busy")
+    if(NOT EXISTS "${binary_dir_file}")
+      hunter_fatal_error("Lock file exists but `${binary_dir_file}` not found")
+    endif()
+    file(READ "${binary_dir_file}" locked_binary_dir)
+    if(EXISTS "${locked_binary_dir}")
+      # directory still exists and may be active
+      file(READ "${lock_file}" build_info)
+      message(
+        "\n"
+        "Another project is using directory right now:\n\n"
+        "    ${HUNTER_ROOT}\n\n"
+        "Build info: \n\n"
+        "${build_info}\n\n"
+        "If that build cancelled (interrupted by user or some other reason), "
+        "please remove this file manually:\n\n"
+        "    ${lock_file}\n\n"
+        "Then run CMake again."
+      )
+      hunter_fatal_error("Directory busy")
+    endif()
   endif()

   string(TIMESTAMP time_now)
@@ -49,5 +58,7 @@
       "    Build start at: ${time_now}"
   )

+  file(WRITE "${binary_dir_file}" "${PROJECT_BINARY_DIR}")
+
   hunter_verify_toolchain_info()
 endfunction()


hunter_wiki: short format

hunter_wiki: short format

--- cmake/modules/hunter_wiki.cmake
+++ cmake/modules/hunter_wiki.cmake
@@ -1,9 +1,9 @@
-# Copyright (c) 2014, Ruslan Baratov
+# Copyright (c) 2014-2015, Ruslan Baratov
 # All rights reserved.

 function(hunter_wiki wiki_page)
   message("------------------------------ WIKI -------------------------------")
-  message("    ${wiki_page}")
+  message("    ${HUNTER_WIKI}/${wiki_page}")
   message("-------------------------------------------------------------------")
   message("")
   message(FATAL_ERROR "")


MASTER: remove hack

MASTER: remove hack

--- cmake_modules/FindASSIMPM.cmake
+++ cmake_modules/FindASSIMPM.cmake
@@ -33,17 +33,10 @@
 		PATHS
 		${ASSIMP_ROOT}/lib
 	)
-	if(ASSIMP_LIBRARIES_DEBUG)
-		set(ASSIMP_LIBRARIES
-			debug ${ASSIMP_LIBRARIES_DEBUG}
-			optimized ${ASSIMP_LIBRARIES_RELEASE}
-		)
-	else()
-		set(ASSIMP_LIBRARIES
-			debug ${ASSIMP_LIBRARIES_RELEASE}
-			optimized ${ASSIMP_LIBRARIES_RELEASE}
-		)
-	endif()
+	set(ASSIMP_LIBRARIES
+		debug ${ASSIMP_LIBRARIES_DEBUG}
+		optimized ${ASSIMP_LIBRARIES_RELEASE}
+	)
 endif()

 if(ASSIMP_INCLUDE_DIR AND ASSIMP_LIBRARIES)


Additional optional parameter for DECLARE_ZORBA_MODULE macro to pass targets the declared module depends on.

--- cmake_modules/ZorbaModule.cmake
+++ cmake_modules/ZorbaModule.cmake
@@ -118,6 +118,7 @@
 #              information; see below
 #       TEST_ONLY - (optional) Module is for testcases only and should not
 #              be installed
+#       DEPENDS - (optional) List of targets the module depends on
 #
 # CONFIG_FILES - any files specific here will be copied to
 # CMAKE_CURRENT_BINARY_DIR using CONFIGURE_FILE(). They may contain
@@ -136,7 +137,7 @@
 # file enough to deduce the URI and version?
 MACRO (DECLARE_ZORBA_MODULE)
   # Parse and validate arguments
-  PARSE_ARGUMENTS(MODULE "LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES"
+  PARSE_ARGUMENTS(MODULE "LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES;DEPENDS"
     "URI;FILE;VERSION" "TEST_ONLY" ${ARGN})
   IF (NOT MODULE_FILE)
     MESSAGE (FATAL_ERROR "'FILE' argument is required for ZORBA_DECLARE_MODULE()")
@@ -268,6 +269,9 @@
     # the module *URI*'s final component.
     SET(module_lib_target "modlib${num_zorba_modules}_${module_name}")
     ADD_LIBRARY(${module_lib_target} SHARED ${SRC_FILES})
+    IF (MODULE_DEPENDS)
+      ADD_DEPENDENCIES(${module_lib_target} ${MODULE_DEPENDS})
+    ENDIF()
     GET_FILENAME_COMPONENT(module_filewe "${module_filename}" NAME_WE)
     IF (MODULE_VERSION)
       # If there's a version, insert it into the module library name


Allow passing NO_OUTPUT_DIRS to conan_cmake_run

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

 macro(parse_arguments)
-  set(options BASIC_SETUP CMAKE_TARGETS UPDATE KEEP_RPATHS)
+  set(options BASIC_SETUP CMAKE_TARGETS UPDATE KEEP_RPATHS NO_OUTPUT_DIRS)
   set(oneValueArgs CONANFILE DEBUG_PROFILE RELEASE_PROFILE PROFILE)
   set(multiValueArgs REQUIRES OPTIONS IMPORTS BUILD CONAN_COMMAND)
   cmake_parse_arguments(ARGUMENTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -382,18 +382,15 @@
     conan_load_buildinfo()

     if(ARGUMENTS_BASIC_SETUP)
-      if(ARGUMENTS_CMAKE_TARGETS)
-        if(ARGUMENTS_KEEP_RPATHS)
-            conan_basic_setup(TARGETS KEEP_RPATHS)
-        else()
-            conan_basic_setup(TARGETS)
-        endif()
-      else()
-        if(ARGUMENTS_KEEP_RPATHS)
-            conan_basic_setup(KEEP_RPATHS)
-        else()
-            conan_basic_setup()
-        endif()
-      endif()
+        foreach(_option CMAKE_TARGETS KEEP_RPATHS NO_OUTPUT_DIRS)
+            if(ARGUMENTS_${_option})
+                if(${_option} STREQUAL "CMAKE_TARGETS")
+                    list(APPEND _setup_options "TARGETS")
+                else()
+                    list(APPEND _setup_options ${_option})
+                endif()
+            endif()
+        endforeach()
+        conan_basic_setup(${_setup_options})
     endif()
 endmacro()


COMP: Update KWStyle for macOS unknown -Wdeprecated-copy

Incorporates: https://github.com/Kitware/KWStyle/pull/105

--- Utilities/KWStyle/BuildKWStyle.cmake
+++ Utilities/KWStyle/BuildKWStyle.cmake
@@ -23,7 +23,7 @@
 if(NOT TARGET KWStyle)
 ExternalProject_add(KWStyle
   GIT_REPOSITORY "${git_protocol}://github.com/Kitware/KWStyle.git"
-  GIT_TAG aeb0914947df4cae8ceeab1415e99ceb64acda35
+  GIT_TAG 1173206c0e7f4bc70dc3af641daf6e33f4042772
   UPDATE_COMMAND ""
   DOWNLOAD_DIR ${KWStyle_SOURCE_DIR}
   SOURCE_DIR ${KWStyle_SOURCE_DIR}


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   09)
+SET(KWSYS_DATE_STAMP_DAY   10)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -1,10 +1,10 @@
 # Do not edit!  Generated by kwsysDateStamp.py

 # KWSys version date year component.  Format is CCYY.
-SET(KWSYS_DATE_STAMP_YEAR  2008)
+SET(KWSYS_DATE_STAMP_YEAR  2009)

 # KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 12)
+SET(KWSYS_DATE_STAMP_MONTH 01)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   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 01)

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


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

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -4,7 +4,7 @@
 SET(KWSYS_DATE_STAMP_YEAR  2008)

 # KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 02)
+SET(KWSYS_DATE_STAMP_MONTH 03)

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


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

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

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


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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


Adding MinGW Support to copying Qt libraries

--- Support/cmp/cmpCMakeMacros.cmake
+++ Support/cmp/cmpCMakeMacros.cmake
@@ -596,6 +596,24 @@
             ENDFOREACH(qtlib)
         endif(DEFINED QT_QMAKE_EXECUTABLE)
     endif()
+
+    if (MINGW)
+        if (DEFINED QT_QMAKE_EXECUTABLE)
+            set(TYPE "")
+            if ( ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+                set(TYPE "d")
+            endif()
+            FOREACH(qtlib ${QTLIBLIST})
+                GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
+                message(STATUS "Generating Copy Rule for Qt DLL Library ${QT_DLL_PATH_tmp}/${qtlib}d4.dll")
+                add_custom_target(ZZ_${qtlib}-Debug-Copy ALL
+                            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_DLL_PATH_tmp}/${qtlib}${TYPE}4.dll
+                            ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+                            COMMENT "Copying ${qtlib}${TYPE}4.dll to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/")
+
+            ENDFOREACH(qtlib)
+        endif(DEFINED QT_QMAKE_EXECUTABLE)
+    endif()
 endmacro()

 # --------------------------------------------------------------------


Added test to ensure that BlahPtr.h headers are included in Blah.h headers.

--- tests/header_dependencies/CheckForwardDeclarationHeaders.cmake
+++ tests/header_dependencies/CheckForwardDeclarationHeaders.cmake
@@ -11,9 +11,32 @@
 file(GLOB_RECURSE fwd_headers RELATIVE "${HEADER_BASE}" ${HEADER_BASE}/*_fwd.h)
 foreach(fwd_header ${fwd_headers})
     string(REPLACE "_fwd.h" ".h" full_header "${fwd_header}")
-    file(STRINGS "${HEADER_BASE}/${full_header}" _found REGEX "#include [<\"]${fwd_header}[>\"]")
-    if (NOT _found)
-        message(FATAL_ERROR "The header file <${full_header}> does not include <${fwd_header}>.")
+    if (EXISTS "${HEADER_BASE}/${full_header}")
+        file(STRINGS "${HEADER_BASE}/${full_header}" _found REGEX "#include [<\"]${fwd_header}[>\"]")
+        if (NOT _found)
+            message(FATAL_ERROR "The header file ${HEADER_BASE}/${full_header} does not include <${fwd_header}>.")
+        endif()
     endif()
 endforeach()

+#
+# Ensure that smart pointer typedef headers are inclucded in the full-declaration headers.
+# That is, ensure that BlahPtr.h is included in Blah.h
+#
+# Variables:
+#
+#   HEADER_BASE  Set this to the root directory containing the header files to be checked.
+#
+
+file(GLOB_RECURSE ptr_headers RELATIVE "${HEADER_BASE}" ${HEADER_BASE}/*Ptr.h)
+foreach(ptr_header ${ptr_headers})
+    string(REPLACE "Ptr.h" ".h" full_header "${ptr_header}")
+    if (EXISTS "${HEADER_BASE}/${full_header}")
+        file(STRINGS "${HEADER_BASE}/${full_header}" _found REGEX "#include [<\"]${ptr_header}[>\"]")
+        if (NOT _found)
+            message(FATAL_ERROR "The header file ${HEADER_BASE}/${full_header} does not include <${ptr_header}>.")
+        endif()
+    endif()
+endforeach()
+
+


Hack - Configure VTK using VTK_R_HOME

Hack - Configure VTK using VTK_R_HOME

To understand the problem, you could look at VTK/CMakeLists.txt
and notice that "vtkConfigure.h" is configured before "find_package(R)"
is called. That means vtkConfigure will be configured with a empty "VTK_R_HOME".

A workaround is to configure VTK passing VTK_R_HOME, that way vtkConfigure.h
will be properly configured !

Ideally, the issue should be fix upstream in VTK itself.

--- CMakeExternals/VTK.cmake
+++ CMakeExternals/VTK.cmake
@@ -31,6 +31,7 @@
       -DR_LIBRARY_BLAS:FILEPATH=${R_LIBRARY_BLAS}
       -DR_LIBRARY_LAPACK:FILEPATH=${R_LIBRARY_LAPACK}
       -DR_LIBRARY_READLINE:FILEPATH=${R_LIBRARY_READLINE}
+      -DVTK_R_HOME:PATH=${VTK_R_HOME} # HACK - Required because vtkConfigure.h is configured before find_package(R) is called !
       -DVTK_USE_N_WAY_ARRAYS:BOOL=ON # Required for using R interface
       -DVTK_USE_INFOVIS:BOOL=ON # Required for using R interface
       -DBUILD_EXAMPLES:BOOL=OFF


FIX: remove unecessary extra space

FIX: remove unecessary extra space

--- CMakeLists.default.cmake
+++ CMakeLists.default.cmake
@@ -24,7 +24,7 @@
 		set(COMPILER_COLOR_FLAGS_OPTS "")
 	endif (HAS_COMPILER_COLORS)

-	set(CMAKE_C_FLAGS "-Wall -Wshadow -Wconversion -Wno-sign-conversion -pedantic-errors -fstrict-aliasing -fstack-protector-all -std=c99 ${COMPILER_COLOR_FLAGS_OPTS}  ${CMAKE_USER_C_FLAGS}" CACHE STRING
+	set(CMAKE_C_FLAGS "-Wall -Wshadow -Wconversion -Wno-sign-conversion -pedantic-errors -fstrict-aliasing -fstack-protector-all -std=c99 ${COMPILER_COLOR_FLAGS_OPTS} ${CMAKE_USER_C_FLAGS}" CACHE STRING
 		"Flags used by the compiler during all build types." FORCE
 	)


fix link order issue with boost

fix link order issue with boost

This could happen with any boost that was compiled
with -DBOOST_SYSTEM_NO_DEPRECATED.  As of boost-1.66.0
that's the effective default, so the issue is more apparent.
In this case one get an undefined reference to
boost::system::system_category() as the 'system' module
is first in the link order, which will cause that as yet unused
symbol to be discarded by the linker.

Instead move the 'system' module to be the last in the link order
so that all references are resolved.

This was tested with cmake 3.5.2


Fixed dependencies and link requirements of asset-embedding resource object libraries.

--- embed_assets.cmake
+++ embed_assets.cmake
@@ -77,7 +77,8 @@
 	add_dependencies(${target} mirrage_embedded_assets_${target})
 	if(MSVC)
 		add_library(mirrage_embedded_assets_obj_${target} OBJECT "${EMBED_SRC_FILE}")
-		target_link_libraries(${target} PUBLIC $<TARGET_OBJECTS:mirrage_embedded_assets_obj_${target}>)
+		target_link_libraries(${target} INTERFACE $<TARGET_OBJECTS:mirrage_embedded_assets_obj_${target}>)
+		add_dependencies(mirrage_embedded_assets_obj_${target} mirrage_embedded_assets_${target})
 	endif()
 endmacro()


zlib.cmake: Comments

zlib.cmake: Comments

--- zlib.cmake
+++ zlib.cmake
@@ -23,14 +23,19 @@
     URL_MD5             ${zlib_MD5}
     UPDATE_COMMAND      ""
     PATCH_COMMAND       ""
+
+    # zlib has a CMakeLists build, but it is broken on Mac OS X
+    # Must use the configure script.
+    CONFIGURE_COMMAND ${FLYEM_ENV_STRING} ./configure
+        --prefix=${FLYEM_BUILD_DIR}
+        --64
+
     #CONFIGURE_COMMAND   ${FLYEM_ENV_STRING} ${CMAKE_COMMAND} ${zlib_SRC_DIR}
     #    -DCMAKE_INSTALL_PREFIX=${FLYEM_BUILD_DIR}
     #    -DCMAKE_PREFIX_PATH=${FLYEM_BUILD_DIR}
-    CONFIGURE_COMMAND ${FLYEM_ENV_STRING} ./configure
-        --prefix=${FLYEM_BUILD_DIR}
-        --64
+
     BUILD_COMMAND       ${FLYEM_ENV_STRING} make
-    BUILD_IN_SOURCE     1
+    BUILD_IN_SOURCE     1 # Configure script reqiures BUILD_IN_SOURCE
     INSTALL_COMMAND     ${FLYEM_ENV_STRING} make install
 )


fptu-cmake: check for '-Og' compiler option.

--- cmake.fptu/compiler.cmake
+++ cmake.fptu/compiler.cmake
@@ -131,6 +131,7 @@
   check_c_compiler_flag("-ggdb" CC_HAS_GGDB)
   check_c_compiler_flag("-fvisibility=hidden" CC_HAS_VISIBILITY)
   check_c_compiler_flag("-march=native" CC_HAS_ARCH_NATIVE)
+  check_c_compiler_flag("-Og" CC_HAS_DEBUG_FRENDLY_OPTIMIZATION)
   check_c_compiler_flag("-Wall" CC_HAS_WALL)

   #


Remove warnings

Remove warnings

--- cmake/FindCUDA_wrap.cmake
+++ cmake/FindCUDA_wrap.cmake
@@ -17,6 +17,7 @@
   # the flag -ftest-coverage causes nvcc to barf, so exclude that one
   if (CMAKE_COMPILER_IS_GNUCC)
     string (REPLACE "-ftest-coverage" "" TMP "${CMAKE_CXX_FLAGS}")
+    string (REPLACE "-ftemplate-depth-50" "" TMP "${TMP}"
     string (REPLACE " " "," TMP "${TMP}")
     set (CUDA_CXX_FLAGS ${CUDA_CXX_FLAGS} ${TMP})
   endif ()


Patch for handling conflict RAPIDJSON_ CMake entry and env var

--- cmake/Findrapidjson.cmake
+++ cmake/Findrapidjson.cmake
@@ -41,7 +41,7 @@
 # -----------------------------------------------------------------------------------

 foreach(opt RAPIDJSON_INCLUDEDIR RAPIDJSON_USE_SSE2 RAPIDJSON_USE_SSE42)
-  if(DEFINED ${opt} AND DEFINED ENV{${opt}} AND NOT ${opt} STREQUAL "$ENV{${opt}}")
+  if(${opt} AND DEFINED ENV{${opt}} AND NOT ${opt} STREQUAL "$ENV{${opt}}")
     message(WARNING "Conflicting ${opt} values: ignoring environment variable and using CMake cache entry.")
   elseif(DEFINED ENV{${opt}} AND NOT ${opt})
     set(${opt} "$ENV{${opt}}")


added DEFAULT_ETC_ALTERNATIVES_PRIORITY to VersionHelper

it is set to 0 when the executable version is -unstable, and 10
otherwise.

--- cmake/VersionHelper.cmake
+++ cmake/VersionHelper.cmake
@@ -9,3 +9,8 @@
 list(GET VERSION_DATA 0 EXE_VERSION_SUFFIX)
 list(GET VERSION_DATA 1 FULL_VERSION)
 list(GET VERSION_DATA 2 COMMIT_HASH)
+
+set(DEFAULT_ETC_ALTERNATIVES_PRIORITY 10)
+if(${EXE_VERSION_SUFFIX} STREQUAL "-unstable")
+    set(DEFAULT_ETC_ALTERNATIVES_PRIORITY 0)
+endif()


Adjust minor version number

Adjust minor version number

--- cmake/build-version.cmake
+++ cmake/build-version.cmake
@@ -19,7 +19,7 @@
   endif( )
   if( POLICY CMP0048 )
     cmake_policy( SET CMP0048 NEW )
-    project( ${PV_NAME} VERSION 0.5.4.0 LANGUAGES ${PV_LANGUAGES} )
+    project( ${PV_NAME} VERSION 0.4.4.0 LANGUAGES ${PV_LANGUAGES} )

   else( )
     project( ${PV_NAME} ${PV_LANGUAGES} )
@@ -29,7 +29,7 @@
     endif( )

     if( NOT DEFINED ${PV_NAME}_VERSION_MINOR )
-      set( ${PV_NAME}_VERSION_MINOR 5 )
+      set( ${PV_NAME}_VERSION_MINOR 4 )
     endif( )

     if( NOT DEFINED ${PV_NAME}_VERSION_PATCH )


WL#5665: Removal of the autotools-based build system  - Make the cmake files depend on VERSION, causing    cmake rerun when VERSION changes

--- cmake/mysql_version.cmake
+++ cmake/mysql_version.cmake
@@ -21,17 +21,21 @@
 SET(PROTOCOL_VERSION "10")
 SET(DOT_FRM_VERSION "6")

+# Generate "something" to trigger cmake rerun when VERSION changes
+CONFIGURE_FILE(
+  ${CMAKE_SOURCE_DIR}/VERSION
+  ${CMAKE_BINARY_DIR}/VERSION.dep
+)
+
 # Read value for a variable from VERSION.

 MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
  IF(NOT ${var})
-   IF (EXISTS ${CMAKE_SOURCE_DIR}/VERSION)
-     FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
-    IF(str)
-      STRING(REPLACE "${keyword}=" "" str ${str})
-      STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")
-      SET(${var} ${str})
-    ENDIF()
+   FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
+   IF(str)
+     STRING(REPLACE "${keyword}=" "" str ${str})
+     STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")
+     SET(${var} ${str})
    ENDIF()
  ENDIF()
 ENDMACRO()


Исправлен поиск icu

Исправлен поиск icu

--- cmake/win32.install.cmake
+++ cmake/win32.install.cmake
@@ -34,9 +34,9 @@
     ${DLL_D_PLUGINS_QMINIMAL}
 )

-FIND_FILE(DLL_ICUUC                   icuuc52.dll              PATHS ${QT_LIBRARY_DIR})
-FIND_FILE(DLL_ICUIN                   icuin52.dll              PATHS ${QT_LIBRARY_DIR})
-FIND_FILE(DLL_ICUDT                   icudt52.dll              PATHS ${QT_LIBRARY_DIR})
+FILE(GLOB DLL_ICUUC ${QT_LIBRARY_DIR}/icuuc*.dll)
+FILE(GLOB DLL_ICUIN ${QT_LIBRARY_DIR}/icuin*.dll)
+FILE(GLOB DLL_ICUDT ${QT_LIBRARY_DIR}/icudt*.dll)

 FIND_FILE(DLL_R_QT_CORE               Qt5Core.dll              PATHS ${QT_LIBRARY_DIR})
 FIND_FILE(DLL_D_QT_CORE               Qt5Cored.dll             PATHS ${QT_LIBRARY_DIR})


updating FindEigen2.cmake for proper search order

--- bench/btl/cmake/FindEigen2.cmake
+++ bench/btl/cmake/FindEigen2.cmake
@@ -16,10 +16,10 @@
 else (EIGEN2_INCLUDE_DIR)

 find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core
-     PATHS
+     PATH_SUFFIXES eigen2
+     HINTS
      ${INCLUDE_INSTALL_DIR}
      ${KDE4_INCLUDE_DIR}
-     PATH_SUFFIXES eigen2
    )

 include(FindPackageHandleStandardArgs)


revert a bug fix that wasnt actually a bug fix

--- ctest/CTestTestfile.cmake
+++ ctest/CTestTestfile.cmake
@@ -1,26 +1,26 @@
-add_test(Test01 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test01 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test02 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test02 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test03 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test03 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test04 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test04 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test05 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test05 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test06 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test06 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test07 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test07 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test08 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test08 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test09 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test09 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test10 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test10 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test11 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test11 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test12 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test12 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test13 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test13 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test14 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test14 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test15 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test15 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test16 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test16 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test17 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test17 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test18 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test18 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test19 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test19 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test20 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test20 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test21 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test21 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test22 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test22 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test23 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test23 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test24 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test24 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test25 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test25 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
-add_test(Test26 python "${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test26 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001")
+add_test(Test01 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test01 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test02 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test02 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test03 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test03 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test04 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test04 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test05 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test05 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test06 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test06 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test07 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test07 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test08 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test08 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test09 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test09 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test10 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test10 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test11 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test11 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test12 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test12 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test13 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test13 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test14 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test14 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test15 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test15 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test16 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test16 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test17 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test17 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test18 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test18 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test19 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test19 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test20 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test20 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test21 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test21 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test22 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test22 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test23 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test23 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test24 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test24 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test25 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test25 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)
+add_test(Test26 python ${CTEST_SOURCE_DIRECTORY}/reg_tests/executeRegressionTestCase.py Test26 ${EXECUTABLE} ${CTEST_SOURCE_DIRECTORY} 0.001)


Added COPYRIGHT.txt for the Mac

Added COPYRIGHT.txt for the Mac

--- cmake/BALLPackageConfig.cmake
+++ cmake/BALLPackageConfig.cmake
@@ -7,7 +7,7 @@
 SET(CPACK_PACKAGE_VERSION_PATCH "${BALL_PACKAGE_VERSION_PATCH}")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "BALL-${CPACK_PACKAGE_VERSION}")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/cmake/installer/Welcome.rtf")
-SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/source/COPYRIGHT")
+SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/cmake/installer/COPYRIGHT.txt")
 SET(CPACK_RESOURCE_FILE_WELCOME "${PROJECT_SOURCE_DIR}/cmake/installer/Welcome.rtf")

 IF (WIN32 AND NOT UNIX)


Use OSRM versions for Debian package version.

--- cmake/CPackDebianConfig.cmake
+++ cmake/CPackDebianConfig.cmake
@@ -7,9 +7,9 @@
 SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENCE.TXT")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CPACK_RESOURCE_FILE_README}")
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "4")
-SET(CPACK_PACKAGE_VERSION_PATCH "3")
+SET(CPACK_PACKAGE_VERSION_MAJOR ${OSRM_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${OSRM_VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_PATCH ${OSRM_VERSION_PATCH})

 SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")


fix rendering module (ogre) linking on linux 64bit after boost cmake changes: remove the forced use of static boost libs, as only dynamic linking works. also allow the use of older boost versions, down till 1.39.0 which was listed as an supported version earlier. i have 1.42.0, that is afaik oldest which is actually verified to work now. but if older work too is good to allow.

--- cmake/ConfigurePackages.cmake
+++ cmake/ConfigurePackages.cmake
@@ -39,9 +39,8 @@
 set(Boost_USE_MULTITHREADED TRUE)
 set(Boost_DETAILED_FAILURE_MSG FALSE)
 set(Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1")
-set(Boost_USE_STATIC_LIBS TRUE)
-
-find_package(Boost 1.46.1 COMPONENTS thread regex)
+
+find_package(Boost 1.39.0 COMPONENTS thread regex)

 if (Boost_FOUND)
    include_directories(${Boost_INCLUDE_DIRS})


gtest: change the download link to "http" and provide a MD5 hash for verification

--- cmake/Modules/Findgtest.cmake
+++ cmake/Modules/Findgtest.cmake
@@ -6,7 +6,8 @@
 include(ExternalProject)
 ExternalProject_Add(
     gtest
-    URL https://github.com/google/googletest/archive/release-1.7.0.zip
+    URL http://github.com/google/googletest/archive/release-1.7.0.zip
+    URL_MD5 ef5e700c8a0f3ee123e2e0209b8b4961
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gtest
     INSTALL_COMMAND "" # Disable install step
 )


-adapt to the positive logic of macro_ensure_version()

Alex

svn path=/trunk/KDE/kdepim/; revision=557783

--- cmake/modules/FindGpgme.cmake
+++ cmake/modules/FindGpgme.cmake
@@ -18,9 +18,9 @@

     EXEC_PROGRAM(${GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION)

-    MACRO_ENSURE_VERSION( "0.4.5" ${GPGME_VERSION} GPGME_INSTALLED_VERSION_TOO_OLD )
+    MACRO_ENSURE_VERSION( "0.4.5" ${GPGME_VERSION} GPGME_INSTALLED_VERSION_OK )

-    if (NOT GPGME_INSTALLED_VERSION_TOO_OLD)
+    if (GPGME_INSTALLED_VERSION_OK)

       EXEC_PROGRAM(${GPGMECONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE GPGME_LIBRARIES)

@@ -39,9 +39,9 @@
       set(GPGME_INCLUDES ${GPGME_INCLUDES} CACHE INTERNAL "The gpgme include paths")
       set(GPGME_LIBRARIES ${GPGME_LIBRARIES} CACHE INTERNAL "The gpgme libraries")

-    else (NOT GPGME_INSTALLED_VERSION_TOO_OLD)
+    else (GPGME_INSTALLED_VERSION_OK)
       message(STATUS "The installed version of gpgme is too old: ${GPGME_VERSION}")
-    endif (NOT GPGME_INSTALLED_VERSION_TOO_OLD)
+    endif (GPGME_INSTALLED_VERSION_OK)

   endif (GPGMECONFIG_EXECUTABLE)


add metis include dir to USER_INCLUDE_DIRS

otherwise tests/metis/metis_01a fails with "fatal error: 'metis.h' file not found"

--- cmake/modules/FindMETIS.cmake
+++ cmake/modules/FindMETIS.cmake
@@ -103,5 +103,7 @@
     OPTIONAL MPI_C_LIBRARIES
   INCLUDE_DIRS
     REQUIRED METIS_INCLUDE_DIR
+  USER_INCLUDE_DIRS
+    REQUIRED METIS_INCLUDE_DIR
   CLEAR METIS_LIBRARY PARMETIS_LIBRARY METIS_INCLUDE_DIR
   )


SVN_SILENT made messages (.desktop file)

--- plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake
+++ plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake
@@ -7,6 +7,7 @@
 Comment[de]=Eigene Benutzeroberfläche zum Einrichten von Zugängen, die die Pintxo-Verbindungsverwaltung verwenden.
 Comment[es]=Interfaz de configuración de cuentas personalizadas para las cuentas que usen el gestor de conexiones Pintxo.
 Comment[fi]=Pintxo-yhteyshallintaa käyttävien tilien mukautettu hallintakäyttöliittymä.
+Comment[ia]=Interfacie de usator pro configuration de conto personalisate pro contos usante le gerente de connexion Pintxo
 Comment[it]=Interfaccia utente personalizzata di configurazione account per account che usano il gestore di connessioni Pintxo.
 Comment[kk]=Pintxo байланыс менеджерін қолданатын тіркелгі пайдаланушы интерфейс параметрлерін ыңғайлау.
 Comment[nb]=Brukerflate for å sette opp egendefinerte kontoer ved bruk av Pintxo tilkoblingsbehandler.
@@ -33,6 +34,7 @@
 Name[de]=Benutzeroberfläche zur Einrichtung von Pintxo-Zugängen
 Name[es]=Interfaz de configuración de cuentas Pintxo
 Name[fi]=Pintxo-tilinmäärityksen käyttöliittymä
+Name[ia]=Interfacie de usator de configuration de conto de Pintxo
 Name[it]=Interfaccia utente di configurazione account Pintxo
 Name[kk]=Pintxo тіркелгі пайдаланушы интерфейсін баптау
 Name[nb]=Brukerflate for å sette opp Pintxo-konto


Bump to 0.0.5 (Fedora package of version 0.0.5 is since commit cd5291e)

--- VERSION.cmake
+++ VERSION.cmake
@@ -1,3 +1,3 @@
 SET(LIBREPO_MAJOR "0")
 SET(LIBREPO_MINOR "0")
-SET(LIBREPO_PATCH "4")
+SET(LIBREPO_PATCH "5")


Bump gpu-sd to 1.0.2

Bump gpu-sd to 1.0.2

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[x] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation

--- GPUSD.cmake
+++ GPUSD.cmake
@@ -5,7 +5,7 @@
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/gpu-sd/CMake)
 list(APPEND CMAKE_MODULE_PATH /usr/share/gpu-sd/CMake)
 list(APPEND CMAKE_MODULE_PATH /usr/local/share/gpu-sd/CMake)
-find_package(GPUSD 1.0.1)
+find_package(GPUSD 1.0.2)

 if(EQUALIZER_RELEASE OR (GPUSD_FOUND AND NOT GPUSD_LOCAL))
   return()


Added test that starts the pmuc application requesting its usage string

--- biicode.cmake
+++ biicode.cmake
@@ -7,3 +7,8 @@

 # Rename src/main.cpp to pmuc
 SET_TARGET_PROPERTIES(${BII_src_main_TARGET} PROPERTIES OUTPUT_NAME pmuc)
+
+add_test(NAME run_pmuc COMMAND ${BII_src_main_TARGET} --help)
+set_tests_properties(run_pmuc PROPERTIES PASS_REGULAR_EXPRESSION "usage")
+set_tests_properties(run_pmuc PROPERTIES PASS_REGULAR_EXPRESSION "--x3d")
+set_tests_properties(run_pmuc PROPERTIES PASS_REGULAR_EXPRESSION "--collada")


allow to override ZLIB_HOME on macOS

allow to override ZLIB_HOME on macOS

Summary: On macOS, users can install homebrew in their home directory, and thus they will need to provide `-DZLIB_HOME`. Unfortunately, that doesn't work as we override that. Let's fix it.

Reviewed By: agampe

Differential Revision: D26059041

fbshipit-source-id: 8100cccd759357ea9e9e158547de960554db6e88

--- cmake_modules/Commons.cmake
+++ cmake_modules/Commons.cmake
@@ -63,7 +63,7 @@
         set(REDEX_JSONCPP_LIBRARY ${JSONCPP_LIBRARY})
     endif()

-    if (APPLE)
+    if (APPLE AND (NOT ZLIB_HOME))
         #Static library is not installed on default path in MacOS because it conflicts with Xcode Version
         set(ZLIB_HOME "/usr/local/opt/zlib/")
     endif ()


Removed GSL dependency for new version of ARGoS.

--- src/cmake/BuzzBuildChecks.cmake
+++ src/cmake/BuzzBuildChecks.cmake
@@ -12,9 +12,6 @@
   link_directories(${ARGOS_LIBRARY_DIRS})
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ARGOS_PREFIX}/share/argos3/cmake)
   include(ARGoSCheckQTOpenGL)
-  # Look for GSL
-  find_package(GSL REQUIRED)
-  include_directories(${GSL_INCLUDE_DIR})
   # Look for Lua52
   find_package(Lua52 REQUIRED)
   include_directories(${LUA_INCLUDE_DIR})


Compilation on Windows

Compilation on Windows

--- salome_adm/cmake_files/FindSphinx.cmake
+++ salome_adm/cmake_files/FindSphinx.cmake
@@ -33,8 +33,11 @@
 # Get root dir locally, going up two levels from the exec:
 GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${SPHINX_EXECUTABLE}" PATH)
 GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH)
-SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
-
+IF(WIN32)
+  SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/site-packages")
+ELSE()
+  SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
+ENDIF()
 # Handle the standard arguments of the find_package() command:
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx REQUIRED_VARS SPHINX_EXECUTABLE)


PrintableOptions.cmake: Sync the file with Evolution changes

After https://gitlab.gnome.org/GNOME/evolution/-/issues/934

--- cmake/modules/PrintableOptions.cmake
+++ cmake/modules/PrintableOptions.cmake
@@ -49,6 +49,14 @@
 	add_printable_variable_bare(${_name})
 endmacro()

+macro(add_printable_variable_filepath _name _description _default_value)
+	if(_name STREQUAL "")
+		message(FATAL_ERROR "filepath variable name cannot be empty")
+	endif(_name STREQUAL "")
+	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
+	add_printable_variable_bare(${_name})
+endmacro()
+
 function(print_build_options)
 	message(STATUS "Configure options:")


disable clang warnings

disable clang warnings

compiling the bundled boost with clang without cxx11 causes hundreds of
warnings.

--- cmake/setup_compiler_flags_gnu.cmake
+++ cmake/setup_compiler_flags_gnu.cmake
@@ -92,6 +92,11 @@
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-unused-parameter")
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-unused-variable")

+  # without c++11 enabled, clang produces a ton of warnings in boost:
+  ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-c99-extensions")
+  ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-variadic-macros")
+  ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-c++11-extensions")
+
   IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.6")
     #
     # Clang versions prior to 3.6 emit a lot of false positives wrt


Removed old stuff

Removed old stuff

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

--- cmake/AddCXXCompileOptions.cmake
+++ cmake/AddCXXCompileOptions.cmake
@@ -194,43 +194,4 @@

 endif()

-# Old settings
-# if(NOT DEFINED CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION)
-#   if((CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
-#     # set(CMAKE_CXX_FLAGS "-stdlib=libc++")
-#     set(CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION "-std=c++${CMAKE_CXX_STANDARD}")
-#     set(CMAKE_CXX${CMAKE_CXX_STANDARD}_EXTENSION_COMPILE_OPTION "-std=gnu++${CMAKE_CXX_STANDARD}")
-#   elseif((CMAKE_SYSTEM_NAME STREQUAL "Windows") AND MSVC)
-#     set(CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION "")
-#     set(CMAKE_CXX${CMAKE_CXX_STANDARD}_EXTENSION_COMPILE_OPTION "")
-#   endif()
-# endif()
-
-# if (CMAKE_VERSION VERSION_LESS "3.1" AND CMAKE_COMPILER_IS_GNUCC)
-#   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
-#     CHECK_CXX_COMPILER_FLAG("-std=c++${CMAKE_CXX_STANDARD}"
-#       COMPILER_SUPPORTS_CXX${CMAKE_CXX_STANDARD})
-#     if(COMPILER_SUPPORTS_CXX${CMAKE_CXX_STANDARD})
-#       if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-#         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD} -stdlib=libc++")
-#       else()
-#         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
-#       endif()
-#     else()
-#       CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-#       if(COMPILER_SUPPORTS_CXX0X)
-#         if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-#           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++")
-#         else()
-#           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-#         endif()
-#       else()
-#         message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++${CMAKE_CXX_STANDARD}.")
-#       endif()
-#     endif()
-#   else() #gcc 6.1
-#     if(CMAKE_CXX_STANDARD EQUAL "98")
-#       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
-#     endif()
-#   endif()
-# endif()#cmake<3.1+endif()


Enable C++11 for Assimp 3.3.0 or greator (#1061)

--- cmake/DARTFindDependencies.cmake
+++ cmake/DARTFindDependencies.cmake
@@ -28,7 +28,11 @@
   # Check for missing symbols in ASSIMP (see #451)
   include(CheckCXXSourceCompiles)
   set(CMAKE_REQUIRED_DEFINITIONS "")
-  set(CMAKE_REQUIRED_FLAGS "")
+  if (NOT ASSIMP_VERSION VERSION_LESS 3.3.0 AND NOT MSVC)
+    set(CMAKE_REQUIRED_FLAGS "-std=c++11")
+  else()
+    set(CMAKE_REQUIRED_FLAGS "")
+  endif()
   set(CMAKE_REQUIRED_INCLUDES ${ASSIMP_INCLUDE_DIRS})
   set(CMAKE_REQUIRED_LIBRARIES ${ASSIMP_LIBRARIES})

@@ -76,6 +80,7 @@
     endif()
   endif(NOT ASSIMP_AIMATERIAL_CTOR_DTOR_DEFINED)

+  unset(CMAKE_REQUIRED_FLAGS)
   unset(CMAKE_REQUIRED_INCLUDES)
   unset(CMAKE_REQUIRED_LIBRARIES)
 endif()


[build] VC debug config will now use debug runtime. Note however that this does not effect all modules so winrtdebug-option should still be selected for debug builds.

--- cmake/modules/SetUpWindows.cmake
+++ cmake/modules/SetUpWindows.cmake
@@ -15,10 +15,10 @@
 #---Select compiler flags----------------------------------------------------------------
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -Z7")
 set(CMAKE_CXX_FLAGS_RELEASE        "-O2")
-set(CMAKE_CXX_FLAGS_DEBUG          "-Od -Z7")
+set(CMAKE_CXX_FLAGS_DEBUG          "-MDd -Od -Zi")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -Z7")
 set(CMAKE_C_FLAGS_RELEASE          "-O2")
-set(CMAKE_C_FLAGS_DEBUG            "-Od -Z7")
+set(CMAKE_C_FLAGS_DEBUG            "-MDd -Od -Zi")

 if(winrtdebug)
   set(BLDCXXFLAGS "-MDd -GR")


More alphabetization by drivers and then devices for human consumption.

svn path=/trunk/; revision=8109

--- cmake/modules/drivers-init.cmake
+++ cmake/modules/drivers-init.cmake
@@ -66,7 +66,8 @@
 # "ON" or "OFF" and this will reflect in inclusion/exclusion by default
 # (as shown by ccmake).
 #
-# Ordered alphabetically by second in each pair (the driver) for human
+# Ordered alphabetically by second in each pair (the driver) and then
+# alphabetically by device (the first in each pair) for human
 # consumption, but this is not necessary.

 set(DRIVERS_DEVICE_LIST
@@ -82,12 +83,16 @@
 "xcairo:cairo:ON"
 "cgm:cgm:ON"
 "dg300:dg300:OFF"
-"png:gd:ON" "jpeg:gd:ON" "gif:gd:ON"
+"gif:gd:ON"
+"jpeg:gd:ON"
+"png:gd:ON"
+"gcw:gcw:ON"
 # Do not implement gnome which is superseded by gcw
 #"gnome:gnome:OFF"
-"hp7470:hpgl:ON" "hp7580:hpgl:ON" "lj_hpgl:hpgl:ON"
+"hp7470:hpgl:ON"
+"hp7580:hpgl:ON"
+"lj_hpgl:hpgl:ON"
 "imp:impress:OFF"
-"gcw:gcw:ON"
 # Default off because poorly maintained (colours are incorrect)
 # must use software fill, and must run as root.
 "linuxvga:linuxvga:OFF"
@@ -109,9 +114,15 @@
 "pstex:pstex:OFF"
 "psttf:psttf:ON"
 "svg:svg:ON"
-"xterm:tek:OFF" "tek4010:tek:OFF" "tek4107:tek:OFF" "mskermit:tek:OFF"
-"versaterm:tek:OFF" "vlt:tek:OFF" "conex:tek:OFF" "tek4010f:tek:OFF"
+"conex:tek:OFF"
+"mskermit:tek:OFF"
+"tek4010:tek:OFF"
+"tek4010f:tek:OFF"
+"tek4107:tek:OFF"
 "tek4107f:tek:OFF"
+"versaterm:tek:OFF"
+"vlt:tek:OFF"
+"xterm:tek:OFF"
 "tk:tk:ON"
 "tkwin:tkwin:ON"
 "wingcc:wingcc:ON"


Update common.cmake

Update common.cmake

--- jdksavdecc-c/common.cmake
+++ jdksavdecc-c/common.cmake
@@ -59,7 +59,7 @@
 endif()

-set(LIBS ${LIBS} ${CHECK_LIBRARIES} ${PROJECT})
+set(LIBS ${PROJECT} ${LIBS} ${CHECK_LIBRARIES} ${PROJECT})

 include_directories( include  )


Fix cmake ENDIF() ending to match corresponding IF()

--- make/FindONCRPC.cmake
+++ make/FindONCRPC.cmake
@@ -207,7 +207,7 @@
          COPYONLY)

      ENDIF (ONCRPC_RPCGEN_FOUND)
-   ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux")
+   ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "SunOS")

    IF (CMAKE_SYSTEM_NAME MATCHES "Rtems")
      CONFIGURE_FILE(${RPC_INPUT_FILE_PREFIX}_svc.c.rtems


fix typos..

fix typos..

--- cmake/FindOpenALSoft.cmake
+++ cmake/FindOpenALSoft.cmake
@@ -48,4 +48,4 @@

 # for debugging
 message(STATUS "OPENALSOFT_INCLUDE_DIR  = '${OPENALSOFT_INCLUDE_DIR}'")
-message(STATUS "OPENALSOFT_LIBRARIES    = '${OPENALSOFT_LIBRARIES}'")
+message(STATUS "OPENALSOFT_LIBRARY      = '${OPENALSOFT_LIBRARY}'")


Fix for manpage

Fix for manpage

--- cmake/MyPackageStart.cmake
+++ cmake/MyPackageStart.cmake
@@ -136,6 +136,7 @@
   # We consider that if there is a README.pod, then it is a candidate for installation
   #
   IF (EXISTS README.pod)
+    STRING (TOUPPER ${PROJECT_NAME} _PROJECTNAME)
     MYPACKAGEMAN(README.pod ${_PROJECTNAME} "3" "${${PROJECT_NAME}}_VERSION")
   ENDIF ()
   #


fixed compile options when using cuda

fixed compile options when using cuda

--- cmake/megamol_config.cmake
+++ cmake/megamol_config.cmake
@@ -37,7 +37,11 @@
   add_compile_options("-fsized-deallocation") # TODO git history suggests this was required for cuda in 2019, still required?
   add_compile_options("-Wno-narrowing" "-Wno-non-pod-varargs") # Prevent build fail.
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  add_compile_options("/MP" "/permissive-" "/Zc:twoPhase-" "/utf-8")
+  #add_compile_options("/MP" "/permissive-" "/Zc:twoPhase-" "/utf-8")
+  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/MP>)
+  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/permissive->)
+  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/Zc:twoPhase->)
+  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/utf-8>)
   add_compile_definitions("NOMINMAX")
 else ()
   message(FATAL_ERROR "Unsupported compiler specified: '${CMAKE_CXX_COMPILER_ID}'")


chore: better names for sysdig dependencies cmake

Signed-off-by: Leonardo Di Donato <2012e0ca99d70aa6c893822ff73002216e5dba72@gmail.com>

--- cmake/modules/sysdig.cmake
+++ cmake/modules/sysdig.cmake
@@ -11,19 +11,20 @@
 # specific language governing permissions and limitations under the License.
 #

-set(SYSDIG_WORKING_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/sysdig-repo")
-set(SYSDIG_REPO_DIR "${CMAKE_BINARY_DIR}/sysdig-repo")
+set(SYSDIG_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/sysdig-repo")
+set(SYSDIG_CMAKE_WORKING_DIR "${CMAKE_BINARY_DIR}/sysdig-repo")

-file(MAKE_DIRECTORY ${SYSDIG_REPO_DIR})
+file(MAKE_DIRECTORY ${SYSDIG_CMAKE_WORKING_DIR})
 # cd /path/to/build && cmake /path/to/source
-execute_process(COMMAND "${CMAKE_COMMAND}" ${SYSDIG_WORKING_DIR} WORKING_DIRECTORY ${SYSDIG_REPO_DIR})
+execute_process(COMMAND "${CMAKE_COMMAND}" ${SYSDIG_CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${SYSDIG_CMAKE_WORKING_DIR})

 # todo(leodido, fntlnz) > use the following one when CMake version will be >= 3.13

-# execute_process(COMMAND "${CMAKE_COMMAND}" -B ${SYSDIG_REPO_DIR} WORKING_DIRECTORY "${SYSDIG_WORKING_DIR}")
+# execute_process(COMMAND "${CMAKE_COMMAND}" -B ${SYSDIG_CMAKE_WORKING_DIR} WORKING_DIRECTORY
+# "${SYSDIG_CMAKE_SOURCE_DIR}")

-execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${SYSDIG_REPO_DIR}")
-set(SYSDIG_SOURCE_DIR "${SYSDIG_REPO_DIR}/sysdig-prefix/src/sysdig")
+execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${SYSDIG_CMAKE_WORKING_DIR}")
+set(SYSDIG_SOURCE_DIR "${SYSDIG_CMAKE_WORKING_DIR}/sysdig-prefix/src/sysdig")

 # jsoncpp
 set(JSONCPP_SRC "${SYSDIG_SOURCE_DIR}/userspace/libsinsp/third-party/jsoncpp")


disabled mpi until we fix it

disabled mpi until we fix it

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

--- cmake/pcl_find_boost.cmake
+++ cmake/pcl_find_boost.cmake
@@ -11,7 +11,8 @@
   SET(Boost_ADDITIONAL_VERSIONS "1.47" "1.47.0")
 endif(${CMAKE_VERSION} VERSION_LESS 2.8.5)

-find_package(Boost 1.40.0 REQUIRED COMPONENTS system filesystem thread date_time iostreams serialization mpi)
+#find_package(Boost 1.40.0 REQUIRED COMPONENTS system filesystem thread date_time iostreams serialization mpi)
+find_package(Boost 1.40.0 REQUIRED COMPONENTS system filesystem thread date_time iostreams serialization)

 if(Boost_FOUND)
   set(BOOST_FOUND TRUE)


* [MacOS] BugFix: Correct the MacOS executable not being output to the game directory when no build configuration is provided.

--- Tools/CMake/basics.cmake
+++ Tools/CMake/basics.cmake
@@ -386,7 +386,7 @@
     else()
         add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files})
     endif()
-
+
     # Torque requires c++17
     target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)

@@ -478,18 +478,13 @@
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
 endif()

-if(UNIX AND NOT APPLE)
+if(UNIX)
 	SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${projectOutDir}")
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${projectOutDir}")
 	SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
-endif()
-
-if(APPLE)
-  SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}")
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}")
-  SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
+    SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}")
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}")
 endif()

 # fix the debug/release subfolders on windows


CMake: Hide a warning with clang: -Wno-unsupported-friend

git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@32811 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/setup_compiler_flags_gnu.cmake
+++ deal.II/cmake/setup_compiler_flags_gnu.cmake
@@ -105,6 +105,7 @@
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-unused-function")
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-unused-private-field")
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-unused-variable")
+  ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-unsupported-friend")
 ENDIF()


Support extra arguments in fasm2bit and bit2bin

Support extra arguments specific to target boards in
commands FASM_TO_BIT and BIT_TO_BIN

Signed-off-by: Lukasz Dalek <695c38bff956529fae97aed0393d4847bb29b4f7@antmicro.com>

--- make/devices.cmake
+++ make/devices.cmake
@@ -1111,6 +1111,12 @@
     if(${USE_FASM})
       get_target_property_required(FASM_TO_BIT ${ARCH} FASM_TO_BIT)
       get_target_property_required(FASM_TO_BIT_CMD ${ARCH} FASM_TO_BIT_CMD)
+      if (TARGET ${ARCH}_${DEVICE}_${BOARD})
+        get_target_property(FASM_TO_BIT_EXTRA_ARGS ${ARCH}_${DEVICE}_${BOARD} FASM_TO_BIT_EXTRA_ARGS)
+        if (${FASM_TO_BIT_EXTRA_ARGS} STREQUAL NOTFOUND)
+          set(FASM_TO_BIT_EXTRA_ARGS "")
+        endif()
+      endif()
       get_target_property_required(PYTHON3 env PYTHON3)
       string(CONFIGURE ${FASM_TO_BIT_CMD} FASM_TO_BIT_CMD_FOR_TARGET)
       separate_arguments(
@@ -1176,6 +1182,12 @@
     set(OUT_BIN ${OUT_LOCAL}/${TOP}.${BIN_EXTENSION})
     get_target_property_required(BIT_TO_BIN ${ARCH} BIT_TO_BIN)
     get_target_property_required(BIT_TO_BIN_CMD ${ARCH} BIT_TO_BIN_CMD)
+    if (TARGET ${ARCH}_${DEVICE}_${BOARD})
+      get_target_property(BIT_TO_BIN_EXTRA_ARGS ${ARCH}_${DEVICE}_${BOARD} BIT_TO_BIN_EXTRA_ARGS)
+        if (${BIT_TO_BIN_EXTRA_ARGS} STREQUAL NOTFOUND)
+          set(BIT_TO_BIN_EXTRA_ARGS "")
+        endif()
+    endif()
     string(CONFIGURE ${BIT_TO_BIN_CMD} BIT_TO_BIN_CMD_FOR_TARGET)
     separate_arguments(
       BIT_TO_BIN_CMD_FOR_TARGET_LIST UNIX_COMMAND ${BIT_TO_BIN_CMD_FOR_TARGET}


i#58 MacOS: only build 32-bit for release packages

Limits package.cmake to 32-bit only for Mac.

Review-URL: https://codereview.appspot.com/272080043

--- make/package.cmake
+++ make/package.cmake
@@ -100,6 +100,11 @@
 set(CTEST_SOURCE_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}/..")
 include("${CTEST_SCRIPT_DIRECTORY}/../suite/runsuite_common_pre.cmake")

+if (APPLE)
+  # DRi#58: core DR does not yet support 64-bit Mac
+  set(arg_32_only ON)
+endif ()
+
 set(base_cache "
   BUILD_NUMBER:STRING=${arg_build}
   UNIQUE_BUILD_NUMBER:STRING=${arg_ubuild}


Added minimum version.

Added minimum version.

--- cmake/conf.cmake
+++ cmake/conf.cmake
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 2.8.7)
 cmake_policy(SET CMP0054 NEW)

 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")


Add MSVC warnings (off by default at /W4)

--- cmake/msvc.cmake
+++ cmake/msvc.cmake
@@ -2,7 +2,7 @@
 # MSVC options
 #

-set(CMAKE_CXX_FLAGS "/nologo /std:c++latest /W4 /WX /EHsc")
+set(CMAKE_CXX_FLAGS "/nologo /std:c++latest /EHsc /W4 /WX")
 set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Zi /Od /RTC1 /sdl /MTd")
 set(CMAKE_CXX_FLAGS_RELEASE "/DNDEBUG /Ox /MT")

@@ -10,3 +10,11 @@
   /D _SBCS
   /D WIN32_LEAN_AND_MEAN
 )
+
+# https://docs.microsoft.com/en-us/cpp/preprocessor/compiler-warnings-that-are-off-by-default
+string(CONCAT CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}"
+  " /w34265"
+  " /w34777"
+  " /w34946"
+  " /w35038"
+)


Update borsch script

Update borsch script

--- cmake/util.cmake
+++ cmake/util.cmake
@@ -128,7 +128,12 @@

 function(get_cpack_filename ver name)
     get_compiler_version(COMPILER)
-    get_prefix(STATIC_PREFIX BUILD_STATIC_LIBS)
+
+    if(NOT DEFINED BUILD_STATIC_LIBS)
+      set(BUILD_STATIC_LIBS OFF)
+    endif()
+
+    get_prefix(STATIC_PREFIX ${BUILD_STATIC_LIBS})

     set(${name} ${PROJECT_NAME}-${ver}-${STATIC_PREFIX}${COMPILER} PARENT_SCOPE)
 endfunction()


update

update

--- modules/restbed.cmake
+++ modules/restbed.cmake
@@ -1,9 +1,5 @@
 if(NOT TARGET restbed)

-<<<<<<< HEAD
-  # Module subdirectory
-  add_subdirectory("restbed")
-=======
   # Module library
   file(GLOB_RECURSE SOURCE_FILES "restbed/source/corvusoft/restbed/*.cpp")
   add_library(restbed ${SOURCE_FILES})
@@ -13,6 +9,5 @@

   # Module folder
   set_target_properties(restbed PROPERTIES FOLDER modules/restbed)
->>>>>>> d4e2175585fd79aa7c9264df236713c96a25140e

 endif()


Add rt support for some unsupported platform

--- duktape.cmake
+++ duktape.cmake
@@ -8,6 +8,6 @@

 if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
   target_link_libraries(duktape
-    m dl
+    m dl rt
   )
 endif()


Bug #3107: pass down the correct linker and compiler flags to get us symbols

--- CMake/SuperBuild.cmake
+++ CMake/SuperBuild.cmake
@@ -23,8 +23,13 @@
 SET(EP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})

 IF(MSVC90 OR MSVC10)
-  SET(EP_COMMON_C_FLAGS "${CMAKE_C_FLAGS} /bigobj /MP")
-  SET(EP_COMMON_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /MP")
+  # /Zi will make the compiler generate symbols.
+  SET(EP_COMMON_C_FLAGS "${CMAKE_C_FLAGS} /bigobj /MP /Zi")
+  SET(EP_COMMON_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /MP /Zi")
+  # tell the linker to generate symbols and patch up the final binary
+  set(EP_COMMON_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /debug")
+  set(EP_COMMON_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /debug")
+  set(EP_COMMON_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /debug")
 ELSE()
   IF(${BUILD_SHARED_LIBS})
     SET(EP_COMMON_C_FLAGS "${CMAKE_C_FLAGS} -DLINUX_EXTRA")
@@ -33,6 +38,11 @@
     SET(EP_COMMON_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -DLINUX_EXTRA")
     SET(EP_COMMON_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DLINUX_EXTRA")
   ENDIF()
+  # These are not relevant for linux but we set them anyway to keep
+  # the variable bits below symmetric.
+  set(EP_COMMON_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+  set(EP_COMMON_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
+  set(EP_COMMON_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
 ENDIF()

 SET(EP_COMMON_ARGS
@@ -48,6 +58,9 @@
   -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
   -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}
   -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}
+  -DCMAKE_EXE_LINKER_FLAGS:STRING=${EP_COMMON_EXE_LINKER_FLAGS}
+  -DCMAKE_MODULE_LINKER_FLAGS:STRING=${EP_COMMON_MODULE_LINKER_FLAGS}
+  -DCMAKE_SHARED_LINKER_FLAGS:STRING=${EP_COMMON_SHARED_LINKER_FLAGS}
 )

 # Compute -G arg for configuring external projects with the same CMake generator:


update

update

--- modules/zlib.cmake
+++ modules/zlib.cmake
@@ -43,7 +43,7 @@
   if(MSVC)
     list(APPEND ${SOURCE_FILES} "zlib/contrib/masmx64/inffas8664.c")
   endif()
-  add_library(zlib ${SOURCE_FILES} ${ASSEMBLER_FILES})
+  add_library(zlib ${SOURCE_FILES})
   if(MSVC)
     # C4127: conditional expression is constant
     # C4131: 'function' : uses old-style declarator


delete svn defines

delete svn defines

--- test/openVibeTests.cmake
+++ test/openVibeTests.cmake
@@ -40,9 +40,6 @@

 set(CTEST_BUILD_NAME                    "${osname}_${cpu}_${distrib}${distrib-release}")

-## -- SVN command
-## ----------------
-find_program(CTEST_SVN_COMMAND NAMES svn)

 # -----------------------------------------------------------
 # -- build specific


CMake: Fix copy&paste error

CMake: Fix copy&paste error

git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@30300 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake
+++ deal.II/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake
@@ -58,7 +58,7 @@
   STRING(TOLOWER "${DEAL_II_BUILD_TYPE}" _deal_ii_build_type)

   IF( NOT "${_cmake_build_type}" MATCHES "^(debug|release)$"
-      OR NOT _deal_ii_build_type MATCHES "${_cmake_build_type}"
+      OR NOT _deal_ii_build_type MATCHES "${_cmake_build_type}" )

     IF("${DEAL_II_BUILD_TYPE}" STREQUAL "DebugRelease")
       SET(_new_build_type "Debug")


get rid of lib in FindArmadillo

get rid of lib in FindArmadillo

--- CMake/FindArmadillo.cmake
+++ CMake/FindArmadillo.cmake
@@ -63,7 +63,7 @@

 find_library (ARMADILLO_LIBRARIES armadillo
   PATHS
-  $ENV{ARMA_DIR}/lib
+  $ENV{ARMA_DIR}
   /usr/lib
   /usr/local/lib
   /opt/lib


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


Update libvorbis

Update libvorbis

--- packages/vorbis.cmake
+++ packages/vorbis.cmake
@@ -1,7 +1,7 @@
 ExternalProject_Add(vorbis
     DEPENDS ogg
-    URL "http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.gz"
-    URL_HASH SHA256=eee09a0a13ec38662ff949168fe897a25d2526529bc7e805305f381c219a1ecb
+    URL "http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz"
+    URL_HASH SHA256=6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce
     UPDATE_COMMAND ""
     CONFIGURE_COMMAND ${EXEC} <SOURCE_DIR>/configure
         --host=${TARGET_ARCH}


Updated FindCorrade.cmake from Corrade repository.

--- modules/FindCorrade.cmake
+++ modules/FindCorrade.cmake
@@ -154,6 +154,12 @@
 set(CORRADE_INTERCONNECT_LIBRARIES ${CORRADE_INTERCONNECT_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
 set(CORRADE_PLUGINMANAGER_LIBRARIES ${CORRADE_PLUGINMANAGER_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
 set(CORRADE_TESTSUITE_LIBRARIES ${CORRADE_TESTSUITE_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
+
+# At least static build needs this
+if(UNIX OR ${CMAKE_SYSTEM_NAME} STREQUAL NaCl)
+    set(CORRADE_PLUGINMANAGER_LIBRARIES ${CORRADE_PLUGINMANAGER_LIBRARIES} dl)
+endif()
+
 mark_as_advanced(CORRADE_UTILITY_LIBRARY
     CORRADE_INTERCONNECT_LIBRARY
     CORRADE_PLUGINMANAGER_LIBRARY


ENH: wrong author for FFSforGMM remote module

--- Modules/Remote/otbFFSforGMM.remote.cmake
+++ Modules/Remote/otbFFSforGMM.remote.cmake
@@ -1,4 +1,4 @@
-#Contact: Rémi Cresson <remi.cresson@teledetection.fr>
+#Contact: Adrien Lagrange <adrien.lagrange@irit.fr>
 otb_fetch_module(OTBFastFeaturesSelection
   "This module implements a method to perform a fast forward feature selection using a Gaussian Mixture Model.
 A more detailed description can be found on the project website:
@@ -6,4 +6,4 @@
 "
   GIT_REPOSITORY https://github.com/Laadr/otbFFSforGMM.git
   GIT_TAG master
-)
+  )


PKG: warning when non-rpath depencencies are found on macosx

--- SuperBuild/Packaging/PackageHelper.cmake
+++ SuperBuild/Packaging/PackageHelper.cmake
@@ -803,6 +803,10 @@

   is_system_dll(is_system "${infile}")
   if(EXISTS ${infile} AND NOT is_system)
+    if(APPLE)
+      # We want all non-system deps to start with rpath
+      message(WARNING "Found dependency without relative path : ${infile}")
+    endif()
     get_filename_component(infile ${infile} NAME)
   endif()


Mono errors on mac

Mono errors on mac

--- build/modules/FindMono.cmake
+++ build/modules/FindMono.cmake
@@ -91,7 +91,7 @@

 ENDIF()

-IF(MONO_LOOK_FOR_LIBRARIES)
+IF(MONO_FOUND AND MONO_LOOK_FOR_LIBRARIES)

   IF(WIN32)  # Windows

@@ -251,6 +251,8 @@
     ELSE(MONO_ONLY_LIBRARIES_REQUIRED)
       MESSAGE(FATAL_ERROR "Could not find one or more of the following: mono, mcs, gmcs, gacutil, Mono development files")
     ENDIF(MONO_ONLY_LIBRARIES_REQUIRED)
+  ELSE(MONO_FIND_REQUIRED)
+    MESSAGE(STATUS "Could not find Mono development files! Building without scripting support.")
   ENDIF(MONO_FIND_REQUIRED)
 ENDIF(MONO_FOUND)


CodeGenerator.cmake: Fix cache variables type

Change-Id: Iad8ce9e211f20dc420dcccdb16d0452bd49e5038

--- CMake/CodeGenerator.cmake
+++ CMake/CodeGenerator.cmake
@@ -11,10 +11,10 @@
 set (ENABLE_CODE_GENERATION_FORMAT_CHECK FALSE CACHE BOOL "Check if codding style of generated code is correct")
 mark_as_advanced(ENABLE_CODE_GENERATION_FORMAT_CHECK)

-set (KURENTO_MODULES_DIR /usr/share/kurento/modules CACHE STRING "Directory where kurento modules descriptors can be found")
+set (KURENTO_MODULES_DIR /usr/share/kurento/modules CACHE PATH "Directory where kurento modules descriptors can be found")
 mark_as_advanced(KURENTO_MODULES_DIR)

-set (KURENTO_MODULES_DIR_INSTALL_PREFIX kurento/modules CACHE STRING "Directory where kurento modules descriptors are installed (relative to \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}). Also .so module files are installed using this prefix, but relative to \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})")
+set (KURENTO_MODULES_DIR_INSTALL_PREFIX kurento/modules CACHE PATH "Directory where kurento modules descriptors are installed (relative to \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}). Also .so module files are installed using this prefix, but relative to \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})")
 mark_as_advanced(KURENTO_MODULES_DIR_INSTALL_PREFIX)

 set (CMAKE_MODULES_INSTALL_DIR


link libjpeg against DLL version of mscvrt library

makefile.vc builds libjpeg static with /MT flags that
link with static mscvt. This libjpeg when linking against
gdal throws link error as gdal is linked against MSVCRT
dll version so as all other dependencies in superbuild.
This makes external libjpeg currently unusabe with gdal
and end upwith two libjpeg in the build. This commit
build libjpeg as cmake project which automatically add /MD
depending on configuration and finally to have a single libjpeg
used in GDAL and libtiff

http://dash.orfeo-toolbox.org/testDetails.php?test=28153014&build=170814

--- CMake/External_jpeg.cmake
+++ CMake/External_jpeg.cmake
@@ -15,43 +15,27 @@
   set(JPEG_SB_SRC ${CMAKE_BINARY_DIR}/${proj}/src/${proj})

   if(WIN32)
-
-
-   ExternalProject_Add(${proj}_build
+
+    ExternalProject_Add(${proj}
       PREFIX ${proj}
       URL "http://www.ijg.org/files/jpegsr8c.zip"
       URL_MD5 2af71a567af8f60a649b2fcc87c88192
       SOURCE_DIR ${JPEG_SB_SRC}
       BINARY_DIR ${JPEG_SB_BUILD_DIR}
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-      PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${JPEG_SB_SRC} ${JPEG_SB_BUILD_DIR}
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND nmake /f ${JPEG_SB_BUILD_DIR}/makefile.vc nodebug=1
-      INSTALL_COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt
-      ${CMAKE_BINARY_DIR}/${proj}/_install
-    )
-
-    ExternalProject_Add_Step(${proj}_build copy_jconfig
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${JPEG_SB_BUILD_DIR}/jconfig.vc ${JPEG_SB_BUILD_DIR}/jconfig.h
-      DEPENDEES configure
-      DEPENDERS build
-    )
-
-
-    ExternalProject_Add(${proj}
-      PREFIX ${proj}/_install
-      DOWNLOAD_COMMAND ""
-      SOURCE_DIR ${proj}/_install
-      BINARY_DIR ${JPEG_SB_BUILD_DIR}
-      INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+      PATCH_COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt ${JPEG_SB_SRC}
       CMAKE_CACHE_ARGS
         -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}
         -DCMAKE_BUILD_TYPE:STRING=Release
-        -DJPEG_BUILD_DIR:STRING=${JPEG_SB_BUILD_DIR}
-      DEPENDS ${proj}_build
-      CMAKE_COMMAND
+        -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
     )
+
+    ExternalProject_Add_Step(${proj} copy_jconfig
+      COMMAND ${CMAKE_COMMAND} -E copy
+        ${JPEG_SB_SRC}/jconfig.vc ${JPEG_SB_SRC}/jconfig.h
+      DEPENDEES patch
+      DEPENDERS build
+    )

   else()


Give path to CMake to find linuxtrack

Give path to CMake to find linuxtrack

--- CMake/FindOptiTrack.cmake
+++ CMake/FindOptiTrack.cmake
@@ -13,7 +13,7 @@
 # Attempt to define OPTITRACK_INCLUDE_DIR if undefined
 find_path(OPTITRACK_INCLUDE_DIR
 	NAMES cameralibrary.h linuxtrack.h
-	PATHS "$ENV{NP_CAMERASDK}"
+	PATHS "$ENV{NP_CAMERASDK}" "/opt/linuxtrack/include"
 	PATH_SUFFIXES "include"
 	NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
 )


Make Eigen dependency opt-out.

Make Eigen dependency opt-out.

--- CMake/IRTKBuildDeps.cmake
+++ CMake/IRTKBuildDeps.cmake
@@ -56,7 +56,7 @@
   add_definitions(-DHAS_VTK -DHAVE_VTK)
 endif()

-option(WITH_EIGEN "Build with optional support for Eigen." OFF)
+option(WITH_EIGEN "Build with optional support for Eigen." ON)
 if(WITH_EIGEN)
   find_package(Eigen3 REQUIRED)
   if(DEFINED EIGEN3_USE_FILE)