Fix wrong output directory for 3rdparty

Fix wrong output directory for 3rdparty

--- cmake/FindRadium.cmake
+++ cmake/FindRadium.cmake
@@ -59,30 +59,30 @@
     ############################################################################
     # Get dependencies if not already specified
     IF(NOT EIGEN3_INCLUDE_DIR)
-        set(EIGEN3_INCLUDE_DIR ${RADIUM_ROOT_DIR}/${CMAKE_BUILD_TYPE}/3rdPartyLibraries/include)
+        set(EIGEN3_INCLUDE_DIR ${RADIUM_BUNDLE_DIRECTORY}/3rdPartyLibraries/include)
     ENDIF(NOT EIGEN3_INCLUDE_DIR)

     IF (NOT ASSIMP_LIBRARIES)
         FIND_LIBRARY ( ASSIMP_LIBRARIES
             NAMES assimp assimpd
-            PATHS ${RADIUM_ROOT_DIR}/${CMAKE_BUILD_TYPE}/3rdPartyLibraries/lib
+            PATHS ${RADIUM_BUNDLE_DIRECTORY}/3rdPartyLibraries/lib
             )
     ENDIF (NOT ASSIMP_LIBRARIES)

     IF(NOT ASSIMP_INCLUDE_DIR)
-        set(ASSIMP_INCLUDE_DIR ${RADIUM_ROOT_DIR}/${CMAKE_BUILD_TYPE}/3rdPartyLibraries/include)
+        set(ASSIMP_INCLUDE_DIR ${RADIUM_BUNDLE_DIRECTORY}/3rdPartyLibraries/include)
     ENDIF(NOT ASSIMP_INCLUDE_DIR)

     IF (NOT GLBINDING_LIBRARIES)
         FIND_LIBRARY ( GLBINDING_LIBRARIES
             NAMES glbinding glbindingd
-            PATHS ${RADIUM_ROOT_DIR}/${CMAKE_BUILD_TYPE}/3rdPartyLibraries/lib
+            PATHS ${RADIUM_BUNDLE_DIRECTORY}/3rdPartyLibraries/lib
             )
     ENDIF (NOT GLBINDING_LIBRARIES)

     IF(NOT GLBINDING_INCLUDE_DIR)
-        set(GLBINDING_INCLUDE_DIR ${RADIUM_ROOT_DIR}/${CMAKE_BUILD_TYPE}/3rdPartyLibraries/include)
+        set(GLBINDING_INCLUDE_DIR ${RADIUM_BUNDLE_DIRECTORY}/3rdPartyLibraries/include)
     ENDIF(NOT GLBINDING_INCLUDE_DIR)

     SET( RADIUM_INCLUDE_DIR)


Use keyword version of target_link_libraries

--- libmrio.cmake
+++ libmrio.cmake
@@ -13,12 +13,12 @@
   find_package(NETCDF REQUIRED)
   message(STATUS "NetCDF include directory: ${NETCDF_INCLUDE_DIR}")
   message(STATUS "NetCDF library: ${NETCDF_LIBRARY}")
-  target_link_libraries(libmrio netcdf)
+  target_link_libraries(libmrio PRIVATE netcdf)

   find_package(NETCDF_CPP4 REQUIRED)
   message(STATUS "NetCDF_c++4 include directory: ${NETCDF_CPP4_INCLUDE_DIR}")
   message(STATUS "NetCDF_c++4 library: ${NETCDF_CPP4_LIBRARY}")
-  target_link_libraries(libmrio netcdf_c++4)
+  target_link_libraries(libmrio PRIVATE netcdf_c++4)

   target_compile_definitions(libmrio PUBLIC LIBMRIO_WITH_NETCDF)
 endif()


Support all platforms in FindSteamworks.cmake

--- cmake/Modules/FindSteamworks.cmake
+++ cmake/Modules/FindSteamworks.cmake
@@ -2,10 +2,34 @@
 # Copyright (C) 2014 Luke San Antonio
 # All rights reserved.

+set(SUBDIR "")
+if(UNIX)
+    if(NOT APPLE)
+        if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+            set(SUBDIR "linux64")
+        else()
+            set(SUBDIR "linux32")
+        endif()
+    # We are on OS X
+    else()
+        set(SUBDIR "osx32")
+    endif()
+
+elseif(WIN32)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(SUBDIR "win64")
+    else()
+        message(SEND_ERROR "Cannot build on 32bit because of Steamworks")
+    endif()
+
+    set(SUBDIR "win64")
+endif()
+
+
 find_path(Steamworks_INCLUDE_DIR steam_api.h HINTS ${Steamworks_ROOT}/public
           PATH_SUFFIXES steam)
 find_library(Steamworks_LIB steam_api HINTS ${Steamworks_ROOT}
-             PATH_SUFFIXES redistributable_bin/linux64)
+             PATH_SUFFIXES redistributable_bin/${SUBDIR})

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Steamworks DEFAULT_MSG Steamworks_LIB


Rebuild ROOT for python 3.8 and devtoolset-7 on CentOS 7.


Made spinlocks not found if pthreads are not detected

--- cmake/FindSpinlock.cmake
+++ cmake/FindSpinlock.cmake
@@ -13,4 +13,8 @@
 		MESSAGE(STATUS "Spinlock support not found")
 		SET(SPINLOCK_FOUND FALSE)
 	ENDIF (HAVE_SPINLOCK)
+ELSE ()
+		MESSAGE(STATUS "Spinlock support not found due to no pthreads available")
+		SET(SPINLOCK_FOUND FALSE)
 ENDIF ()
+


cmake: OpenCVConfig.cmake: fix message

cmake: OpenCVConfig.cmake: fix message

--- cmake/OpenCVConfig.cmake
+++ cmake/OpenCVConfig.cmake
@@ -156,9 +156,10 @@
   endif()
 else()
   if(NOT OpenCV_FIND_QUIETLY)
-# TODO Fix message
-    message(WARNING "Found OpenCV 2.4.3 Windows Super Pack but it has not binaries compatible with your configuration.
-    You should manually point CMake variable OpenCV_DIR to your build of OpenCV library.")
+    message(WARNING
+"Found OpenCV Windows Pack but it has not binaries compatible with your configuration.
+You should manually point CMake variable OpenCV_DIR to your build of OpenCV library."
+    )
   endif()
   set(OpenCV_FOUND FALSE CACHE BOOL "" FORCE)
   set(OPENCV_FOUND FALSE CACHE BOOL "" FORCE)


install new headers like "opencv2/core.hpp"

--- cmake/OpenCVModule.cmake
+++ cmake/OpenCVModule.cmake
@@ -488,7 +488,7 @@

   file(GLOB_RECURSE lib_srcs "src/*.cpp")
   file(GLOB_RECURSE lib_int_hdrs "src/*.hpp" "src/*.h")
-  file(GLOB lib_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
+  file(GLOB lib_hdrs "include/opencv2/*.hpp" "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
   file(GLOB lib_hdrs_detail "include/opencv2/${name}/detail/*.hpp" "include/opencv2/${name}/detail/*.h")
   file(GLOB_RECURSE lib_srcs_apple "src/*.mm")
   if (APPLE)
@@ -629,7 +629,7 @@
   if(OPENCV_MODULE_${the_module}_HEADERS AND ";${OPENCV_MODULES_PUBLIC};" MATCHES ";${the_module};")
     foreach(hdr ${OPENCV_MODULE_${the_module}_HEADERS})
       string(REGEX REPLACE "^.*opencv2/" "opencv2/" hdr2 "${hdr}")
-      if(hdr2 MATCHES "^(opencv2/.*)/[^/]+.h(..)?$")
+      if(hdr2 MATCHES "^(opencv2/?.*)/[^/]+.h(..)?$")
         install(FILES ${hdr} DESTINATION "${OPENCV_INCLUDE_INSTALL_PATH}/${CMAKE_MATCH_1}" COMPONENT dev)
       endif()
     endforeach()


Update fifechan to fifechan 0.1.4 for fife 0.4.1

--- cmake/get-fifechan.cmake
+++ cmake/get-fifechan.cmake
@@ -35,8 +35,8 @@
       PREFIX              ${DEPENDENCY_EXTRACT_DIR}
       DOWNLOAD_DIR        ${DEPENDENCY_DOWNLOAD_DIR}
       #URL                 https://github.com/fifengine/fifechan/releases/tag/${FIFECHAN_VERSION}/fifechan-v${FIFECHAN_VERSION}-VC14.zip
-      URL                 https://ci.appveyor.com/api/buildjobs/eavnmgwxu19xa6r6/artifacts/fifechan-shared-VC14-x86.zip
-      URL_MD5             a5707da453fc0788eab55c73f7772f03
+      URL                 https://ci.appveyor.com/api/buildjobs/k6gfl3mdxnkhy9mn/artifacts/fifechan-shared-0.1.4-VC14-x86.zip
+      URL_MD5             4925a3d07994b1e360e034ed0475dc37
       CONFIGURE_COMMAND   ""
       BUILD_COMMAND       ""
       INSTALL_COMMAND


Jenkins: test

Jenkins: test

--- cmake/globalmacros.cmake
+++ cmake/globalmacros.cmake
@@ -373,24 +373,20 @@
 # Example ivw_enable_modules_if(IVW_INTEGRATION_TEST GLFW Base)
 # Needs to be called before ivw_register_modules
 function(ivw_enable_modules_if value)
-    if(NOT ${value})
+    if(NOT value)
         return()
     endif()
-    ivw_dir_to_mod_dep(mods ${ARGN})
-    set(enabled_modules "")
-    foreach(mod IN LISTS mods)
+    foreach(name IN LISTS ARGN)
+        ivw_dir_to_mod_dep(mod ${name})
         if(DEFINED ${mod}_opt)
             if(NOT ${${mod}_opt})
                 ivw_add_module_option_to_cache(${mod} ON FORCE)
-                list(APPEND enabled_modules ${mod})
-            endif()
-        elseif(NOT ${${mod}_enableExternal})
+                message(STATUS "${name} was set to on, due to dependency from ${value}")
+            endif()
+        elseif(NOT ${mod}_enableExternal)
             set("${mod}_enableExternal" ON CACHE INTERNAL "Enable module for external dependency" FORCE)
-            list(APPEND enabled_modules ${mod})
-        endif()
-    endforeach()
-    foreach(mod IN LISTS enabled_modules)
-        message(STATUS "${${mod}_name} (${${mod}_opt}) was set to on, due to dependency towards ${value}")
+            message(STATUS "${name} was set to on, due to dependency from ${value}")
+        endif()
     endforeach()
 endfunction()


CMake: Better warning messages

CMake: Better warning messages

--- cmake/globalmacros.cmake
+++ cmake/globalmacros.cmake
@@ -202,8 +202,18 @@
                 if(${dir} STREQUAL ${l_name})
                     set(${retval} TRUE PARENT_SCOPE)
                     return()
+                else()
+                    ivw_message(WARNING "Found invalid module \"${dir}\" at \"${module_path}\". "
+                        "ivw_module called with \"${name}\" which is different from the directory \"${dir}\""
+                        "They should be the same except for casing.")
                 endif()
-            endif()
+            else()
+                ivw_message(WARNING "Found invalid module \"${dir}\" at \"${module_path}\". "
+                    "CMakeLists.txt is missing")
+            endif()
+        else()
+            ivw_message(WARNING "Found invalid module dir \"${dir}\" at \"${module_path}\". "
+                    "Dir names should be all lowercase and without spaces")
         endif()
     endif()
     set(${retval} FALSE PARENT_SCOPE)
@@ -269,9 +279,6 @@
                     encodeLineBreaks(cdescription ${description})
                     set("${mod}_description" ${cdescription} CACHE INTERNAL "Module description")
                 endif()
-            else()
-                ivw_message(WARNING "Found invalid module dir name \"${dir}\" at \"${module_path}\". "
-                    "Dir names should be all lowercase and without spaces")
             endif()
         endforeach()
     endforeach()


iOS: set CMAKE_SYSTEM_PROCESSOR in toolchain file

This is required that the right architecture is chosen during the cmake run.
Otherwise it is not possible to compile WITH_NEON.

--- cmake/iOSToolchain.cmake
+++ cmake/iOSToolchain.cmake
@@ -144,8 +144,10 @@
 # NOTE: Currently both ARCHS_STANDARD_32_BIT and ARCHS_UNIVERSAL_IPHONE_OS set armv7 only, so set both manually
 if (${IOS_PLATFORM} STREQUAL "OS")
 	set (IOS_ARCH armv7 armv7s)
+	set (CMAKE_SYSTEM_PROCESSOR armv7)
 else (${IOS_PLATFORM} STREQUAL "OS")
 	set (IOS_ARCH i386)
+	set (CMAKE_SYSTEM_PROCESSOR i386)
 endif (${IOS_PLATFORM} STREQUAL "OS")

 set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string  "Build architecture for iOS")


Make doxygen output reproducible

Make doxygen output reproducible

Signed-off-by: Sebastian Ramacher <63df716952f6985d63bd730444128636613d6384@debian.org>

--- Doxyfile.cmake
+++ Doxyfile.cmake
@@ -18,3 +18,4 @@
 EXPAND_ONLY_PREDEF  = YES
 PREDEFINED          = LIBCOVERART_DEPRECATED=
 REPEAT_BRIEF        = NO
+HTML_TIMESTAMP      = NO


Tidy up cmake include order in aom_configure.cmake.

Change-Id: I7dae1b184fe174bad782f34a6b213de0286e90f4

--- build/cmake/aom_configure.cmake
+++ build/cmake/aom_configure.cmake
@@ -9,6 +9,9 @@
 ## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
 ##
 cmake_minimum_required(VERSION 3.2)
+
+include(FindGit)
+include(FindPerl)

 include("${AOM_ROOT}/build/cmake/aom_config_defaults.cmake")
 include("${AOM_ROOT}/build/cmake/compiler_flags.cmake")
@@ -68,9 +71,6 @@

 include("${AOM_ROOT}/build/cmake/targets/${AOM_TARGET_CPU}.cmake")

-include(FindGit)
-include(FindPerl)
-
 # Test compiler flags.
 if (MSVC)
   add_compiler_flag_if_supported("/W3")


Split off candidate-5.2.0

Split off candidate-5.2.0

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

--- version.cmake
+++ version.cmake
@@ -2,9 +2,9 @@
 ## Version Information
 ###
 set ( HPCC_PROJECT "community" )
-set ( HPCC_MAJOR 5 )
-set ( HPCC_MINOR 2 )
+set ( HPCC_MAJOR 6 )
+set ( HPCC_MINOR 0 )
 set ( HPCC_POINT 0 )
-set ( HPCC_MATURITY "closedown" )
+set ( HPCC_MATURITY "trunk" )
 set ( HPCC_SEQUENCE 0 )
 ###


Split off 7.10.58

Split off 7.10.58

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

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


Don't needlessly check variables before looping them.

--- CPPCheck.cmake
+++ CPPCheck.cmake
@@ -493,28 +493,20 @@
     list (APPEND ADD_GLOBAL_UNUSED_FUNCTION_CHECK_INCLUDES
           ${_cppcheck_unused_function_includes})

-    if (ADD_GLOBAL_UNUSED_FUNCTION_CHECK_INCLUDES)
-
-        foreach (_include ${ADD_GLOBAL_UNUSED_FUNCTION_CHECK_INCLUDES})
-
-            list (APPEND OPTIONS -I${_include})
-
-        endforeach (_include)
-
-    endif (ADD_GLOBAL_UNUSED_FUNCTION_CHECK_INCLUDES)
+    foreach (_include ${ADD_GLOBAL_UNUSED_FUNCTION_CHECK_INCLUDES})
+
+        list (APPEND OPTIONS -I${_include})
+
+    endforeach (_include)

     list (APPEND ADD_GLOBAL_UNUSED_FUNCTION_CHECK_DEFINES
           ${_cppcheck_unused_function_definitions})

-    if (ADD_GLOBAL_UNUSED_FUNCTION_CHECK_DEFINES)
-
-        foreach (_definition ${ADD_GLOBAL_UNUSED_FUNCTION_CHECK_DEFINES})
-
-            list (APPEND OPTIONS -D${_definition})
-
-        endforeach ()
-
-    endif (ADD_GLOBAL_UNUSED_FUNCTION_CHECK_DEFINES)
+    foreach (_definition ${ADD_GLOBAL_UNUSED_FUNCTION_CHECK_DEFINES})
+
+        list (APPEND OPTIONS -D${_definition})
+
+    endforeach ()

     _cppcheck_get_commandline (CPPCHECK_COMMAND
                                SOURCES ${_cppcheck_unused_function_sources}
@@ -657,25 +649,17 @@

     endif (CPPCHECK_CHECK_UNUSED)

-    if (CPPCHECK_INCLUDES)
-
-        foreach (_include ${CPPCHECK_INCLUDES})
-
-            list (APPEND CPPCHECK_OPTIONS -I${_include})
-
-        endforeach (_include)
-
-    endif (CPPCHECK_INCLUDES)
-
-    if (CPPCHECK_DEFINES)
-
-        foreach (_definition ${CPPCHECK_DEFINES})
-
-            list (APPEND CPPCHECK_OPTIONS -D${_definition})
-
-        endforeach ()
-
-    endif (CPPCHECK_DEFINES)
+    foreach (_include ${CPPCHECK_INCLUDES})
+
+        list (APPEND CPPCHECK_OPTIONS -I${_include})
+
+    endforeach (_include)
+
+    foreach (_definition ${CPPCHECK_DEFINES})
+
+        list (APPEND CPPCHECK_OPTIONS -D${_definition})
+
+    endforeach ()

     set (EXTRA_ARGS)


[CMake] Make the sample program in darwin_test_archs have a symbol it needs to link.

This resolves an issue building compiler-rt using Xcode 7 that was reported on llvm-dev:

http://lists.llvm.org/pipermail/llvm-dev/2015-September/090245.html

git-svn-id: c199f293c43da69278bea8e88f92242bf3aa95f7@247833 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/Modules/CompilerRTDarwinUtils.cmake
+++ cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -49,7 +49,7 @@
   set(archs ${ARGN})
   message(STATUS "Finding valid architectures for ${os}...")
   set(SIMPLE_CPP ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/src.cpp)
-  file(WRITE ${SIMPLE_CPP} "#include <iostream>\nint main() { return 0; }\n")
+  file(WRITE ${SIMPLE_CPP} "#include <iostream>\nint main() { std::cout << std::endl; return 0; }\n")

   set(os_linker_flags)
   foreach(flag ${DARWIN_${os}_LINKFLAGS})


Restored Config_Dade.cmake

Restored Config_Dade.cmake

--- cmake/SpecializedConfig/Config_Dade.cmake
+++ cmake/SpecializedConfig/Config_Dade.cmake
@@ -26,5 +26,5 @@

 #set(LUXRAYS_DISABLE_OPENCL TRUE)

-set(CMAKE_BUILD_TYPE "Debug")
-#set(CMAKE_BUILD_TYPE "Release")
+#set(CMAKE_BUILD_TYPE "Debug")
+set(CMAKE_BUILD_TYPE "Release")


fixed dependency on windows.h include order when using std::min && std::max

--- cmake/EthCompilerSettings.cmake
+++ cmake/EthCompilerSettings.cmake
@@ -38,7 +38,8 @@
 	# disable decorated name length exceeded, name was truncated (4503)
 	# disable warning C4535: calling _set_se_translator() requires /EHa (for boost tests)
 	# declare Windows XP requirement
-	add_compile_options(/MP /EHsc /wd4068 /wd4996 /wd4503 -D_WIN32_WINNT=0x0501)
+	# undefine windows.h MAX && MIN macros cause it cause conflicts with std::min && std::max functions
+	add_compile_options(/MP /EHsc /wd4068 /wd4996 /wd4503 -D_WIN32_WINNT=0x0501 /DNOMINMAX)
 	# disable empty object file warning
 	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
 	# warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/SAFESEH' specification


Improve cpprestsdk cmake module

Improve cpprestsdk cmake module

It is now more in-line with what the github page recommends

--- cmake/Modules/Findcpprest.cmake
+++ cmake/Modules/Findcpprest.cmake
@@ -19,11 +19,11 @@

 find_path(PPLX_INCLUDE_DIR
     NAMES
-    pplx.h
+    pplx/pplx.h
     HINTS
     "${PPLX_ROOT_DIR}"
     PATH_SUFFIXES
-    include/pplx
+    include
     cpprest
     PATHS
     /usr/local
@@ -75,6 +75,8 @@
 # set options

 if (CPPREST_FOUND)
-    set(CPPREST_INCLUDE_DIRS "${PPLX_INCLUDE_DIR}" "${CPPREST_INCLUDE_DIR}")
+    # if cpprestsdk is found, the components for it are likely already
+    # present, right?
+    set(CPPREST_INCLUDE_DIRS "${PPLX_INCLUDE_DIR} ${CPPREST_INCLUDE_DIR}")
     set(CPPREST_LIBRARIES "${CPPREST_LIBRARY}")
-endif()+endif()


Add distortosMap() to distortos-utilities.cmake

--- cmake/distortos-utilities.cmake
+++ cmake/distortos-utilities.cmake
@@ -52,6 +52,15 @@
 endfunction()

 #
+# Requests generation of linker map file named `mapFilename` during linking of `target`.
+#
+
+function(distortosMap target mapFilename)
+	target_link_libraries(${target} PRIVATE
+			-Xlinker -Map="${CMAKE_CURRENT_BINARY_DIR}/${mapFilename}")
+endfunction()
+
+#
 # Prints size of output file of `target`.
 #


added cmake find_schism potential path_suffix

--- cmake/modules/find_schism.cmake
+++ cmake/modules/find_schism.cmake
@@ -86,7 +86,8 @@
 		    IF (UNIX)
 			    FIND_PATH(_CUR_SEARCH
 					    NAMES libscm_gl_core.so libscm_gl_core.a
-					    PATHS ${_SEARCH_DIR}
+					    PATHS ${_SEARCH_DIR}
+              PATH_SUFFIXES linux_x86
 					    NO_DEFAULT_PATH)
 		    ELSEIF(WIN32)
 			    FIND_PATH(_CUR_SEARCH


Fix for the windows build

Fix for the windows build

--- cmake_modules/FindXercesC.cmake
+++ cmake_modules/FindXercesC.cmake
@@ -13,15 +13,15 @@

 FIND_PATH(
   XERCESC_INCLUDE
-  NAMES util/XercesVersion.hpp
-  PATHS c:/Libs/xerces-c_2_8_0 ${XERCES_INCLUDE_DIR}
+  NAMES xercesc/util/XercesVersion.hpp
+  PATHS c:/Libs/xerces-c_2_8_0 ${XERCES_INCLUDE_DIR}
   PATH_SUFFIXES xercesc)

 FIND_LIBRARY(
 	XERCESC_LIBRARY
-	NAMES xerces-c
+	NAMES xerces-c xerces-c_2
 	PATHS ${XERCES_LIBRARY_DIR})
-
+
 IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
    SET(XERCESC_FOUND TRUE)
 ELSE (XERCESC_INCLUDE AND XERCESC_LIBRARY)


Add support for building LLVM on FreeBSD 9.2

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

--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -16,6 +16,11 @@
 if( UNIX AND NOT BEOS )
   # Used by check_symbol_exists:
   set(CMAKE_REQUIRED_LIBRARIES m)
+endif()
+# x86_64 FreeBSD 9.2 requires libcxxrt to be specified explicitly.
+if( CMAKE_SYSTEM MATCHES "FreeBSD-9.2-RELEASE" AND
+    CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  list(APPEND CMAKE_REQUIRED_LIBRARIES "cxxrt")
 endif()

 # Helper macros and functions


[CMake] [darwin] [builitins] Don't build x86_64h into the 10.4 builtins library

There is no haswell support in 10.4, so we don't need a 10.4 builtin library.

git-svn-id: c199f293c43da69278bea8e88f92242bf3aa95f7@249868 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -354,6 +354,8 @@
       ${toolchain_arches})
     message(STATUS "OSX 10.4 supported arches: ${DARWIN_10.4_ARCHS}")
     if(DARWIN_10.4_ARCHS)
+      # don't include the Haswell slice in the 10.4 compatibility library
+      list(REMOVE_ITEM DARWIN_10.4_ARCHS x86_64h)
       list(APPEND BUILTIN_SUPPORTED_OS 10.4)
     endif()


CMake: Bugfix

CMake: Bugfix

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

--- deal.II/cmake/setup_finalize.cmake
+++ deal.II/cmake/setup_finalize.cmake
@@ -63,16 +63,16 @@

 MACRO(_both)
   # Write to both log files:
-  FILE(APPEND ${_log_detailed} ${ARGN})
-  FILE(APPEND ${_log_summary} ${ARGN})
+  FILE(APPEND ${_log_detailed} "${ARGN}")
+  FILE(APPEND ${_log_summary} "${ARGN}")
 ENDMACRO()
 MACRO(_detailed)
   # Only write to detailed.log:
-  FILE(APPEND ${_log_detailed} ${ARGN})
+  FILE(APPEND ${_log_detailed} "${ARGN}")
 ENDMACRO()
 MACRO(_summary)
   # Only write to summary.log:
-  FILE(APPEND ${_log_summary} ${ARGN})
+  FILE(APPEND ${_log_summary} "${ARGN}")
 ENDMACRO()


Enable pkg-config lookup of Qwt

Enable pkg-config lookup of Qwt

--- dependencies/qwt.cmake
+++ dependencies/qwt.cmake
@@ -1,41 +1,57 @@
 set(local_qwt_dir ${CMAKE_CURRENT_LIST_DIR}/qwt)
+if (NOT WIN32)
+  find_package(PkgConfig QUIET)
+endif()

-add_library(qwt SHARED IMPORTED)
+if (EXISTS ${local_qwt_dir})

-if (WIN32)
+  add_library(qwt SHARED IMPORTED)

-  # Qwt build with mingw has import library suffix .a, not .dll.a as expected by CMAKE_IMPORT_LIBRARY_SUFFIX
-  set(ils ${CMAKE_IMPORT_LIBRARY_SUFFIX})
-  if (MINGW)
-    set(ils .a)
+  if (WIN32)
+
+    # Qwt build with mingw has import library suffix .a, not .dll.a as expected by CMAKE_IMPORT_LIBRARY_SUFFIX
+    set(ils ${CMAKE_IMPORT_LIBRARY_SUFFIX})
+    if (MINGW)
+      set(ils .a)
+    endif()
+
+    set_target_properties(qwt PROPERTIES
+      IMPORTED_LOCATION ${local_qwt_dir}/lib/qwt${CMAKE_SHARED_LIBRARY_SUFFIX}
+      IMPORTED_LOCATION_DEBUG ${local_qwt_dir}/lib/qwtd${CMAKE_SHARED_LIBRARY_SUFFIX}
+      IMPORTED_IMPLIB ${local_qwt_dir}/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}qwt${ils}
+      IMPORTED_IMPLIB_DEBUG ${local_qwt_dir}/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}qwtd${ils}
+      INTERFACE_INCLUDE_DIRECTORIES ${local_qwt_dir}/include
+      INTERFACE_COMPILE_DEFINITIONS QWT_DLL)
+
+    if (EXISTS ${local_qwt_dir})
+      set(ds "")
+      if (${CMAKE_BUILD_TYPE} MATCHES Debug)
+        set(ds "d")
+      endif()
+      file(GLOB lib_files ${local_qwt_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}qwt${ds}${CMAKE_SHARED_LIBRARY_SUFFIX})
+      install(FILES ${lib_files} DESTINATION bin)
+    endif()
+
+  else()
+    set_target_properties(qwt PROPERTIES
+      IMPORTED_LOCATION ${local_qwt_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}qwt${CMAKE_SHARED_LIBRARY_SUFFIX}
+      INTERFACE_INCLUDE_DIRECTORIES ${local_qwt_dir}/include
+      INTERFACE_COMPILE_DEFINITIONS QWT_DLL)
+
+    if (EXISTS ${local_qwt_dir})
+      file(GLOB lib_files ${local_qwt_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}qwt${CMAKE_SHARED_LIBRARY_SUFFIX}*)
+      install(FILES ${lib_files} DESTINATION lib)
+    endif()
+
   endif()
+elseif(PKG_CONFIG_FOUND)

-  set_target_properties(qwt PROPERTIES
-    IMPORTED_LOCATION ${local_qwt_dir}/lib/qwt${CMAKE_SHARED_LIBRARY_SUFFIX}
-    IMPORTED_LOCATION_DEBUG ${local_qwt_dir}/lib/qwtd${CMAKE_SHARED_LIBRARY_SUFFIX}
-    IMPORTED_IMPLIB ${local_qwt_dir}/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}qwt${ils}
-    IMPORTED_IMPLIB_DEBUG ${local_qwt_dir}/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}qwtd${ils}
-    INTERFACE_INCLUDE_DIRECTORIES ${local_qwt_dir}/include
-    INTERFACE_COMPILE_DEFINITIONS QWT_DLL)
-
-  if (EXISTS ${local_qwt_dir})
-    set(ds "")
-    if (${CMAKE_BUILD_TYPE} MATCHES Debug)
-      set(ds "d")
-    endif()
-    file(GLOB lib_files ${local_qwt_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}qwt${ds}${CMAKE_SHARED_LIBRARY_SUFFIX})
-    install(FILES ${lib_files} DESTINATION bin)
-  endif()
-
-else()
-  set_target_properties(qwt PROPERTIES
-    IMPORTED_LOCATION ${local_qwt_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}qwt${CMAKE_SHARED_LIBRARY_SUFFIX}
-    INTERFACE_INCLUDE_DIRECTORIES ${local_qwt_dir}/include
-    INTERFACE_COMPILE_DEFINITIONS QWT_DLL)
-
-  if (EXISTS ${local_qwt_dir})
-    file(GLOB lib_files ${local_qwt_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}qwt${CMAKE_SHARED_LIBRARY_SUFFIX}*)
-    install(FILES ${lib_files} DESTINATION lib)
-  endif()
+  message(STATUS "Looking for Qwt using PkgConfig")
+  pkg_check_modules(qwt IMPORTED_TARGET Qt5Qwt6)
+  add_library(qwt INTERFACE)
+  target_link_libraries(qwt INTERFACE PkgConfig::qwt)

 endif()
+
+
+


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

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


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

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


~ py-ext cmake module fixes: now enables -Wall fr SWIG only if no user flags specified

--- contrib/cmake/PyExtensions.cmake
+++ contrib/cmake/PyExtensions.cmake
@@ -56,7 +56,9 @@
     find_package( PythonLibs REQUIRED )

     include( ${SWIG_USE_FILE} )
-    set( CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -Wall )
+    if( NOT CMAKE_SWIG_FLAGS )
+        set( CMAKE_SWIG_FLAGS -Wall )
+    endif( NOT CMAKE_SWIG_FLAGS )
     include_directories( ${PYTHON_INCLUDE_DIRS} )

     #


Make clean for roslisp executables works through a fake custom_command now.

This seems to be a cleaner solution than adding up all targets to a
directory property although not perfect.

--- core/roslisp/cmake/roslisp.cmake
+++ core/roslisp/cmake/roslisp.cmake
@@ -94,12 +94,13 @@
 macro(rosbuild_add_lisp_executable _output _system_name _entry_point)
   set(_targetname _roslisp_${_output})
   string(REPLACE "/" "_" _targetname ${_targetname})
+  # Add dummy custom command to get make clean behavior right.
+  add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_output}.lisp
+    COMMAND echo -n)
   add_custom_target(${_targetname} ALL
+                     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_output}.lisp
                      COMMAND ${roslisp_make_node_exe} ${PROJECT_NAME} ${_system_name} ${_entry_point} ${CMAKE_CURRENT_SOURCE_DIR}/${_output})
   add_dependencies(${_targetname} rosbuild_precompile)
-  get_directory_property(current_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
-  list(APPEND current_clean_files "${CMAKE_CURRENT_SOURCE_DIR}/${_output};${CMAKE_CURRENT_SOURCE_DIR}/${_output}.lisp")
-  set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${current_clean_files}")
 endmacro(rosbuild_add_lisp_executable)

 macro(rospack_add_lisp_executable  _output _system_name _entry_point)


build:
 * Compilation fix for Ubuntu 13.04 about shm_open() missing. Patch was tested to pass compilation on Fedora 18 and Mint 13.

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

--- trunk/cmake-modules/FindThirdPartyBoost_Thread.cmake
+++ trunk/cmake-modules/FindThirdPartyBoost_Thread.cmake
@@ -22,6 +22,16 @@
 	ELSE(LIB_STANDARD_MODULE_PTHREAD)
 		MESSAGE(STATUS "  FAILED to find pthread...")
 	ENDIF(LIB_STANDARD_MODULE_PTHREAD)
+
+	# For Ubuntu 13.04 (interprocess/ipc/message_queue.hpp in ovasCPluginExternalStimulations.cpp caused dep)
+	FIND_LIBRARY(LIB_STANDARD_MODULE_RT rt)
+	IF(LIB_STANDARD_MODULE_RT)
+		MESSAGE(STATUS "  Found rt...")
+		TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_STANDARD_MODULE_RT})
+	ELSE(LIB_STANDARD_MODULE_RT)
+		MESSAGE(STATUS "  FAILED to find rt...")
+	ENDIF(LIB_STANDARD_MODULE_RT)
+
 ENDIF(UNIX)

 IF(WIN32)


add _package_pre check to C library generation

if there is no package prefix, the old behavior would result in an underscore
'_' being erroneously prefixed to generated source code filenames. new behavior
will only concatenate the package prefix if the LCM message definition file in
question has specified a package.

--- lcm-cmake/lcmUtilities.cmake
+++ lcm-cmake/lcmUtilities.cmake
@@ -303,8 +303,13 @@

         # Determine output file name(s) and add to output variables
         if(DEFINED _C_HEADERS AND DEFINED _C_SOURCES)
-          _lcm_add_outputs(_C_HEADERS ${_package_pre}_${_type}.h)
-          _lcm_add_outputs(_C_SOURCES ${_package_pre}_${_type}.c)
+          if(DEFINED _package_pre)
+            _lcm_add_outputs(_C_HEADERS ${_package_pre}_${_type}.h)
+            _lcm_add_outputs(_C_SOURCES ${_package_pre}_${_type}.c)
+          else()
+            _lcm_add_outputs(_C_HEADERS ${_type}.h)
+            _lcm_add_outputs(_C_SOURCES ${_type}.c)
+          endif()
           if(_CREATE_CPP_AGGREGATE_HEADER)
             _lcm_add_aggregate_include("${_package_dir}.h"
               "${_package_pre}_${_type}.h")


version 0.0.0.2 ;)

version 0.0.0.2 ;)

--- PluginConfig.cmake
+++ PluginConfig.cmake
@@ -11,13 +11,13 @@

 # ActiveX constants:
 set(FBTYPELIB_NAME FBVLCLib)
-set(FBTYPELIB_DESC "FBVLC 0.0.0.1 Type Library")
+set(FBTYPELIB_DESC "FBVLC 0.0.0.2 Type Library")
 set(IFBControl_DESC "FBVLC Control Interface")
 set(FBControl_DESC "FBVLC Control Class")
 set(IFBComJavascriptObject_DESC "FBVLC IComJavascriptObject Interface")
 set(FBComJavascriptObject_DESC "FBVLC ComJavascriptObject Class")
 set(IFBComEventSource_DESC "FBVLC IFBComEventSource Interface")
-set(AXVERSION_NUM "1")
+set(AXVERSION_NUM "0.0.0.2")

 # NOTE: THESE GUIDS *MUST* BE UNIQUE TO YOUR PLUGIN/ACTIVEX CONTROL!  YES, ALL OF THEM!
 set(FBTYPELIB_GUID a6283703-2b52-5487-b262-119d9bf8c79c)
@@ -34,7 +34,7 @@
 # strings
 set(FBSTRING_CompanyName "RSATom")
 set(FBSTRING_PluginDescription "VLC Web Plugin (powered by FireBreath)")
-set(FBSTRING_PLUGIN_VERSION "0.0.0.1")
+set(FBSTRING_PLUGIN_VERSION "0.0.0.2")
 set(FBSTRING_LegalCopyright "Copyright 2012 RSATom")
 set(FBSTRING_PluginFileName "np${PLUGIN_NAME}.dll")
 set(FBSTRING_ProductName "FireBreathed VLC")


Fix HAL filenames in stm32f100.cmake.

Fix HAL filenames in stm32f100.cmake.

--- backends/stm32/stm32f100/cmake/stm32f100.cmake
+++ backends/stm32/stm32f100/cmake/stm32f100.cmake
@@ -8,20 +8,14 @@
 add_definitions(-DSTM32F10X_MD_VL)

 # hal files for stm32f100
-set (HAL_IMPLEMENTED_LED 			${STM32F10x_ROOT_DIR}/hal/hal_stm32f100_led.hpp)
-set (HAL_IMPLEMENTED_CLOCK			${BASE_HAL_DIR}/clock.hpp)
+set (HAL_IMPLEMENTED_CLOCK			${BASE_HAL_DIR}/ClockInterface.hpp)
 set (HAL_IMPLEMENTED_UART			${STM32F1_ROOT_DIR}/hal/hal_stm32f1_uart.hpp)
 set (HAL_IMPLEMENTED_GPIO			${STM32F1_ROOT_DIR}/hal/hal_stm32f1_gpio.hpp)
 set (HAL_IMPLEMENTED_EXTINT			${STM32F1_ROOT_DIR}/hal/hal_stm32f1_extint.hpp)
 set (HAL_IMPLEMENTED_PWM			${STM32F1_ROOT_DIR}/hal/hal_stm32f1_pwm.hpp)
+set (HAL_IMPLEMENTED_TIMER			${STM32F1_ROOT_DIR}/hal/hal_stm32f1_timer.hpp)
 set (HAL_IMPLEMENTED_SPI			${STM32F1_ROOT_DIR}/hal/hal_stm32f1_spi.hpp)
-set (HAL_IMPLEMENTED_PINOUT			${BASE_HAL_DIR}/pinout.hpp)

-set (HAL_IMPLEMENTED_PINOUT_CPP		${STM32F10x_ROOT_DIR}/hal/hal_stm32f100_pinout.cpp)
-
-
-set (STM32F1_BOARD_SPECIFIC_FILES	${STM32F10x_ROOT_DIR}/hal/hal_stm32f100_led.cpp
-									${STM32F10x_ROOT_DIR}/hal/hal_stm32f100_pinout.cpp)

 set (_RAM_SIZE				8K)


Fixed a typo in ThirdParties.cmake.

Fixed a typo in ThirdParties.cmake.

--- ThirdParties.cmake
+++ ThirdParties.cmake
@@ -24,7 +24,7 @@

 FUNCTION(LINK_THIRDPARTY_GLUT project)
   TARGET_LINK_LIBRARIES(${project} ${OPENGL_LIBRARIES} ${GLUT_glut_LIBRARY})
-ENDFUNCTION(LINK_THIRDPARTY_GLOG)
+ENDFUNCTION(LINK_THIRDPARTY_GLUT)

 FUNCTION(LINK_THIRDPARTY_GTEST project)
   IF (WIN32)


Disable inference download for WIN32 temporary. test=develop

--- paddle/fluid/inference/tests/test.cmake
+++ paddle/fluid/inference/tests/test.cmake
@@ -42,8 +42,8 @@
 endfunction()

 set(WORD2VEC_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/word2vec")
-if (NOT EXISTS ${WORD2VEC_INSTALL_DIR})
-    inference_download_and_uncompress(${WORD2VEC_INSTALL_DIR} ${INFERENCE_URL} "word2vec.inference.model.tar.gz")
+if(NOT EXISTS ${WORD2VEC_INSTALL_DIR} AND NOT WIN32)
+  inference_download_and_uncompress(${WORD2VEC_INSTALL_DIR} ${INFERENCE_URL} "word2vec.inference.model.tar.gz")
 endif()
 set(WORD2VEC_MODEL_DIR "${WORD2VEC_INSTALL_DIR}/word2vec.inference.model")


SVN_SILENT made messages (.desktop file)

--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -16,6 +16,7 @@
 Name[nl]=Instant Messaging
 Name[pt]=Mensagens Instantâneas
 Name[pt_BR]=Mensagens instantâneas
+Name[ro]=Mesagerie instantanee
 Name[ru]=Система обмена сообщениями
 Name[sk]=Priama komunikácia
 Name[sl]=Hipno sporočanje
@@ -42,6 +43,7 @@
 Comment[nl]=Begin een chat met een van uw IM-contactpersonen of wijzig uw IM-status
 Comment[pt]=Iniciar uma conversa com qualquer um dos seus contactos MI ou mudar o seu estado
 Comment[pt_BR]=Inicia um bate-papo com um dos seus contatos de MI ou altera o seu status
+Comment[ro]=Începeți o discuție cu oricare dintre contactele de MI sau schimbați-vă starea
 Comment[ru]=Начать общение с любым вашим контактом или изменить ваш статус в системе обмена сообщениями
 Comment[sk]=Spustiť rozhovor s nejakým z vašich IM kontaktov alebo zmeniť váš IM stav
 Comment[sl]=Začnite klepet s katerimkoli izmed vaših stikov hipnega sporočanja ali spremenite vaše stanje


gcc flags.

gcc flags.

--- cmake/CompillerSettings.cmake
+++ cmake/CompillerSettings.cmake
@@ -61,6 +61,7 @@
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
   #for 'delete void*;'
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-incomplete")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")

   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -fno-inline -g3 -fstack-protector-all -DDEBUG")
   set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -march=native -mtune=native -DNDEBUG")
@@ -84,6 +85,7 @@
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-prototypes -Wno-missing-variable-declarations")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-shadow -Wno-old-style-cast")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-documentation -Wno-documentation-unknown-command")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
   #for stx::btree
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-id-macro")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-conversion")


CPP-563 - Fix randomization determination during configure process

--- cmake/modules/CppDriver.cmake
+++ cmake/modules/CppDriver.cmake
@@ -997,6 +997,12 @@
 # Input: CASS_ROOT_DIR, CASS_SRC_DIR
 #------------------------
 macro(CassConfigure)
+  # Determine random availability
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    check_symbol_exists(GRND_NONBLOCK "linux/random.h" HAVE_GETRANDOM)
+  else()
+    check_symbol_exists(arc4random_buf "stdlib.h" HAVE_ARC4RANDOM)
+  endif()
   # Determine if sigpipe is available
   check_symbol_exists(SO_NOSIGPIPE "sys/socket.h;sys/types.h" HAVE_NOSIGPIPE)
   check_symbol_exists(sigtimedwait "signal.h" HAVE_SIGTIMEDWAIT)


document export_header.cmake

document export_header.cmake

--- cmake/downloaded/autocmake_export_header.cmake
+++ cmake/downloaded/autocmake_export_header.cmake
@@ -1,6 +1,9 @@
 #.rst:
 #
 # Generates export header for your API using best practices.
+# This module wraps https://cmake.org/cmake/help/v3.0/module/GenerateExportHeader.html and
+# it is needed because of these, Very Good Indeed, reasons: https://gcc.gnu.org/wiki/Visibility.
+# If you are not afraid of jargon, please also have a look at https://www.akkadia.org/drepper/dsohowto.pdf.
 #
 # Variables used::
 #


added: config workaround for clang 3.4+ and boost < 1.56 (upd)

--- share/hugh/cmake/CMakeAddons_SetupVariables.cmake
+++ share/hugh/cmake/CMakeAddons_SetupVariables.cmake
@@ -55,11 +55,11 @@

 # [https://stackoverflow.com/questions/22476267]
 # [https://svn.boost.org/trac/boost/ticket/9610]
+cma_print_variable(CMAKE_CXX_COMPILER_ID)
+cma_print_variable(CMAKE_CXX_COMPILER_VERSION)
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "CLANG" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.3)
   find_package(Boost ${BOOST_MINIMUM_VERSION} QUIET)

-  cma_print_variable(CMAKE_CXX_COMPILER_ID)
-  cma_print_variable(CMAKE_CXX_COMPILER_VERSION)
   cma_print_variable(Boost_VERSION)

   if (Boost_VERSION VERSION_LESS 105060)


fixed: SDL version assumptions

fixed: SDL version assumptions

--- share/hugh/cmake/CMakeAddons_SetupVariables.cmake
+++ share/hugh/cmake/CMakeAddons_SetupVariables.cmake
@@ -106,9 +106,9 @@
 # add_definitions(-DGLM_PRECISION_HIGHP_INT)

 # SDL2
-set(SDL_MINIMUM_VERSION "2.0.5")
+set(SDL_MINIMUM_VERSION "2.0.4")
 if(CMAKE_HOST_WIN32)
-  set(SDL_ROOT_DIR "C:/Tools/sdl2/${SDL_MINIMUM_VERSION}")
+  set(SDL_ROOT_DIR "C:/Tools/sdl2/2.0.5")
 endif()
 if(DEFINED ENV{SDL_ROOT_DIR})
   set(SDL_ROOT_DIR $ENV{SDL_ROOT_DIR})


fix an irritating cmake problem (#1715)

fix an irritating cmake problem (#1715)

--- Code/cmake/Modules/FindCairo.cmake
+++ Code/cmake/Modules/FindCairo.cmake
@@ -95,7 +95,6 @@
 if(Cairo_FOUND AND NOT TARGET Cairo::Cairo)
   add_library(Cairo::Cairo INTERFACE IMPORTED)
   set_target_properties(Cairo::Cairo PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES  ${CAIRO_INCLUDE_DIRS}
-    INTERFACE_LINK_LIBRARIES       ${CAIRO_LIBRARIES})
+    INTERFACE_INCLUDE_DIRECTORIES  "${CAIRO_INCLUDE_DIRS}"
+    INTERFACE_LINK_LIBRARIES       "${CAIRO_LIBRARIES}")
 endif()
-


Quadratic extension field arithmetic now can be overriden at lower level.

--- cmake/pp.cmake
+++ cmake/pp.cmake
@@ -5,19 +5,24 @@

 option(PP_PARAL "Parallel implementation." on)

-message("   ** Available bilinear pairing methods (default = X-ATE):")
+message("   ** Available bilinear pairing methods (default = BASIC;O-ATE):")
+
+message("      PP_METHD=BASIC    Basic extension field arithmetic.")
+message("      PP_METHD=INTEG    Extension field arithmetic with embedded reductions.\n")
+
 message("      PP_METHD=R_ATE    R-ate pairing.")
 message("      PP_METHD=O_ATE    O-ate pairing.")
 message("      PP_METHD=X_ATE    X-ate pairing.\n")

 # Choose the arithmetic methods.
 if (NOT PP_METHD)
-	set(PP_METHD "R_ATE")
+	set(PP_METHD "BASIC;O_ATE")
 endif(NOT PP_METHD)
 list(LENGTH PP_METHD PP_LEN)
-if (PP_LEN LESS 1)
+if (PP_LEN LESS 2)
 	message(FATAL_ERROR "Incomplete PP_METHD specification: ${PP_METHD}")
-endif(PP_LEN LESS 1)
+endif(PP_LEN LESS 2)

-list(GET PP_METHD 0 PP_MAP)
+list(GET PP_METHD 0 PP_EXT)
+list(GET PP_METHD 1 PP_MAP)
 set(PP_METHD ${PP_METHD} CACHE STRING "Bilinear pairings arithmetic method.")


add support for custom flags on specific files when PCH is used

--- pch.cmake
+++ pch.cmake
@@ -250,7 +250,25 @@
             # set(${OutputName}_CREATED true PARENT_SCOPE)
         endif()
         add_custom_target(${_targetName}_PCH DEPENDS ${_output} SOURCES ${_input})
-        target_compile_options( ${_targetName} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-include ${GCH_PATH}/${PCH_NAME}.h -Winvalid-pch> )
+
+        ## Implementation note:
+        ## We always build single PCH for target. However, some source files in target can have different compile flags.
+        ## A right thing to do (TM) would be to generate PCH for each group of files with same flags. However, we do not
+        ## do that. So, instead of including PCH globally on whole target, we will include PCH only on those sources that
+        ## do not already have specific flags.
+        ## Also, specific for C source files, we filter-out C sources with regex that matches only C++ files since
+        ## generator expression $<COMPILE_LANGUAGE:CXX> works only for target_compile_options function.
+        ##
+        ##                                                                         Nenad Miksa (28.02.2017.)
+
+        get_target_property( target_sources ${_targetName} SOURCES )
+        foreach( source ${target_sources} )
+            get_source_file_property( old_flags ${source} COMPILE_FLAGS )
+            if( NOT old_flags AND ${source} MATCHES ".*\\.c.+" )
+                set_source_files_properties( "${source}" PROPERTIES COMPILE_FLAGS "-include ${GCH_PATH}/${PCH_NAME}.h -Winvalid-pch" )
+            endif()
+        endforeach()
+#        target_compile_options( ${_targetName} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-include ${GCH_PATH}/${PCH_NAME}.h -Winvalid-pch> )
         ADD_DEPENDENCIES(${_targetName} ${_targetName}_PCH)
     endif()
   ENDIF(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")


openblas armadillo activate

openblas armadillo activate

--- include/pass_bits/config.hpp.cmake
+++ include/pass_bits/config.hpp.cmake
@@ -2,6 +2,7 @@

 // Armadillo
 #define ARMA_DONT_PRINT_ERRORS
+#define ARMA_USE_BLAS
 #define ARMA_BLAS_LONG
 #define ARMA_USE_CXX11
 #include <armadillo>


Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild

--- indra/cmake/Copy3rdPartyLibs.cmake
+++ indra/cmake/Copy3rdPartyLibs.cmake
@@ -124,7 +124,7 @@
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")

-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/universal-darwin")
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         SLVoice
         libsndfile.dylib
@@ -159,7 +159,7 @@
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")

-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         libsndfile.so.1
         libortp.so


Qt 5.10 Windows: Fix multimedia library name

--- cmake/Qt5Multimedia_QMultimediaDeclarativeModulePlugin.cmake
+++ cmake/Qt5Multimedia_QMultimediaDeclarativeModulePlugin.cmake
@@ -103,11 +103,19 @@
     )
   endif()

-  _qt_cmake_extra_helpers_add_interface_release_debug(
-      Qt5::QMultimediaDeclarativeModule
-      "${_qt_install_prefix}/lib/Qt5MultimediaQuick_p.lib"
-      "${_qt_install_prefix}/lib/Qt5MultimediaQuick_pd.lib"
-  )
+  if(Qt5Core_VERSION VERSION_LESS 5.10)
+    _qt_cmake_extra_helpers_add_interface_release_debug(
+        Qt5::QMultimediaDeclarativeModule
+        "${_qt_install_prefix}/lib/Qt5MultimediaQuick_p.lib"
+        "${_qt_install_prefix}/lib/Qt5MultimediaQuick_pd.lib"
+    )
+  else()
+    _qt_cmake_extra_helpers_add_interface_release_debug(
+        Qt5::QMultimediaDeclarativeModule
+        "${_qt_install_prefix}/lib/Qt5MultimediaQuick.lib"
+        "${_qt_install_prefix}/lib/Qt5MultimediaQuickd.lib"
+    )
+  endif()
 endif()

 _qt_cmake_extra_helpers_add_source(


Make it possible to easily override OXYGEN_DEBUG in any cpp file

--- config.h.cmake
+++ config.h.cmake
@@ -2,7 +2,9 @@
 #define __CONFIG_H__

 #define GTK_THEME_DIR "@GTK_THEME_DIR@/gtk-2.0"
-#define OXYGEN_DEBUG @OXYGEN_DEBUG@
+#ifndef OXYGEN_DEBUG
+#   define OXYGEN_DEBUG @OXYGEN_DEBUG@
+#endif
 #define OXYGEN_ICON_HACK @OXYGEN_ICON_HACK@
 #define ENABLE_COMBOBOX_LIST_RESIZE @ENABLE_COMBOBOX_LIST_RESIZE@


Move yaml-cpp download from Assembla to GitHub

Assembla hasn't been very reliable for downloading the yaml-cpp source.
This moves the tarball download from Assembla to GitHub.

--- CMake/External_yamlcpp.cmake
+++ CMake/External_yamlcpp.cmake
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-set(file_id "bAvdlSnfqr5ikadmr6bg7m")
 set(CMAKE_ARGS
 	-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
 	-DYAML_CPP_BUILD_TOOLS:BOOL=OFF
@@ -24,8 +23,8 @@
 endif(DEFINED CMAKE_BUILD_TYPE)

 ExternalProject_Add(yaml-cpp
-	URL "https://www.assembla.com/spaces/OpenSurgSim/documents/${file_id}/download/yaml-cpp.tar.gz"
-	URL_MD5 "6bd2a7b4cc31ad0b65209a8030dda7ed"
+	URL "https://github.com/simquest/yaml-cpp/archive/v0.5.1.2.tar.gz"
+	URL_MD5 "1919d41dd3ecd34cafaf13a1e60ece95"
 	PREFIX yaml-cpp
 	CMAKE_ARGS ${CMAKE_ARGS}
 )


Get the search paths within the install code.

This avoids problems of "not-yet-created" configuration sub-dirs
during the initial CMake configure run.

--- CMake/mitkMacroInstall.cmake
+++ CMake/mitkMacroInstall.cmake
@@ -42,7 +42,6 @@
       set(intermediate_dir .)
     endif()
   endif()
-  mitkFunctionGetLibrarySearchPaths(_search_paths ${intermediate_dir})

   install(CODE "

@@ -148,6 +147,11 @@
     endif(PLUGINS)
     message(\"globbed plugins: \${PLUGINS}\")

+    set(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} )
+
+    include(mitkFunctionGetLibrarySearchPaths)
+    mitkFunctionGetLibrarySearchPaths(_search_paths ${intermediate_dir})
+
     set(DIRS ${DIRS} ${_search_paths})
     foreach(_plugin \${PLUGINS})
       get_filename_component(_pluginpath \${_plugin} PATH)
@@ -157,7 +161,6 @@
     list(REMOVE_DUPLICATES DIRS)

     # use custom version of BundleUtilities
-    set(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} )
     include(BundleUtilities)

     fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${_target_location}\" \"\${PLUGINS}\" \"\${DIRS}\")


change GTest-->GTEST

change GTest-->GTEST

--- src/cmake/Dependencies.cmake
+++ src/cmake/Dependencies.cmake
@@ -1,3 +1,3 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
 )
-BOTG_AddTPL( LIB REQUIRED GTest )
+BOTG_AddTPL( LIB REQUIRED GTEST )


[cmake] Refactor out clang related config from swift_common_standalone_build_config to swift_common_standalone_build_config_clang.

rdar://26154980

--- cmake/modules/SwiftSharedCMakeConfig.cmake
+++ cmake/modules/SwiftSharedCMakeConfig.cmake
@@ -11,6 +11,42 @@
 else()
   set(cmake_3_2_USES_TERMINAL USES_TERMINAL)
 endif()
+
+macro(swift_common_standalone_build_config_clang product is_cross_compiling)
+  # Clang
+  set(${product}_PATH_TO_CLANG_SOURCE "${PATH_TO_LLVM_SOURCE}/tools/clang"
+      CACHE PATH "Path to Clang source code.")
+  set(${product}_PATH_TO_CLANG_BUILD "${PATH_TO_LLVM_BUILD}" CACHE PATH
+    "Path to the directory where Clang was built or installed.")
+
+  if(NOT EXISTS "${${product}_PATH_TO_CLANG_SOURCE}/include/clang/AST/Decl.h")
+    message(FATAL_ERROR "Please set ${product}_PATH_TO_CLANG_SOURCE to the root directory of Clang's source code.")
+  else()
+    get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
+      ABSOLUTE)
+  endif()
+
+  if(EXISTS "${${product}_PATH_TO_CLANG_BUILD}/include/clang/Basic/Version.inc")
+    set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/include")
+  elseif(EXISTS "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include/clang/Basic/Version.inc")
+    set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include")
+  else()
+    message(FATAL_ERROR "Please set ${product}_PATH_TO_CLANG_BUILD to a directory containing a Clang build.")
+  endif()
+  if(CLANG_MAIN_INCLUDE_DIR)
+    get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
+      ABSOLUTE)
+  endif()
+
+  if (NOT ${is_cross_compiling})
+    set(${product}_NATIVE_CLANG_TOOLS_PATH "${PATH_TO_LLVM_TOOLS_BINARY_DIR}")
+  endif()
+
+  set(CLANG_MAIN_INCLUDE_DIR "${CLANG_MAIN_SRC_DIR}/include")
+
+  include_directories("${CLANG_BUILD_INCLUDE_DIR}"
+                      "${CLANG_MAIN_INCLUDE_DIR}")
+endmacro()

 macro(swift_common_standalone_build_config_cmark product)
   set(${product}_PATH_TO_CMARK_SOURCE "${${product}_PATH_TO_CMARK_SOURCE}"
@@ -87,31 +123,6 @@
   precondition_translate_flag(LLVM_BUILD_BINARY_DIR LLVM_BINARY_DIR)
   precondition_translate_flag(LLVM_BUILD_MAIN_SRC_DIR LLVM_MAIN_SRC_DIR)

-  # Clang
-  set(${product}_PATH_TO_CLANG_SOURCE "${PATH_TO_LLVM_SOURCE}/tools/clang"
-      CACHE PATH "Path to Clang source code.")
-  set(${product}_PATH_TO_CLANG_BUILD "${PATH_TO_LLVM_BUILD}" CACHE PATH
-    "Path to the directory where Clang was built or installed.")
-
-  if(NOT EXISTS "${${product}_PATH_TO_CLANG_SOURCE}/include/clang/AST/Decl.h")
-    message(FATAL_ERROR "Please set ${product}_PATH_TO_CLANG_SOURCE to the root directory of Clang's source code.")
-  else()
-    get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
-      ABSOLUTE)
-  endif()
-
-  if(EXISTS "${${product}_PATH_TO_CLANG_BUILD}/include/clang/Basic/Version.inc")
-    set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/include")
-  elseif(EXISTS "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include/clang/Basic/Version.inc")
-    set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include")
-  else()
-    message(FATAL_ERROR "Please set ${product}_PATH_TO_CLANG_BUILD to a directory containing a Clang build.")
-  endif()
-  if(CLANG_MAIN_INCLUDE_DIR)
-    get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
-      ABSOLUTE)
-  endif()
-
   if(${is_cross_compiling})
     find_program(SWIFT_TABLEGEN_EXE "llvm-tblgen" "${${product}_NATIVE_LLVM_TOOLS_PATH}"
       NO_DEFAULT_PATH)
@@ -121,7 +132,6 @@
   else()
     set(SWIFT_TABLEGEN_EXE llvm-tblgen)
     set(${product}_NATIVE_LLVM_TOOLS_PATH "${PATH_TO_LLVM_TOOLS_BINARY_DIR}")
-    set(${product}_NATIVE_CLANG_TOOLS_PATH "${PATH_TO_LLVM_TOOLS_BINARY_DIR}")
   endif()

   include(AddLLVM)
@@ -138,13 +148,9 @@
     "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}" CACHE STRING
     "Version number that will be placed into the libclang library , in the form XX.YY")

-  set(CLANG_MAIN_INCLUDE_DIR "${CLANG_MAIN_SRC_DIR}/include")
-
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
   include_directories("${PATH_TO_LLVM_BUILD}/include"
-                      "${LLVM_MAIN_INCLUDE_DIR}"
-                      "${CLANG_BUILD_INCLUDE_DIR}"
-                      "${CLANG_MAIN_INCLUDE_DIR}")
+                      "${LLVM_MAIN_INCLUDE_DIR}")
   foreach (INCLUDE_DIR ${LLVM_INCLUDE_DIRS})
     include_directories(${INCLUDE_DIR})
   endforeach ()
@@ -171,6 +177,7 @@
     find_package(Doxygen REQUIRED)
   endif()

+  swift_common_standalone_build_config_clang(${product} ${is_cross_compiling})
   swift_common_standalone_build_config_cmark(${product})
 endmacro()


Clarify a comment

Clarify a comment

git-svn-id: fbbf69ba8011aca0e74e1c67904b11cccbdbe66b@27177 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/setup_cached_variables.cmake
+++ deal.II/cmake/setup_cached_variables.cmake
@@ -42,6 +42,8 @@
 #     DEAL_II_SHARED_LINKER_FLAGS_RELEASE
 #
 # *) May also be set via environment variable (CFLAGS, CXXFLAGS, LDFLAGS)
+#    (nonempty cached variable has precedence will not be overwritten by
+#    environment)
 #


disable the OpenMP 4 back-end by default

The "omp declare target" pragma is missing around functions that could be called within kernels.
GCC ignores this, because it does not support any non-CPU back-ends.
However, ICC errors on this.

--- alpakaConfig.cmake
+++ alpakaConfig.cmake
@@ -88,7 +88,7 @@
 OPTION(ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE "Enable the fibers CPU block thread accelerator" ON)
 OPTION(ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE "Enable the OpenMP 2.0 CPU grid block accelerator" ON)
 OPTION(ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE "Enable the OpenMP 2.0 CPU block thread accelerator" ON)
-OPTION(ALPAKA_ACC_CPU_BT_OMP4_ENABLE "Enable the OpenMP 4.0 CPU block and block thread accelerator" ON)
+OPTION(ALPAKA_ACC_CPU_BT_OMP4_ENABLE "Enable the OpenMP 4.0 CPU block and block thread accelerator" OFF)
 OPTION(ALPAKA_ACC_GPU_CUDA_ENABLE "Enable the CUDA GPU accelerator" ON)

 # Drop-down combo box in cmake-gui.


hunter_calculate_toolchain_sha1: unify message

--- cmake/modules/hunter_calculate_toolchain_sha1.cmake
+++ cmake/modules/hunter_calculate_toolchain_sha1.cmake
@@ -21,7 +21,7 @@
     set(use_toolchain "")
   endif()

-  hunter_status_print("Calculate Toolchain-SHA1")
+  hunter_status_print("Calculating Toolchain-SHA1")

   set(temp_project_dir "${CMAKE_BINARY_DIR}/_3rdParty/hunter/toolchain")
   set(temp_build_dir "${temp_project_dir}/_builds")


Backout 33851 / 33854 to create another automated build with just /GS enabled and the objectlist being a std::map again. This way I have two installable versions to compare which are exactly the same. Plus the safe path (/GS) is restored as default again.

--- indra/cmake/00-Common.cmake
+++ indra/cmake/00-Common.cmake
@@ -83,7 +83,7 @@
         /DDOM_DYNAMIC
         /DUNICODE
         /D_UNICODE
-#        /GS
+        /GS
         /TP
         /W3
         /c
@@ -100,7 +100,7 @@
         /DDOM_DYNAMIC
         /DUNICODE
         /D_UNICODE
-#        /GS
+        /GS
         /TP
         /W3
         /c
@@ -113,13 +113,7 @@
         )
   endif (USE_AVX_OPTIMIZATION)
 # </FS:Ansariel> [AVX Optimization]
-
-  # <FS:ND> Only compile with /GS if requested. /GS can cause a penalty in often called functions
-  if( ND_USE_BUFFER_SECURITY_CHECKS )
-    add_definitions( /GS )
-  endif( ND_USE_BUFFER_SECURITY_CHECKS )
-  # </FS:ND>
-
+
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT VS_DISABLE_FATAL_WARNINGS)
     add_definitions(/WX)


Fix build: update hdf5 version and location.

--- external/UseGDAL.cmake
+++ external/UseGDAL.cmake
@@ -38,7 +38,7 @@
   else()
     ExternalProject_Add(
       hdf5
-      URL "http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.13.tar.gz"
+      URL "http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.14.tar.gz"
       CMAKE_ARGS
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DBUILD_SHARED_LIBS=ON


modify basholeveldb build

modify basholeveldb build

--- basholeveldb.cmake
+++ basholeveldb.cmake
@@ -13,7 +13,7 @@
 external_source (basholeveldb
     2.0.29
     basholeveldb-2.0.29.tar.gz
-    50f75a652337111a9cd67e6f4d95f9e1)
+    8839a580b2ed58331a7c8053aee3ab1a)

 message ("Installing ${basholeveldb_NAME} into FlyEM build area: ${BUILDEM_DIR} ...")
 if (${APPLE})


Split off 8.6.60

Split off 8.6.60

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

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


Add tensorflow/tensorboard/plugins/debugger to tf_python.cmake

This makes the debugger plugin module available to the windows pip package.
Change: 147213296

--- tensorflow/contrib/cmake/tf_python.cmake
+++ tensorflow/contrib/cmake/tf_python.cmake
@@ -205,6 +205,7 @@
 add_python_module("tensorflow/tensorboard/backend")
 add_python_module("tensorflow/tensorboard/lib/python")
 add_python_module("tensorflow/tensorboard/plugins")
+add_python_module("tensorflow/tensorboard/plugins/debugger")
 add_python_module("tensorflow/tensorboard/plugins/projector")
 add_python_module("tensorflow/tensorboard/scripts")
 add_python_module("tensorflow/contrib")


ENH: Attempt to reduce the number of custom commands

--- CMake/vtkWrapTcl.cmake
+++ CMake/vtkWrapTcl.cmake
@@ -54,7 +54,8 @@
         # add custom command to output
         ADD_CUSTOM_COMMAND(
           OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TMP_FILENAME}Tcl.cxx
-          DEPENDS ${VTK_WRAP_TCL_EXE} ${VTK_WRAP_HINTS} ${TMP_INPUT}
+          DEPENDS ${VTK_WRAP_TCL_EXE} ${VTK_WRAP_HINTS}
+          MAIN_DEPENDENCY "${TMP_INPUT}"
           COMMAND ${VTK_WRAP_TCL_EXE}
           ARGS ${TMP_INPUT} ${VTK_WRAP_HINTS} ${TMP_CONCRETE}
           ${CMAKE_CURRENT_BINARY_DIR}/${TMP_FILENAME}Tcl.cxx


Remove pointless CMake version requirement

--- cmake/Plugin.cmake
+++ cmake/Plugin.cmake
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.8.6)
-
 function(add_plugin name)
   add_library(${name} MODULE ${ARGN})


Use C++ DWARF2 unwinding for luajit on all platforms (-DLUAJIT_UNWIND_EXTERNAL)

--- cmake/luajit.cmake
+++ cmake/luajit.cmake
@@ -140,6 +140,8 @@
     endif()
     set (luajit_copt ${luajit_copt} -I${PROJECT_SOURCE_DIR}/libobjc)
     set (luajit_target_cc "${CMAKE_C_COMPILER} ${CMAKE_C_FLAGS}")
+    # Use external unwind on all platforms.
+    set (luajit_target_cc "${luajit_target_cc} -DLUAJIT_UNWIND_EXTERNAL=1")
     if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
         # Regular mode - use CMake compiler for building host utils.
         set (luajit_host_cc ${CMAKE_C_COMPILER})


Install debug plugins, from wlad.

Install debug plugins, from wlad.

--- cmake/plugin.cmake
+++ cmake/plugin.cmake
@@ -174,6 +174,7 @@
       OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")
     # Install dynamic library
     MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR})
+    INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug)
   ENDIF()
 ENDMACRO()


Fix for Arduino upload path issue.

Fix for Arduino upload path issue.

--- rosserial_arduino/arduino-cmake/cmake/Platform/Arduino.cmake
+++ rosserial_arduino/arduino-cmake/cmake/Platform/Arduino.cmake
@@ -1169,8 +1169,13 @@
         return()
     endif()

-    list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_NAME}.hex")
-    list(APPEND AVRDUDE_ARGS "-Ueeprom:w:${TARGET_NAME}.eep:i")
+    if(NOT EXECUTABLE_OUTPUT_PATH)
+      set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
+    set(TARGET_PATH ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME})
+
+    list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_PATH}.hex")
+    list(APPEND AVRDUDE_ARGS "-Ueeprom:w:${TARGET_PATH}.eep:i")
     add_custom_target(${UPLOAD_TARGET}
                      ${ARDUINO_AVRDUDE_PROGRAM}
                      ${AVRDUDE_ARGS}
@@ -1212,7 +1217,12 @@
         return()
     endif()

-    list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_NAME}.hex")
+    if(NOT EXECUTABLE_OUTPUT_PATH)
+      set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
+    set(TARGET_PATH ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME})
+
+    list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_PATH}.hex")

     add_custom_target(${PROGRAMMER_TARGET}
                      ${ARDUINO_AVRDUDE_PROGRAM}


Modified plugin.cmake - Submodule name is changed to trace_boundaryTest

--- plugin.cmake
+++ plugin.cmake
@@ -54,7 +54,7 @@
 )

 add_python_test(segmentation_label
-    SUBMODULE TraceBoundaryTest
+    SUBMODULE trace_boundaryTest
     DBNAME core_segmentation_trace_boundary
     PLUGIN HistomicsTK
 )


Modified plugin.cmake

Modified plugin.cmake

--- plugin.cmake
+++ plugin.cmake
@@ -54,8 +54,8 @@
 )

 add_python_test(segmentation_label
-    SUBMODULE TraceBoundsTest
-    DBNAME core_segmentation_trace_bounds
+    SUBMODULE TraceBoundaryTest
+    DBNAME core_segmentation_trace_boundary
     PLUGIN HistomicsTK
 )


COMP: Added --whitespace=fix to fix in CUSTOMBUILD error "patch does not apply" in Visual Studio: 1>------ Build started: Project: ITK, Configuration: Debug x64 ------ 1>  Performing patch step for 'ITK' 1>  .../SuperBuild/Patches/itk_png_mangle_get_uint_31.patch:8: trailing whitespace. 1>  nm lib/libitkpng-4.10.a 2> /dev/null | grep " T \| D \| R " | 1>  .../SuperBuild/Patches/itk_png_mangle_get_uint_31.patch:16: trailing whitespace. 1>  #define png_get_uint_31 itk_png_get_uint_31 1>CUSTOMBUILD : error : patch failed: Modules/ThirdParty/PNG/src/itkpng/itk_png_mangle.h:10 1>CUSTOMBUILD : error : Modules/ThirdParty/PNG/src/itkpng/itk_png_mangle.h: patch does not apply

--- SuperBuild/ExternalITK.cmake
+++ SuperBuild/ExternalITK.cmake
@@ -25,7 +25,7 @@
   GIT_REPOSITORY ${ITK_REPOSITORY}
   GIT_TAG ${ITK_TAG}
   UPDATE_COMMAND ""
-  PATCH_COMMAND "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Patches/itk_png_mangle_get_uint_31.patch"
+  PATCH_COMMAND "${GIT_EXECUTABLE}" apply --whitespace=fix "${CMAKE_SOURCE_DIR}/Patches/itk_png_mangle_get_uint_31.patch"
   SOURCE_DIR ${proj}
   BINARY_DIR ${proj}-build
   CMAKE_ARGS


Guard against setting properties on tests that don't exist

--- plugin.cmake
+++ plugin.cmake
@@ -116,10 +116,12 @@
     # multiple tests, so add it in one of the tests for now
     # "plugins/HistomicsTK/Easy1.png"
 )
-set_property(TEST server_HistomicsTK.cli_results APPEND PROPERTY ENVIRONMENT
-    "CLI_LIST_ENTRYPOINT=${PROJECT_SOURCE_DIR}/plugins/slicer_cli_web/server/cli_list_entrypoint.py"
-    "CLI_CWD=${PROJECT_SOURCE_DIR}/plugins/HistomicsTK/server"
-)
+if (TEST server_HistomicsTK.cli_results)
+  set_property(TEST server_HistomicsTK.cli_results APPEND PROPERTY ENVIRONMENT
+      "CLI_LIST_ENTRYPOINT=${PROJECT_SOURCE_DIR}/plugins/slicer_cli_web/server/cli_list_entrypoint.py"
+      "CLI_CWD=${PROJECT_SOURCE_DIR}/plugins/HistomicsTK/server"
+  )
+endif()

 # front-end tests
 add_web_client_test(
@@ -129,10 +131,12 @@
 )
 # Ideally, client tests would support the EXTERNAL_DATA keyword, but for now
 # we just use a data file used for one of the server tests.
-set_property(
-  TEST web_client_HistomicsTK_annotations APPEND PROPERTY
-  ENVIRONMENT "GIRDER_TEST_DATA_PREFIX=${GIRDER_EXTERNAL_DATA_ROOT}"
-)
+if (TEST web_client_HistomicsTK_annotations)
+  set_property(
+    TEST web_client_HistomicsTK_annotations APPEND PROPERTY
+    ENVIRONMENT "GIRDER_TEST_DATA_PREFIX=${GIRDER_EXTERNAL_DATA_ROOT}"
+  )
+endif()

 add_eslint_test(
   js_static_analysis_HistomicsTK "${PROJECT_SOURCE_DIR}/plugins/HistomicsTK/web_client"


Clean up dos2unix step.

Clean up dos2unix step.

--- test/remote/SvnPackage.cmake
+++ test/remote/SvnPackage.cmake
@@ -151,12 +151,14 @@

   # De-Windows all text files - this also is currently Linux-specific
   # and depends on "dos2unix" existing.
-  file (GLOB_RECURSE textfiles RELATIVE "${chgdir}"
-    *.c *.cpp *.cxx *.h *.hpp *.hxx *.txt *.cmake *.conf
-    *.xml *.xq *.txt *.res *.spec *.xqlib)
+  file (GLOB_RECURSE textfiles
+        "${chgdir}/*.c" "${chgdir}/*.cpp" "${chgdir}/*.cxx"
+        "${chgdir}/*.h" "${chgdir}/*.hpp" "${chgdir}/*.hxx"
+        "${chgdir}/*.txt" "${chgdir}/*.cmake" "${chgdir}/*.conf"
+        "${chgdir}/*.xml" "${chgdir}/*.xq" "${chgdir}/*.txt"
+        "${chgdir}/*.res" "${chgdir}/*.spec" "${chgdir}/*.xqlib")
   foreach (textfile ${textfiles})
-    execute_process (COMMAND dos2unix -k "${textfile}"
-                     WORKING_DIRECTORY "${chgdir}")
+    execute_process (COMMAND dos2unix -k "${textfile}")
   endforeach (textfile)

   # Checkout/update svn from specified URL and rev


Minor edit in FindClangTools for properly printing status messages

--- cmake/Modules/FindClangTools.cmake
+++ cmake/Modules/FindClangTools.cmake
@@ -46,7 +46,7 @@
   message("clang-tidy not found")
 else()
   set(CLANG_TIDY_FOUND 1)
-  message("clang-tidy found at ${CLANG_TIDY_BIN}")
+  message(STATUS "clang-tidy found at ${CLANG_TIDY_BIN}")
 endif()

 find_program(CLANG_FORMAT_BIN
@@ -65,5 +65,5 @@
   message("clang-format not found")
 else()
   set(CLANG_FORMAT_FOUND 1)
-  message("clang-format found at ${CLANG_FORMAT_BIN}")
+  message(STATUS "clang-format found at ${CLANG_FORMAT_BIN}")
 endif()


Null change to test CCache on remote queue.

--- test/remote/SvnPackage.cmake
+++ test/remote/SvnPackage.cmake
@@ -15,6 +15,7 @@
 # Utility routines to package a local SVN working copy's changes into
 # a single file, and for applying that file to a fresh SVN enlistment
 # elsewhere.
+

 MACRO (find_prereqs)
   # Definitely need svn here.


Update cscgi-config.cmake

Update cscgi-config.cmake

Fixed typo in `cscgi-config.cmake`.

--- cscgi-config.cmake
+++ cscgi-config.cmake
@@ -19,7 +19,7 @@
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(
     cscgi DEFAULT_MSG
-    cscgi_include_dir
+    cscgi_include_dirs
     cscgi_libraries
   )


configures to options or cache variables

--- configure.cmake
+++ configure.cmake
@@ -1,26 +1,20 @@
 set(CMAKE_BUILD_TYPE DEBUG)

-# Set to TRUE if you wish to use GPU
-set(USE_GPU FALSE)
+option(USE_GPU "Build with GPU support" OFF)

-# Set to TRUE if you wish to use MPI
-set(USE_MPI FALSE)
+option(USE_MPI "Build with MPI support" OFF)

-# Set to TRUE if you wish to use libpng which is needed only by the Halide benchmarks
-set(USE_LIBPNG FALSE)
+option(USE_LIBPNG "Build with libpng for the Halide benchmark" FALSE)

-# Set to TRUE if you wish to use libjpeg which is needed only by the Halide benchmarks
-set(USE_LIBJPEG FALSE)
+option(USE_LIBJPEG "Build with libjpeg for the Halide benchmark" FALSE)

-# Set to TRUE if you wish to use cuDNN for benchmark comparisons
-set(USE_CUDNN FALSE)
+option(USE_CUDNN "Build with cuDNN for benchmark comparisons" FALSE)

-# Set to TRUE if you wish to use MKL wrappers provided by Tiramisu
 # If you set this to true, you should correctly set MKL_PREFIX (see below)
-set(USE_MKL_WRAPPERS TRUE)
+option(USE_MKL_WRAPPERS "Build with MKL wrappers provided by Tiramisu" TRUE)

 # Change with the cudnn library location
-set(CUDNN_LOCATION /data/scratch/akkas/cudnn7)
+set(CUDNN_LOCATION /data/scratch/akkas/cudnn7 CACHE PATH "CUDNN library location")

 # If USE_MPI is true, you need to the MPI_BUILD_DIR and MPI_NODES path
 # Note: This assumes you are using your own installed version of MPI. If your system already
@@ -29,23 +23,20 @@
 # Examples:
 #set(MPI_BUILD_DIR "/data/scratch/jray/Repositories/tiramisu/3rdParty/openmpi-3.1.2/build/")
 #set(MPI_NODES "lanka01,lanka02,lanka03,lanka04,lanka05,lanka06,lanka12,lanka13,lanka14,lanka15")
-set(MPI_BUILD_DIR "")
-set(MPI_NODES "")
+set(MPI_BUILD_DIR "" CACHE PATH "Build directory of MPI")
+set(MPI_NODES "" CACHE PATH "Use of MPI node paths")

-# Intel MKL library path. The specified folder should contain the folders
-# include and lib.
+# The specified folder should contain the folders include and lib.
 # Example:
 # set(MKL_PREFIX "/data/scratch/baghdadi/libs/intel/mkl/")
-set(MKL_PREFIX "")
+set(MKL_PREFIX "" CACHE PATH "Intel MKL library path")

-# LLVM_CONFIG_BIN: Directory containing llvm-config executable.
-set(LLVM_CONFIG_BIN "${CMAKE_SOURCE_DIR}/3rdParty/llvm/prefix/bin/")
+set(LLVM_CONFIG_BIN "${CMAKE_SOURCE_DIR}/3rdParty/llvm/prefix/bin/" CACHE PATH "Directory containing llvm-config executable")

 # ISL paths
-set(ISL_INCLUDE_DIRECTORY "3rdParty/isl/build/include/")
-set(ISL_LIB_DIRECTORY "3rdParty/isl/build/lib/")
+set(ISL_INCLUDE_DIRECTORY "3rdParty/isl/build/include/" CACHE PATH "Path to ISL include directory")
+set(ISL_LIB_DIRECTORY "3rdParty/isl/build/lib/" CACHE PATH "Path to ISL library directory")

 # Halide Paths
-set(HALIDE_SOURCE_DIRECTORY "3rdParty/Halide")
-set(HALIDE_LIB_DIRECTORY "3rdParty/Halide/lib")
-
+set(HALIDE_SOURCE_DIRECTORY "3rdParty/Halide" CACHE PATH "Path to Halide source directory")
+set(HALIDE_LIB_DIRECTORY "3rdParty/Halide/lib" CACHE PATH "Path to Halide library directory")


Install .cfg files when OGRE_INSTALL_SAMPLES_SOURCE is specified even if OGRE_INSTALL_SAMPLES (binaries) is false Needed for SDK

--- CMake/InstallResources.cmake
+++ CMake/InstallResources.cmake
@@ -88,7 +88,7 @@
 configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg)

 # install resource files
-if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_TOOLS)
+if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE OR OGRE_INSTALL_TOOLS)
   install(FILES
     ${OGRE_BINARY_DIR}/inst/bin/debug/resources.cfg
     ${OGRE_BINARY_DIR}/inst/bin/debug/plugins.cfg
@@ -111,7 +111,7 @@
 	DESTINATION "bin${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
   )
 endif ()
-if (OGRE_INSTALL_SAMPLES)
+if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
   install(FILES
 	${OGRE_BINARY_DIR}/inst/bin/debug/samples.cfg
     ${OGRE_BINARY_DIR}/inst/bin/debug/media.cfg


BUG: mantis 1386 - don't add InDoxygenGroup test if otb_source_dir is undefined

--- CMake/OTBModuleDoxygen.cmake
+++ CMake/OTBModuleDoxygen.cmake
@@ -61,7 +61,7 @@
       @ONLY
     )
   endif()
-  if(NOT ${_name}_THIRD_PARTY AND EXISTS ${${_name}_SOURCE_DIR}/include)
+  if(OTB_SOURCE_DIR AND NOT ${_name}_THIRD_PARTY AND EXISTS ${${_name}_SOURCE_DIR}/include)
     if(PYTHON_EXECUTABLE)
       otb_add_test(NAME ${_name}InDoxygenGroup COMMAND ${PYTHON_EXECUTABLE} "${OTB_SOURCE_DIR}/Utilities/Doxygen/mcdoc.py" check ${_name} ${${_name}_SOURCE_DIR}/include)
       otb_memcheck_ignore(${_name}InDoxygenGroup)


Set target property 'CTK_LIB_TARGET_SOURCE_DIR' on each CTK libraries

This property is set to be the value of ${CMAKE_CURRENT_SOURCE_DREICTORY}

--- CMake/ctkMacroBuildLib.cmake
+++ CMake/ctkMacroBuildLib.cmake
@@ -133,6 +133,7 @@
   IF(CTK_LIBRARY_PROPERTIES AND MY_LIBRARY_TYPE STREQUAL "SHARED")
     SET_TARGET_PROPERTIES(${lib_name} PROPERTIES ${CTK_LIBRARY_PROPERTIES})
   ENDIF()
+  SET_TARGET_PROPERTIES(${lib_name} PROPERTIES CTK_LIB_TARGET_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

   # Install rules
   IF(CTK_BUILD_SHARED_LIBS)


Install styles plugin on macOS

Install styles plugin on macOS

--- CMake/mitkInstallRules.cmake
+++ CMake/mitkInstallRules.cmake
@@ -39,6 +39,9 @@
     MITK_INSTALL(FILES "${_qmake_path}/../plugins/platforms/qwindows.dll")
   elseif(APPLE)
     MITK_INSTALL(FILES "${_qmake_path}/../plugins/platforms/libqcocoa.dylib")
+
+    set(_install_DESTINATION "plugins/styles")
+    MITK_INSTALL(FILES "${_qmake_path}/../plugins/styles/libqmacstyle.dylib")
   elseif(UNIX)
     MITK_INSTALL(FILES
       "${_qmake_path}/../plugins/platforms/libqxcb.so"


remove deactivated code from mitkInstallRules.cmake

Signed-off-by: Ralf Floca <fec4a647ab34f54e20bea9a9e3e1c74f13aefc78@dkfz-heidelberg.de>

--- CMake/mitkInstallRules.cmake
+++ CMake/mitkInstallRules.cmake
@@ -115,6 +115,4 @@
   install(DIRECTORY "${MITK_EXTERNAL_PROJECT_PREFIX}/bin/"
             DESTINATION "bin"
             FILES_MATCHING PATTERN "MAPAlgorithms*")
-#  install(DIRECTORY "${MITK_EXTERNAL_PROJECT_PREFIX}/deployed/"
-#            DESTINATION "bin")
 endif()


Extend ED module configuration for multiplication flexibility.

--- cmake/ed.cmake
+++ cmake/ed.cmake
@@ -1,10 +1,56 @@
 message(STATUS "Elliptic Edwards curve over prime fields arithmetic configuration (ED module):\n")
+
+message("   ** Options for the prime elliptic Edwards curve module (default = all on):")
+message("      ED_PRECO=[off|on] Build precomputation table for generator.")
+message("      ED_DEPTH=w        Width w in [2,6] of precomputation table for fixed point methods.")
+message("      ED_WIDTH=w        Width w in [2,6] of window processing for unknown point methods.\n")
+
+message("   ** Available prime elliptic Edwards curve methods (default = LWNAF;COMBS;INTER):")
+message("      *** variable-base multiplication method ***")
+message("      ED_METHD=BASIC    Binary method.")
+message("      ED_METHD=LWNAF    Left-to-right window NAF method (GLV for Koblitz curves).\n")
+
+message("      *** fixed-base multiplication method ***")
+message("      ED_METHD=BASIC    Binary method for fixed point multiplication.")
+message("      ED_METHD=YAOWI    Yao's windowing method for fixed point multiplication")
+message("      ED_METHD=NAFWI    NAF windowing method for fixed point multiplication.")
+message("      ED_METHD=COMBS    Single-table Comb method for fixed point multiplication.")
+message("      ED_METHD=COMBD    Double-table Comb method for fixed point multiplication.")
+message("      ED_METHD=LWNAF    Left-to-right window NAF method (GLV for Koblitz curves).\n")
+
+message("      *** variable-base simultaneous multiplication method ***")
+message("      ED_METHD=BASIC    Multiplication-and-addition simultaneous multiplication.")
+message("      ED_METHD=TRICK    Shamir's trick for simultaneous multiplication.")
+message("      ED_METHD=INTER    Interleaving of window NAFs (GLV for Koblitz curves).")
+message("      ED_METHD=JOINT    Joint sparse form.\n")
+
+message("      Note: these methods must be given in order. Ex: ED_METHD=\"LWNAF;COMBD;TRICK\"\n")

 if (NOT ED_DEPTH)
 	set(ED_DEPTH 4)
-endif(NOT ED_DEPTH)
+endif(NOT ED_DEPTH)
 if (NOT ED_WIDTH)
 	set(ED_WIDTH 4)
-endif(NOT ED_WIDTH)
-set(ED_FIX BASIC)
-set(ED_MUL MONTY)
+endif(NOT ED_WIDTH)
+set(ED_DEPTH "${ED_DEPTH}" CACHE STRING "Width of precomputation table for fixed point methods.")
+set(ED_WIDTH "${ED_WIDTH}" CACHE STRING "Width of window processing for unknown point methods.")
+
+option(EP_PLAIN "Support for ordinary curves" on)
+option(EP_SUPER "Support for supersingular curves" on)
+option(EP_MIXED "Use mixed coordinates" on)
+option(EP_ENDOM "Special support for Koblitz curves" on)
+option(EP_PRECO "Build precomputation table for generator" on)
+
+# Choose the arithmetic methods.
+if (NOT ED_METHD)
+	set(ED_METHD "LWNAF;COMBS;INTER")
+endif(NOT ED_METHD)
+list(LENGTH ED_METHD ED_LEN)
+if (ED_LEN LESS 3)
+	message(FATAL_ERROR "Incomplete ED_METHD specification: ${ED_METHD}")
+endif(ED_LEN LESS 3)
+
+list(GET ED_METHD 0 ED_MUL)
+list(GET ED_METHD 1 ED_FIX)
+list(GET ED_METHD 2 ED_SIM)
+set(ED_METHD ${ED_METHD} CACHE STRING "Method for prime elliptic Edwards curve arithmetic.")


CI: remove Mosaic from the remote module list enabled in CI builds

--- CI/configure_options.cmake
+++ CI/configure_options.cmake
@@ -70,7 +70,7 @@
 set(cmake_configure_option
 "${cmake_configure_option}
 CMAKE_PREFIX_PATH=${XDK_PATH}")
-foreach(remote_module OTBTemporalGapFilling Mosaic SertitObject DiapOTBModule)#otbGRM
+foreach(remote_module OTBTemporalGapFilling SertitObject DiapOTBModule)#otbGRM
   set(cmake_configure_option
 "${cmake_configure_option}
 Module_${remote_module}:BOOL=ON")


vtkhdf5: remove unecessary logic.

vtkhdf5: remove unecessary logic.

--- CMake/vtkHDF5Library.cmake
+++ CMake/vtkHDF5Library.cmake
@@ -8,7 +8,7 @@
 ELSE(VTK_USE_SYSTEM_HDF5)

   # Tell hdf5 that we are manually overriding certain settings
-  SET(HDF5_EXTERNALLY_CONFIGURED 1)
+  SET(HDF5_EXTERNALLY_CONFIGURED ON)
   # Avoid duplicating names of installed libraries
   SET(HDF5_EXTERNAL_LIB_PREFIX "vtk")
   # Export configuration to this export variable
@@ -40,20 +40,6 @@
       SET(ZLIB_LIBRARIES vtkzlib)
     ENDIF(VTK_USE_SYSTEM_ZLIB)
   ENDIF(HDF5_ENABLE_Z_LIB_SUPPORT)
-
-  SET(HDF5_INCLUDE_DIR
-     ${VTK_SOURCE_DIR}/Utilities/vtkhdf5/src
-     ${VTK_BINARY_DIR}/Utilities/vtkhdf5
-     ${VTK_SOURCE_DIR}/Utilities/vtkhdf5/hl/src)
-
-  # Some other modules use these vars to get the hdf5 lib name(s)
-  #SET(VTK_HDF5_LIBRARIES
-  #  vtkhdf5
-#    ${HDF5_CPP_LIB_NAME}
-#    ${HDF5_HL_LIB_NAME}
-#    ${HDF5_HL_CPP_LIB_NAME}
-  #  CACHE INTERNAL ""
-  #)

   MARK_AS_ADVANCED(
     H5_SET_LIB_OPTIONS


Make sure libraries starting liborg are contained within the install path when fixing up bundles

--- CMake/mitkMacroInstall.cmake
+++ CMake/mitkMacroInstall.cmake
@@ -54,7 +54,7 @@
       endif()

       if(_item_path STREQUAL \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/plugins\"
-         OR _item_name MATCHES \"liborg\" # this is for legacy BlueBerry bundle support
+         OR (_item_path MATCHES \"\${CMAKE_INSTALL_PREFIX}/${_bundle_dest_dir}/\" AND _item_name MATCHES \"liborg\") # this is for legacy BlueBerry bundle support
         )
         # Only fix plugins
         message(\"override: \${item}\")


BUG: Fix CTKData git url

BUG: Fix CTKData git url

GitHub does not support anymore git protocol for anonymous access, but must use https instead.

--- CMakeExternals/CTKData.cmake
+++ CMakeExternals/CTKData.cmake
@@ -36,7 +36,7 @@
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/commontk/CTKData.git"
+    set(location_args GIT_REPOSITORY "https://github.com/commontk/CTKData.git"
                       GIT_TAG ${revision_tag})
   endif()


Don't require boost 1.48

Don't require boost 1.48

--- etc/cmake/Setup.cmake
+++ etc/cmake/Setup.cmake
@@ -18,7 +18,7 @@
     # Boost
     MESSAGE(STATUS "Looking for Boost")
     set(Boost_USE_MULTITHREADED ON)
-    set(Boost_ADDITIONAL_VERSIONS "1.48.0" "1.48")
+    #set(Boost_ADDITIONAL_VERSIONS "1.48.0" "1.48")
     set(Boost_NO_SYSTEM_PATHS ON) # prevent mixing different Boost installations
     find_package(Boost 1.46)
     include_directories(${Boost_INCLUDE_DIR})


CMake: Bump version number

CMake: Bump version number

--- version.cmake
+++ version.cmake
@@ -3,7 +3,7 @@
 endif()
 set(LIB_VERSION_MAJOR 0)
 set(LIB_VERSION_MINOR 8)
-set(LIB_VERSION_PATCH 1)
+set(LIB_VERSION_PATCH 2)
 set(LIB_VERSION_ABI 0.8)
 set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH})
 set(SUMMARY "${PROJECT_NAME} Game Boy Advance Emulator")


Split off 8.4.42

Split off 8.4.42

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

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


Split off 7.12.28

Split off 7.12.28

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

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


Rebase against master

Rebase against master

--- tools/cmake/app.cmake
+++ tools/cmake/app.cmake
@@ -24,8 +24,6 @@
 # Note: This is nice to have, but is also required because STM32Cube will only work on files with a .elf extension
 set(CMAKE_EXECUTABLE_SUFFIX .elf)

-# Find Python and needed packages
-find_package(Python3)
 # Find Python
 find_package(Python3 COMPONENTS Interpreter)
 include(${CMAKE_CURRENT_LIST_DIR}/CheckPythonPackage.cmake)


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   18)
+SET(KWSYS_DATE_STAMP_DAY   19)


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

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


Added license notice.

Added license notice.

--- Source/ThirdParty/LuaJIT/DetectTargetArchitecture.cmake
+++ Source/ThirdParty/LuaJIT/DetectTargetArchitecture.cmake
@@ -1,3 +1,25 @@
+#
+# Copyright (c) 2008-2013 the Urho3D project.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
 # Macro for finding a substring
 macro (find_string find_regex input_string output_string)
     if (NOT DEFINED ${output_string}${ARGN})
@@ -16,7 +38,7 @@
     endif ()
     if (${ARGC} EQUAL 4)
         list (GET ${output_string}${ARGN} 0 ${output_string})
-   endif ()
+    endif ()
 endmacro ()

 # Makefile: Architecture detection


MAJ itkIncludeDirectories.cmake. Ajout chemin ITK_BINARY_DIR dans les includes.

--- Utilities/ITK/itkIncludeDirectories.cmake
+++ Utilities/ITK/itkIncludeDirectories.cmake
@@ -42,6 +42,7 @@
   ${ITK_SOURCE_DIR}/Utilities
 #THOMAS
   ${ITK_SOURCE_DIR}
+  ${ITK_BINARY_DIR}
 )

 IF(USE_LOG4CXX)


cmake-generate deps.dot for projects/README.md

issue https://github.com/smanders/externpro/issues/237

--- modules/xpfunmac.cmake
+++ modules/xpfunmac.cmake
@@ -524,6 +524,7 @@

 set(g_README ${CMAKE_BINARY_DIR}/README.md)
 set(g_READMEsub ${CMAKE_BINARY_DIR}/README.sub.md)
+set(g_READMEdep ${CMAKE_BINARY_DIR}/deps.dot)

 function(xpMarkdownReadmeInit)
   file(WRITE ${g_README}
@@ -534,6 +535,9 @@
   if(EXISTS ${g_READMEsub})
     file(REMOVE ${g_READMEsub})
   endif()
+  if(EXISTS ${g_READMEdep})
+    file(REMOVE ${g_READMEdep})
+  endif()
 endfunction()

 function(xpMarkdownReadmeAppend proj)
@@ -544,9 +548,10 @@
 endfunction()

 function(ipMarkdownPro)
-  set(oneValueArgs NAME DESC VER GIT_REF GIT_TAG SUPERPRO DIFF PATCH)
-  set(multiValueArgs WEB LICENSE REPO)
-  cmake_parse_arguments(P "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+  set(options GRAPH)
+  set(oneValueArgs NAME DESC VER GIT_REF GIT_TAG SUPERPRO DIFF PATCH GRAPH_NODE GRAPH_SHAPE GRAPH_LABEL)
+  set(multiValueArgs WEB LICENSE REPO GRAPH_DEPS)
+  cmake_parse_arguments(P "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   if(DEFINED P_WEB)
     ipMarkdownLink("${P_WEB}" web)
   else()
@@ -597,6 +602,31 @@
   else()
     file(APPEND ${g_README} "|${web}|${lic}|${desc}|${ver}|${repo}|${diff}|\n")
   endif()
+  if(P_GRAPH)
+    if(NOT EXISTS ${g_READMEdep})
+      file(WRITE ${g_READMEdep}
+        "digraph GG {\n"
+        "  node [fontsize=12];\n"
+        )
+    endif()
+    if(NOT DEFINED P_GRAPH_NODE)
+      set(P_GRAPH_NODE ${P_NAME})
+    endif()
+    file(APPEND ${g_READMEdep} "  ${P_GRAPH_NODE} [")
+    if(DEFINED P_GRAPH_LABEL)
+      file(APPEND ${g_READMEdep} "label=\"${P_GRAPH_LABEL}\" ")
+    endif()
+    if(DEFINED P_GRAPH_SHAPE)
+      file(APPEND ${g_READMEdep} "shape=${P_GRAPH_SHAPE}];\n")
+    else()
+      file(APPEND ${g_READMEdep} "shape=diamond];\n")
+    endif()
+    if(DEFINED P_GRAPH_DEPS)
+      foreach(dep ${P_GRAPH_DEPS})
+        file(APPEND ${g_READMEdep} "  ${P_GRAPH_NODE} -> ${dep};\n")
+      endforeach()
+    endif()
+  endif()
 endfunction()

 function(xpMarkdownReadmeFinalize)
@@ -604,10 +634,12 @@
     file(READ ${g_READMEsub} sub)
     file(APPEND ${g_README} ${sub})
   endif()
-  if(EXISTS ${PRO_DIR}/deps.dot)
+  if(EXISTS ${g_READMEdep})
+    file(APPEND ${g_READMEdep} "}\n")
+    file(MD5 ${g_READMEdep} hash)
     set(user smanders)
     set(branch dev)
-    set(mark customgraph01)
+    set(mark depgraph_${hash})
     set(url "https://raw.githubusercontent.com/${user}/externpro/${branch}/projects/README.md")
     string(REPLACE "/" "%2F" url ${url})
     string(REPLACE ":" "%3A" url ${url})
@@ -618,7 +650,7 @@
       "<summary></summary>\n"
       "${mark}\n"
       )
-    file(READ ${PRO_DIR}/deps.dot depsDotDot)
+    file(READ ${g_READMEdep} depsDotDot)
     file(APPEND ${g_README}
       "${depsDotDot}"
       "${mark}\n"


cmake/python: do not look for python 2.6

Change-Id: I56cf06dc60cab2412d8fe5afe3cad83d550d1950
Reviewed-on: http://gerrit.aldebaran.lan:8080/16297
Reviewed-by: ncornu <13ba26b8f12d26c819f48749c65f2f7f5c1d13db@aldebaran-robotics.com>
Reviewed-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>
Tested-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>

--- cmake/qibuild/modules/python-config.cmake
+++ cmake/qibuild/modules/python-config.cmake
@@ -6,7 +6,7 @@
 # first, use fpath flib to get python from one of our pre-compiled packages
 # note than we patch Python.h to NOT autolink with python27_d.lib,
 # which prevent us from using boost_python
-fpath(PYTHON Python.h PATH_SUFFIXES "python2.7" "python2.6")
+fpath(PYTHON Python.h PATH_SUFFIXES "python2.7")
 flib(PYTHON NAMES python27 python2.7 Python)

 if(NOT PYTHON_LIBRARIES OR NOT PYTHON_INCLUDE_DIRS)


cmake: fix ZeroMq's dependencies

cmake: fix ZeroMq's dependencies

--- cmake/qibuild/modules/zeromq-config.cmake
+++ cmake/qibuild/modules/zeromq-config.cmake
@@ -3,5 +3,8 @@
 clean(ZEROMQ)
 fpath(ZEROMQ zmq.h)
 flib(ZEROMQ zmq)
-set(ZEROMQ_DEPENDS "UUID")
+if(UNIX)
+  set(ZEROMQ_DEPENDS "UUID")
+else()
+  set(ZEROMQ_DEPENDS WSA RPCRT)
 export_lib(ZEROMQ)


LTDL_WIN32 will be defined in config.h for Win32 platforms except for MSys and Cygwin toolkits.

svn path=/trunk/; revision=8901

--- config.h.cmake
+++ config.h.cmake
@@ -173,6 +173,9 @@
 /* Name of package */
 #define PACKAGE "${PACKAGE}"

+/* Define if the win32 ltdl implementation should be used */
+#cmakedefine LTDL_WIN32
+
 /* Define if aqt driver is present */
 #cmakedefine PLD_aqt


Correction: Just use "trunk" if no svn information is available

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

--- deal.II/cmake/scripts/run_testsuite.cmake
+++ deal.II/cmake/scripts/run_testsuite.cmake
@@ -523,9 +523,9 @@

 IF("${_branch}" STREQUAL "")
   #
-  # If we have no branch information, just use "generic" as a subproject:
-  #
-  SET_PROPERTY(GLOBAL PROPERTY SubProject "no_svn_info")
+  # If we have no branch information, just assume we are on trunk:
+  #
+  SET_PROPERTY(GLOBAL PROPERTY SubProject "trunk")
 ELSE()
   SET_PROPERTY(GLOBAL PROPERTY SubProject ${_branch})
 ENDIF()


Graph Control 5.0.0-rc3 Release Candidate 3

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

--- version.cmake
+++ version.cmake
@@ -6,7 +6,7 @@
 set ( HPCC_MINOR 0 )
 set ( HPCC_POINT 0 )
 set ( HPCC_MATURITY "rc" )
-set ( HPCC_SEQUENCE 2 )
+set ( HPCC_SEQUENCE 3 )
 ###
 IF ( ${HPCC_POINT} GREATER 65 )
   error ( "HPCC_POINT must be less than 66." )


Split off 8.10.8

Split off 8.10.8

Signed-off-by: Gavin Halliday <2edfa8aca9fb78974188e5b35be8b52d4e4967ae@lexisnexis.com>

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


COMP: Update NIRALUtilities svn revision for windows compilation

--- CMake/FindExternalTools.cmake
+++ CMake/FindExternalTools.cmake
@@ -560,7 +560,7 @@
   SVN_REPOSITORY "http://www.nitrc.org/svn/niral_utilities/trunk"
   SVN_USERNAME slicerbot
   SVN_PASSWORD slicer
-  SVN_REVISION -r 40 # 01/22/2013
+  SVN_REVISION -r 41 # 01/29/2013
   )
 set( CMAKE_ExtraARGS
   -DCOMPILE_CONVERTITKFORMATS:BOOL=OFF


Correct DYNAMIC_LOOKUP_* cache type to STRING

When CMake ran multiple times, the value would change from the correct
string to a boolean value. This caused failure of the expected dynamic
lookup behavior.

Change-Id: I1d1319ae453ae7900a52430f7787bec956927b95

--- CMake/sitkTargetLinkLibrariesWithDynamicLookup.cmake
+++ CMake/sitkTargetLinkLibrariesWithDynamicLookup.cmake
@@ -516,7 +516,7 @@
     mark_as_advanced(${cache_var})

     set(${result_var} "${link_flags}"
-        CACHE BOOL
+        CACHE STRING
         "linker flags for dynamic lookup${caveat}")
     mark_as_advanced(${result_var})


COMP: only sort enabled dependencies

COMP: only sort enabled dependencies

--- CMake/OTBModuleEnablement.cmake
+++ CMake/OTBModuleEnablement.cmake
@@ -170,10 +170,14 @@

     # We will sort modules according to their dependency graph,
     # to enable them in order. To solve the modules dependency graph,
-    # we join both DEPENDS and OPTIONAL_DEPENDS
+    # we join both DEPENDS and OPTIONAL_DEPENDS (if enabled)
     set(OTB_MODULE_${otb-module}_DEPENDS_FOR_SORT "")
     list(APPEND OTB_MODULE_${otb-module}_DEPENDS_FOR_SORT ${OTB_MODULE_${otb-module}_DEPENDS})
-    list(APPEND OTB_MODULE_${otb-module}_DEPENDS_FOR_SORT ${OTB_MODULE_${otb-module}_OPTIONAL_DEPENDS})
+    foreach(opt-dep ${OTB_MODULE_${otb-module}_OPTIONAL_DEPENDS})
+      if(${opt-dep}_ENABLED)
+        list(APPEND OTB_MODULE_${otb-module}_DEPENDS_FOR_SORT ${opt-dep})
+      endif()
+    endforeach()
   else()
     list(APPEND OTB_MODULES_DISABLED ${otb-module})
   endif()


Enable absolute paths for SetupExternalPlugins

ADD_SUBDIRECTORY needs an explicit boinary dir in that case

--- CMake/ctkMacroSetupExternalPlugins.cmake
+++ CMake/ctkMacroSetupExternalPlugins.cmake
@@ -74,7 +74,11 @@
     ENDIF()

     LIST(APPEND plugin_subdirs "${plugin_name}")
-    LIST(APPEND plugin_dirswithoption "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_name}^^${option_name}")
+    IF(IS_ABSOLUTE ${plugin_name})
+      LIST(APPEND plugin_dirswithoption "${plugin_name}^^${option_name}")
+    ELSE()
+      LIST(APPEND plugin_dirswithoption "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_name}^^${option_name}")
+    ENDIF()
   ENDFOREACH()

   ctkFunctionGenerateDGraphInput(${CMAKE_CURRENT_BINARY_DIR} "${plugin_dirswithoption}" WITH_EXTERNALS)
@@ -86,7 +90,13 @@

   FOREACH(plugin ${plugin_subdirs})
     IF(${${plugin}_option_name})
-      ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/${plugin})
+      IF(IS_ABSOLUTE ${plugin})
+        # get last directory component
+        GET_FILENAME_COMPONENT(_dirname ${plugin} NAME)
+        ADD_SUBDIRECTORY(${plugin} private_plugins/${_dirname})
+      ELSE()
+        ADD_SUBDIRECTORY(${plugin})
+      ENDIF()
     ENDIF()
   ENDFOREACH()


BUG: Add missing module dependency

BUG: Add missing module dependency

--- Modules/Filtering/ImageManipulation/otb-module.cmake
+++ Modules/Filtering/ImageManipulation/otb-module.cmake
@@ -7,6 +7,7 @@

 otb_module(OTBImageManipulation
   DEPENDS
+    OTBBoostAdapters
     OTBCommon
     OTBITK
     OTBImageBase


cmake: Include stdint.h when searching postprocess.h.

--- extras/buildsystem/cmake/include/config.cmake
+++ extras/buildsystem/cmake/include/config.cmake
@@ -371,12 +371,10 @@

 find_package(FFmpeg)
 if(FFmpeg_FOUND)
-  set(CMAKE_EXTRA_INCLUDE_FILES stdint.h)
   vlc_check_include_files (ffmpeg/avcodec.h)
   vlc_check_include_files (ffmpeg/avutil.h)
   vlc_check_include_files (ffmpeg/swscale.h)
-  vlc_check_include_files (postproc/postprocess.h)
-  set(CMAKE_EXTRA_INCLUDE_FILES)
+  check_include_files ("stdint.h;postproc/postprocess.h" HAVE_POSTPROC_POSTPROCESS_H)
   vlc_enable_modules(ffmpeg)
   vlc_add_module_compile_flag(ffmpeg ${FFmpeg_CFLAGS} )
   vlc_module_add_link_libraries(ffmpeg ${FFmpeg_LIBRARIES})


better testing support

better testing support

--- vtkCMakeOptions.cmake
+++ vtkCMakeOptions.cmake
@@ -168,6 +168,13 @@
   INCLUDE_DIRECTORIES(${VTK_SOURCE_DIR}/Common/Testing/Cxx)
 ENDIF (BUILD_TESTING)

+# where will executable tests be written ?
+IF (EXECUTABLE_OUTPUT_PATH)
+    SET (CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
+ELSE (EXECUTABLE_OUTPUT_PATH)
+    SET (CXX_TEST_PATH .)
+ENDIF (EXECUTABLE_OUTPUT_PATH)
+

 #
 # try to find the data files for VTKData


ManageTranslation: ManageArchive is not required in zanata_pull

--- Modules/ManageTranslation.cmake
+++ Modules/ManageTranslation.cmake
@@ -126,7 +126,6 @@
     RETURN()
 ENDIF(DEFINED _MANAGE_TRANSLATION_CMAKE_)
 SET(_MANAGE_TRANSLATION_CMAKE_ "DEFINED")
-INCLUDE(ManageArchive)
 INCLUDE(ManageMessage)
 INCLUDE(ManageFile)
 INCLUDE(ManageString)
@@ -203,6 +202,7 @@
     IF(DEFINED MANAGE_GETTEXT_SUPPORT)
 	RETURN()
     ENDIF()
+    INCLUDE(ManageArchive)
     INCLUDE(ManageDependency)
     MANAGE_DEPENDENCY(BUILD_REQUIRES GETTEXT REQUIRED)
     MANAGE_DEPENDENCY(BUILD_REQUIRES FINDUTILS REQUIRED)


cmake: android toolchain update to latest upstream

AndroidToolchain.cmake: updated from https://github.com/taka-no-me/android-cmake/raw/master/android.toolchain.cmake

--- cmake/AndroidToolchain.cmake
+++ cmake/AndroidToolchain.cmake
@@ -1,5 +1,5 @@
 # Copyright (c) 2010-2011, Ethan Rublee
-# Copyright (c) 2011-2013, Andrey Kamaev
+# Copyright (c) 2011-2014, Andrey Kamaev
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -12,9 +12,9 @@
 #     this list of conditions and the following disclaimer in the documentation
 #     and/or other materials provided with the distribution.
 #
-# 3.  The name of the copyright holders may be used to endorse or promote
-#     products derived from this software without specific prior written
-#     permission.
+# 3.  Neither the name of the copyright holder nor the names of its
+#     contributors may be used to endorse or promote products derived from this
+#     software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -29,7 +29,7 @@
 # POSSIBILITY OF SUCH DAMAGE.

 # ------------------------------------------------------------------------------
-#  Android CMake toolchain file, for use with the Android NDK r5-r8
+#  Android CMake toolchain file, for use with the Android NDK r5-r9
 #  Requires cmake 2.6.3 or newer (2.8.5 or newer is recommended).
 #  See home page: https://github.com/taka-no-me/android-cmake
 #
@@ -87,8 +87,7 @@
 #        "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP.
 #        "x86" - matches to the NDK ABI with the same name.
 #            See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
-#        "mips" - matches to the NDK ABI with the same name
-#            (It is not tested on real devices by the authos of this toolchain)
+#        "mips" - matches to the NDK ABI with the same name.
 #            See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
 #
 #    ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for.
@@ -294,6 +293,16 @@
 #     [~] automatically detect if explicit link to crtbegin_*.o is needed
 #   - June 2013
 #     [~] fixed stl include path for standalone toolchain made by NDK >= r8c
+#   - July 2013
+#     [+] updated for NDK r9
+#   - November 2013
+#     [+] updated for NDK r9b
+#   - December 2013
+#     [+] updated for NDK r9c
+#   - January 2014
+#     [~] fix copying of shared STL
+#   - April 2014
+#     [+] updated for NDK r9d
 # ------------------------------------------------------------------------------

 cmake_minimum_required( VERSION 2.6.3 )
@@ -317,16 +326,10 @@
 # this one not so much
 set( CMAKE_SYSTEM_VERSION 1 )

-# Android SDK
-
-if (NOT DEFINED ANDROID_SDK)
-	set(ANDROID_SDK "$ENV{ANDROID_SDK}")
-endif()
-
 # rpath makes low sence for Android
 set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." )

-set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
+set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
 if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS)
  if( CMAKE_HOST_WIN32 )
   file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS )
@@ -344,7 +347,7 @@
 set( ANDROID_SUPPORTED_ABIS_x86 "x86" )
 set( ANDROID_SUPPORTED_ABIS_mipsel "mips" )

-set( ANDROID_DEFAULT_NDK_API_LEVEL 9 )
+set( ANDROID_DEFAULT_NDK_API_LEVEL 8 )
 set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 )
 set( ANDROID_DEFAULT_NDK_API_LEVEL_mips 9 )

@@ -470,10 +473,9 @@
  endif()
 endif()

-# FIXME: properly detect 64-bit host, currently reported as 32-bit

 # detect current host platform
-if( NOT DEFINED ANDROID_NDK_HOST_X64 AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
+if( NOT DEFINED ANDROID_NDK_HOST_X64 AND (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64" OR CMAKE_HOST_APPLE) )
  set( ANDROID_NDK_HOST_X64 1 CACHE BOOL "Try to use 64-bit compiler toolchain" )
  mark_as_advanced( ANDROID_NDK_HOST_X64 )
 endif()
@@ -494,7 +496,7 @@
 endif()

 if( NOT ANDROID_NDK_HOST_X64 )
- #set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+ set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
 endif()

 # see if we have path to Android NDK
@@ -1139,15 +1141,7 @@
 # case of shared STL linkage
 if( ANDROID_STL MATCHES "shared" AND DEFINED __libstl )
  string( REPLACE "_static.a" "_shared.so" __libstl "${__libstl}" )
- if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" )
-  get_filename_component( __libstlname "${__libstl}" NAME )
-  execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess )
-  if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}")
-   message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" )
-  endif()
-  unset( __fileCopyProcess )
-  unset( __libstlname )
- endif()
+ # TODO: check if .so file exists before the renaming
 endif()

@@ -1512,7 +1506,8 @@

 # global includes and link directories
 include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} )
-link_directories( "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" )
+get_filename_component(__android_install_path "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" ABSOLUTE) # avoid CMP0015 policy warning
+link_directories( "${__android_install_path}" )

 # detect if need link crtbegin_so.o explicitly
 if( NOT DEFINED ANDROID_EXPLICIT_CRT_LINK )
@@ -1563,6 +1558,18 @@
  endif()
  set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" )
 endif()
+
+# copy shaed stl library to build directory
+if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" )
+ get_filename_component( __libstlname "${__libstl}" NAME )
+ execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess )
+ if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}")
+  message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" )
+ endif()
+ unset( __fileCopyProcess )
+ unset( __libstlname )
+endif()
+

 # set these global flags for cmake client scripts to change behavior
 set( ANDROID True )
@@ -1672,6 +1679,19 @@
 endif()

+# force cmake to produce / instead of \ in build commands for Ninja generator
+if( CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_HOST_WIN32 )
+ # it is a bad hack after all
+ # CMake generates Ninja makefiles with UNIX paths only if it thinks that we are going to build with MinGW
+ set( CMAKE_COMPILER_IS_MINGW TRUE ) # tell CMake that we are MinGW
+ set( CMAKE_CROSSCOMPILING TRUE )    # stop recursion
+ enable_language( C )
+ enable_language( CXX )
+ # unset( CMAKE_COMPILER_IS_MINGW ) # can't unset because CMake does not convert back-slashes in response files without it
+ unset( MINGW )
+endif()
+
+
 # set some obsolete variables for backward compatibility
 set( ANDROID_SET_OBSOLETE_VARIABLES ON CACHE BOOL "Define obsolete Andrid-specific cmake variables" )
 mark_as_advanced( ANDROID_SET_OBSOLETE_VARIABLES )
@@ -1726,7 +1746,7 @@
 #   BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used
 #   ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform
 #   ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86" or "mips" depending on ANDROID_ABI
-#   ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e; set only for NDK
+#   ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e, r9, r9b, r9c, r9d; set only for NDK
 #   ANDROID_ARCH_NAME : "arm" or "x86" or "mips" depending on ANDROID_ABI
 #   ANDROID_SYSROOT : path to the compiler sysroot
 #   TOOL_OS_SUFFIX : "" or ".exe" depending on host platform


Disable no-useless-cast warning on gcc

Disable no-useless-cast warning on gcc

--- cmake/CompilerWarnings.cmake
+++ cmake/CompilerWarnings.cmake
@@ -62,7 +62,7 @@
             -Wduplicated-cond # warn if if / else chain has duplicated conditions
 	    #-Wduplicated-branches # warn if if / else branches have duplicated code
             -Wlogical-op # warn about logical operations being used where bitwise were probably wanted
-            -Wuseless-cast # warn if you perform a cast to the same type
+            -Wno-useless-cast # warn if you perform a cast to the same type
             )

     if (MSVC)