PKG: MXE: fix build packaging

PKG: MXE: fix build packaging

--- CMake/MinGWPackage.cmake
+++ CMake/MinGWPackage.cmake
@@ -1,6 +1,5 @@
 macro(package_mingw)
   cmake_parse_arguments(PACKAGE  "" "PREFIX_DIR;ARCH;MXEROOT;NEEDS_OTB_APPS" "SEARCHDIRS;PEFILES" ${ARGN} )
-
   if("${PACKAGE_ARCH}" STREQUAL "x86")
     set(MXE_BIN_DIR "${PACKAGE_MXEROOT}/usr/i686-w64-mingw32.shared/bin")
     set(MXE_OBJDUMP "${PACKAGE_MXEROOT}/usr/bin/i686-w64-mingw32.shared-objdump")
@@ -9,6 +8,8 @@
     set(MXE_OBJDUMP "${PACKAGE_MXEROOT}/usr/bin/x86_64-w64-mingw32.shared-objdump")
   endif()

+  file(GLOB MXE_GCC_LIB_DIR "${MXE_BIN_DIR}/gcc*")
+  list(APPEND PACKAGE_SEARCHDIRS ${MXE_GCC_LIB_DIR})
   list(APPEND PACKAGE_SEARCHDIRS ${MXE_BIN_DIR})
   list(APPEND PACKAGE_SEARCHDIRS "${MXE_BIN_DIR}/../qt/bin") #Qt
   list(APPEND PACKAGE_SEARCHDIRS "${MXE_BIN_DIR}/../qt/lib") #Qwt
@@ -82,6 +83,11 @@
   comdlg32.dll
   IMM32.dll
   WINMM.dll
+  Secur32.dll
+  LIBEAY32.dll
+  SHFOLDER.DLL
+  SSLEAY32.dll
+  WSOCK32.DLL
   WINSPOOL.DRV)

 ## http://www.cmake.org/Wiki/CMakeMacroListOperations
@@ -195,4 +201,4 @@
       DESTINATION ${APP_OTBLIBS_DIR})
   endif()

-endfunction()+endfunction()


fbcode_builder: fix a minor bug in THRIFT_INCLUDE_DIR argument parsing

Summary:
Fix a minor bug in the argument parsing for `add_fbthrift_cpp_library()`:
only a single value should be supplied for the `THRIFT_INCLUDE_DIR` argument.
This parameter should not accept a list of arguments.

Reviewed By: strager

Differential Revision: D17125810

fbshipit-source-id: 31f354e4d6299d3626a94f3b4b5ff8c58bb0cf7b

--- build/fbcode_builder/CMake/FBThriftCppLibrary.cmake
+++ build/fbcode_builder/CMake/FBThriftCppLibrary.cmake
@@ -22,8 +22,8 @@
 #   desired.
 function(add_fbthrift_cpp_library LIB_NAME THRIFT_FILE)
   # Parse the arguments
-  set(one_value_args INCLUDE_DIR)
-  set(multi_value_args SERVICES DEPENDS OPTIONS THRIFT_INCLUDE_DIR)
+  set(one_value_args INCLUDE_DIR THRIFT_INCLUDE_DIR)
+  set(multi_value_args SERVICES DEPENDS OPTIONS)
   fb_cmake_parse_args(
     ARG "" "${one_value_args}" "${multi_value_args}" "${ARGN}"
   )


Fixing TIMESTAMP mechanism for PY file compilation

--- salome_adm/cmake_files/SalomeMacros.cmake
+++ salome_adm/cmake_files/SalomeMacros.cmake
@@ -129,9 +129,9 @@
       ELSE(${CMAKE_VERSION} VERSION_LESS "2.8.11")
         GET_FILENAME_COMPONENT(file_we ${file_name} NAME_WE)
         INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${path}/${file_name}')\")")
-        INSTALL(CODE "FILE(TIMESTAMP \"${CMAKE_CURRENT_SOURCE_DIR}/${file}\"            py_time)")
-        INSTALL(CODE "FILE(TIMESTAMP \"${CMAKE_INSTALL_PREFIX}/${path}/${file_we}.pyc\" pyc_time)")
-        INSTALL(CODE "FILE(TIMESTAMP \"${CMAKE_INSTALL_PREFIX}/${path}/${file_we}.pyo\" pyo_time)")
+        INSTALL(CODE "FILE(TIMESTAMP \"${CMAKE_INSTALL_PREFIX}/${path}/${file_name}\"            py_time)")
+        INSTALL(CODE "IF(EXISTS \"${CMAKE_INSTALL_PREFIX}/${path}/${file_we}.pyc\") \n  FILE(TIMESTAMP \"${CMAKE_INSTALL_PREFIX}/${path}/${file_we}.pyc\" pyc_time) \n ELSE()\n  SET(pyc_time 0) \n ENDIF() ")
+        INSTALL(CODE "IF(EXISTS \"${CMAKE_INSTALL_PREFIX}/${path}/${file_we}.pyo\") \n  FILE(TIMESTAMP \"${CMAKE_INSTALL_PREFIX}/${path}/${file_we}.pyo\" pyo_time) \n ELSE()\n  SET(pyo_time 0) \n ENDIF() ")
         #INSTALL(CODE "MESSAGE(STATUS \"\${py_time} \${pyc_time} \")")
         INSTALL(CODE "STRING(COMPARE LESS \${pyc_time} \${py_time} to_install_pyc)")
         INSTALL(CODE "STRING(COMPARE LESS \${pyo_time} \${py_time} to_install_pyo)")


cmake: fix syntax error

cmake: fix syntax error

--- scripts/cmake/ElektraPackaging.cmake
+++ scripts/cmake/ElektraPackaging.cmake
@@ -350,7 +350,7 @@
 	if (EXCLUDED_COMPONENTS)
 		list (REMOVE_ITEM PACKAGES libelektra4-all)
 		string (REPLACE ";" ", " EXCLUDED_COMPONENTS_STR "${EXCLUDED_COMPONENTS}")
-		message (STATUS "Excluding libelektra4-all because following components are excluded: ${EXCLUDED_COMPONENTS_STR}".)
+		message (STATUS "Excluding libelektra4-all because following components are excluded: ${EXCLUDED_COMPONENTS_STR}")
 		list (APPEND EXCLUDED_COMPONENTS libelektra4-all)
 	endif ()
 	# For Debian-based distros we want to create DEB packages.


Fix memory linker flags setup for Web build. This is a regression issue. We used to configure it globally before moving it to setup_target() macro. There is a pro and con on where to configure the memory linker flag. If we do it globally then we cannot alter the total memory size per target application (if a project has multiple targets). However, since there is a bug in its current implementation in the setup_target() macro, the logic is moved back again to global section a quick fix for this bug. This means we could not have alternative memory size in any of the sample targets, which we do not do anymore after the default memory size has been increased to 128 MB.

--- CMake/Modules/Urho3D-CMake-common.cmake
+++ CMake/Modules/Urho3D-CMake-common.cmake
@@ -691,7 +691,12 @@
                 set (CMAKE_EXECUTABLE_SUFFIX_C .html)
                 set (CMAKE_EXECUTABLE_SUFFIX_CXX .html)
                 # Linker flags
-                set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s NO_EXIT_RUNTIME=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1")
+                if (EMSCRIPTEN_ALLOW_MEMORY_GROWTH)
+                    set (MEMORY_LINKER_FLAGS "-s ALLOW_MEMORY_GROWTH=1")
+                else ()
+                    set (MEMORY_LINKER_FLAGS "-s TOTAL_MEMORY=${EMSCRIPTEN_TOTAL_MEMORY}")
+                endif ()
+                set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MEMORY_LINKER_FLAGS} -s NO_EXIT_RUNTIME=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1")
                 set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -O3 -s AGGRESSIVE_VARIABLE_ELIMINATION=1")     # Remove variables to make the -O3 regalloc easier
                 set (CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -g4")     # Preserve LLVM debug information, show line number debug comments, and generate source maps
                 if (URHO3D_TESTING)
@@ -1402,11 +1407,6 @@
             endif ()
         elseif (WEB)
             if (EMSCRIPTEN)
-                if (EMSCRIPTEN_ALLOW_MEMORY_GROWTH)
-                    set (MEMORY_LINKER_FLAGS "-s ALLOW_MEMORY_GROWTH=1")
-                else ()
-                    set (MEMORY_LINKER_FLAGS "-s TOTAL_MEMORY=${EMSCRIPTEN_TOTAL_MEMORY}")
-                endif ()
                 # Pass additional source files to linker with the supported flags, such as: js-library, pre-js, post-js, embed-file, preload-file, shell-file
                 foreach (FILE ${SOURCE_FILES})
                     get_property (EMCC_OPTION SOURCE ${FILE} PROPERTY EMCC_OPTION)
@@ -1421,7 +1421,7 @@
                                 set (EMCC_EXCLUDE_FILE " --exclude-file ${EMCC_EXCLUDE_FILE}")
                             endif ()
                         endif ()
-                        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MEMORY_LINKER_FLAGS} --${EMCC_OPTION} ${FILE}${EMCC_FILE_ALIAS}${EMCC_EXCLUDE_FILE}")
+                        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --${EMCC_OPTION} ${FILE}${EMCC_FILE_ALIAS}${EMCC_EXCLUDE_FILE}")
                     endif ()
                 endforeach ()
             endif ()


For Travis CI - speed up Emscripten Debug configuration build.

--- CMake/Modules/Urho3D-CMake-common.cmake
+++ CMake/Modules/Urho3D-CMake-common.cmake
@@ -387,6 +387,11 @@
             # Emscripten-specific setup
             set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-warn-absolute-paths -Wno-unknown-warning-option")
             set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-warn-absolute-paths -Wno-unknown-warning-option")
+            if (DEFINED ENV{CI})
+                # Our CI server is slow, so do not optimize and discard all debug info when test building in Debug configuration
+                set (CMAKE_C_FLAGS_DEBUG "-g0")
+                set (CMAKE_CXX_FLAGS_DEBUG "-g0")
+            endif ()
             # CMake does not treat Emscripten as a valid platform yet, certain platform-specific variables cannot be set in the
             # toolchain file as they get overwritten by CMake internally as per Linux platform default, so set them here for now
             set (CMAKE_EXECUTABLE_SUFFIX .html)
@@ -739,7 +744,9 @@
         set (MEMORY_LINKER_FLAGS "-s TOTAL_MEMORY=${EMSCRIPTEN_TOTAL_MEMORY}")
     endif ()
     set (${LINKER_FLAGS} "${${LINKER_FLAGS}} ${MEMORY_LINKER_FLAGS} -s USE_SDL=2 -s ERROR_ON_UNDEFINED_SYMBOLS=1")    # Urho3D uses SDL2 so set it here instead of in the toolchain which potentially could be reused in other projects not using SDL2
-    set (${LINKER_FLAGS}_DEBUG -g4)     # Preserve LLVM debug information, show line number debug comments, and generate source maps
+    if (NOT DEFINED ENV{CI})
+        set (${LINKER_FLAGS}_DEBUG -g4)     # Preserve LLVM debug information, show line number debug comments, and generate source maps
+    endif ()
 endmacro ()

 # Macro for setting up an executable target with resources to copy/package/bundle/preload


fix error finding make

fix error finding make

git-svn-id: fe3cd4388a6e5a968b09397a3d721fe124e8117a@159 5b54908e-ead4-fc18-b48a-0285e6dbc711

--- tests/runsuite.cmake
+++ tests/runsuite.cmake
@@ -257,6 +257,7 @@
 set(CTEST_COMMAND "${CTEST_EXECUTABLE_NAME}")
 if (UNIX OR NOT arg_use_nmake)
   set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
+  find_program(MAKE_COMMAND make DOC "make command")
   if (have_cygwin)
     # seeing errors building in parallel: pdb collision?
     set(CTEST_BUILD_COMMAND_BASE "${MAKE_COMMAND} -j2")


Fixing gflags static link

Fixing gflags static link

Former-commit-id: a27cd71335c654a5f31e47bf27bc1a814586f136

--- cmake-modules/Fetch_Ceres.cmake
+++ cmake-modules/Fetch_Ceres.cmake
@@ -33,7 +33,7 @@
     ### Compiler-dependent flags ###
     ################################
     if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-        set(FLAGS "${FLAGS} -static -v --gcc-toolchain=${GCC_TOOLCHAIN} -stdlib=libstdc++")
+        set(FLAGS "${FLAGS} -static --gcc-toolchain=${GCC_TOOLCHAIN} -stdlib=libstdc++")
     endif()
     set(FLAGS "${FLAGS} -I${GLOG_INCLUDE_DIR} -L${GLOG_LIBRARY_DIR} -I${GFLAGS_INCLUDE_DIR}  -L${GFLAGS_LIBRARY_DIR}")

@@ -56,8 +56,8 @@
             CMAKE_ARGS
             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
             -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-            -DBUILD_TESTING:BOOL=ON
-            -DBUILD_EXAMPLES:BOOL=ON
+            -DBUILD_TESTING:BOOL=OFF
+            -DBUILD_EXAMPLES:BOOL=OFF
             -DCMAKE_CXX_FLAGS:STRING=${FLAGS}
             -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
             -DCMAKE_FIND_LIBRARY_SUFFIXES:STRING=${CUSTOM_SUFFIX}


Squashed '3rdparty/github/cmake-utils/' changes from 4497feec..11a4efae

11a4efae cmake/MyPackageDependency.cmake: skip an unwanted warning

git-subtree-dir: 3rdparty/github/cmake-utils
git-subtree-split: 11a4efae14c643dc8e6f29d226ba06a92bda58a2

--- cmake/MyPackageDependency.cmake
+++ cmake/MyPackageDependency.cmake
@@ -95,7 +95,7 @@
         ENDIF ()
       ENDIF ()
     ELSE ()
-      MESSAGE (WARNING "[${PROJECT_NAME}-DEPEND-WARNING] Target ${packageDepend} already exist - use MyPackageDependency to avoid this warning")
+      # MESSAGE (WARNING "[${PROJECT_NAME}-DEPEND-WARNING] Target ${packageDepend} already exist - use MyPackageDependency to avoid this warning")
       IF (MYPACKAGE_DEBUG)
         MESSAGE (STATUS "[${PROJECT_NAME}-DEPEND-DEBUG] Setting property MYPACKAGE_DEPENDENCY_${packageDepend} to DONE")
       ENDIF ()


[CMake][Apple-stage2] Don't link with -fno-pie

On Darwin the default is to build PIC and link PIE. We shouldn't need to override that in the Apple Clang distributions.

git-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@268642 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/caches/Apple-stage2.cmake
+++ cmake/caches/Apple-stage2.cmake
@@ -28,7 +28,6 @@
 set(LLVM_ENABLE_LTO ON CACHE BOOL "")
 set(CMAKE_C_FLAGS "-fno-stack-protector -fno-common -Wno-profile-instr-unprofiled" CACHE STRING "")
 set(CMAKE_CXX_FLAGS "-fno-stack-protector -fno-common -Wno-profile-instr-unprofiled" CACHE STRING "")
-set(CMAKE_EXE_LINKER_FLAGS "-fno-pie" CACHE STRING "")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -gline-tables-only -DNDEBUG" CACHE STRING "")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -gline-tables-only -DNDEBUG" CACHE STRING "")
 set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "")


Pass all additional arguments of distortosLss() to ${CMAKE_OBJDUMP}

--- cmake/distortos-utilities.cmake
+++ cmake/distortos-utilities.cmake
@@ -82,10 +82,12 @@
 #
 # Generates disassembly of output file of `target` to file named `lssFilename`.
 #
+# All additional arguments are passed to ${CMAKE_OBJDUMP}.
+#

 function(distortosLss target lssFilename)
 	add_custom_command(TARGET ${target} POST_BUILD
-			COMMAND ${CMAKE_OBJDUMP} --demangle -S $<TARGET_FILE:${target}> > ${lssFilename}
+			COMMAND ${CMAKE_OBJDUMP} ${ARGN} --demangle -S $<TARGET_FILE:${target}> > ${lssFilename}
 			BYPRODUCTS ${lssFilename}
 			VERBATIM)
 endfunction()


This should fix the parent scope issue no matter where it is

--- cmakefiles/LegitUtilities.cmake
+++ cmakefiles/LegitUtilities.cmake
@@ -21,39 +21,18 @@

 MACRO (LEGIT_ADD_SOURCES)
-    FILE (RELATIVE_PATH _relPath "${CMAKE_SOURCE_DIR}/libs/legit" "${CMAKE_CURRENT_SOURCE_DIR}")
     FOREACH (_src ${ARGN})
-        IF (_relPath)
-            LIST (APPEND LEGIT_SOURCES "${_relPath}/${_src}")
-        ELSE (_relPath)
-            LIST (APPEND LEGIT_SOURCES "${_src}")
-        ENDIF (_relPath)
+        LIST (APPEND LEGIT_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/${_src}")
     ENDFOREACH()
-    IF (_relPath)
-        SET (LEGIT_SOURCES ${LEGIT_SOURCES} PARENT_SCOPE)
-    ENDIF(_relPath)
 ENDMACRO (LEGIT_ADD_SOURCES)

 MACRO (LEGIT_REGISTER_TRACKER HEADER TRACKER LOCATION)
-    FILE (RELATIVE_PATH _relPath "${CMAKE_SOURCE_DIR}/libs/legit/src" "${CMAKE_CURRENT_SOURCE_DIR}")
-    IF (_relPath)
-        LIST (APPEND LEGIT_TRACKERS "${_relPath}/${HEADER}")
-        SET_SOURCE_FILES_PROPERTIES("${_relPath}/${HEADER}" PROPERTIES LEGIT_TRACKER $TRACKER)
-    ELSE (_relPath)
-        LIST (APPEND LEGIT_TRACKERS "${HEADER}")
-        SET_SOURCE_FILES_PROPERTIES("${HEADER}" PROPERTIES LEGIT_TRACKER $TRACKER)
-    ENDIF (_relPath)
-    IF (_relPath)
-        SET (LEGIT_TRACKERS ${LEGIT_TRACKERS} PARENT_SCOPE)
-    ENDIF(_relPath)
+    LIST (APPEND LEGIT_TRACKERS "${HEADER}")
+    SET_SOURCE_FILES_PROPERTIES("${HEADER}" PROPERTIES LEGIT_TRACKER $TRACKER)
 ENDMACRO (LEGIT_REGISTER_TRACKER)

 MACRO (LEGIT_REGISTER_CONFIGURATION CONFIG)
-    FILE (RELATIVE_PATH _relPath "${CMAKE_SOURCE_DIR}/libs/legit" "${CMAKE_CURRENT_SOURCE_DIR}")
     LIST (APPEND LEGIT_CONFIGURATION "${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}")
-    IF (_relPath)
-        SET (LEGIT_CONFIGURATION ${LEGIT_CONFIGURATION} PARENT_SCOPE)
-    ENDIF(_relPath)
 ENDMACRO (LEGIT_REGISTER_CONFIGURATION)


New version: 0.4.0

New version: 0.4.0

--- hawkey/VERSION.cmake
+++ hawkey/VERSION.cmake
@@ -1,3 +1,3 @@
 SET(HAWKEY_MAJOR "0")
-SET(HAWKEY_MINOR "3")
-SET(HAWKEY_PATCH "16")
+SET(HAWKEY_MINOR "4")
+SET(HAWKEY_PATCH "0")


Add defaults overrides to doxygen cmake add directives.

--- build-aux/doxygen.cmake
+++ build-aux/doxygen.cmake
@@ -83,11 +83,14 @@
 # to override it if it cannot be build for some reason (this is a good idea).
 # Currently outputs may be: html, latex (gives you pdf), and man.  It does
 # not accept things which are not directly implemented by add_doxygen, since
-# most GENERATE_x require some external programs.
+# most GENERATE_x require some external programs.
 #
 # Currently it may be html, latex, or man.  Each of these outputs will be
 # forced to "yes" or "no" depending on OUTPUT; again they may be overridden
 # by OVERRIDES or by a missing dependency.
+#
+# The special keyword "none" can be used to tell add_doxygen to generate no
+# targets and (crucially) to force then GENERATE_x args to NO.
 #
 # NOTE: currently man is not installable because doxygen makes a huge messy
 # directory full of pages and they need some love.
@@ -152,6 +155,8 @@
 #   [OVERRIDES_VAR overrides_varname]
 #   [NO_USER_DOXYFILE]
 #   [NO_INSTALL | INSTALL <true|false>]
+#   [PDF_DEFAULT <true|false>]
+#   [HTML_DEFAULT <true|false>]
 #
 #   [INPUTS dir...]
 #   [VERSION project_version]
@@ -179,6 +184,9 @@
 #   installing if all docs, instead of just pdf, html etc. for this one target.
 # INSTALL - an alias for NO_INSTALL so you can use some other variable to
 #   determine the value directly.
+#
+# PDF_DEFAULT - default value for WANT_PDF option
+# HTML_DEFAULT - and for html.
 #
 # VERSION - when not present it uses ${PROJECT_VERSION}.
 # PROJECT - when not present it uses ${PROJECT_NAME}
@@ -311,7 +319,7 @@
   # TODO:
   #   add the ability to specify defaults for the option()'s.
   butil_parse_args(
-    "ARGS_VAR;TARGET;OVERRIDES_VAR;VERSION;PROJECT;DOCS_MIRROR;DEFAULT_DOXYFILE;EXAMPLES;INSTALL;INPUTS"
+    "ARGS_VAR;TARGET;OVERRIDES_VAR;VERSION;PROJECT;DOCS_MIRROR;DEFAULT_DOXYFILE;EXAMPLES;INSTALL;INPUTS;PDF_DEFAULT;HTML_DEFAULT"
     "NO_USER_DOXYFILE;SYSTEM;NO_INSTALL"
     ""
     "${ARGV}"
@@ -375,8 +383,21 @@
   set(doxyfile_cachevar "${target_upcase}_DOXYFILE_TEMPLATE")

   option(${rebuild_cachevar} "Regenerate doxygen and install that instead of the distributed docs." NO)
-  option(${pdf_cachevar} "Install PDF from doxygen (needs pdfLaTeX)" YES)
-  option(${html_cachevar} "Install HTML made by doxygen" YES)
+
+  # Be specific.
+  if (arg_PDF_DEFAULT)
+    set(val "YES")
+  else()
+    set(val "NO")
+  endif()
+  option(${pdf_cachevar} "Install PDF from doxygen (needs pdfLaTeX)" ${val})
+
+  if (arg_HTML_DEFAULT)
+    set(val "YES")
+  else()
+    set(val "NO")
+  endif()
+  option(${html_cachevar} "Install HTML made by doxygen" ${val})

   mark_as_advanced(
     ${rebuild_cachevar}
@@ -384,18 +405,24 @@
     ${html_cachevar}
   )

-  if (${pdf_cachevar} OR ${html_cachevar})
-    list(APPEND ${arg_ARGS_VAR} OUTPUTS)
-  endif()
+  set(add_empty_string TRUE)
+  list(APPEND ${arg_ARGS_VAR} OUTPUTS)

   if (${pdf_cachevar})
     message(STATUS "${arg_TARGET}: LaTeX is on.")
+    set(add_empty_string FALSE)
     list(APPEND ${arg_ARGS_VAR} "latex")
   endif()

   if (${html_cachevar})
     message(STATUS "${arg_TARGET}: HTML is on.")
+    set(add_empty_string FALSE)
     list(APPEND ${arg_ARGS_VAR} "html")
+  endif()
+
+  # Bit of a hack.  We need outputs set to *something* or it won't work :)
+  if (add_empty_string)
+    list(APPEND ${arg_ARGS_VAR} "none")
   endif()

   if (${rebuild_cachevar})
@@ -555,18 +582,30 @@
   # User overides which we are allowed to override right back if we want :).
   # For compatibility, we allow the doxyfile to specify this.

-  # TODO: use pdf, ps instead of LaTeX..
   if (arg_OUTPUTS)
     # TODO: validate these names.
+    set(is_none FALSE)
     foreach (o ${arg_OUTPUTS})
+      if (o STREQUAL "none")
+        if(is_none)
+          message(FATAL_ERROR "add_doxygen(): OUTPUT contains `none' as well as other values.")
+        endif()
+        set(is_none TRUE)
+      endif()
       string(TOUPPER ${o} o)
       set(out_${o} "YES")
     endforeach()

+    if (DOXYGEN_CMAKE_VERBOSE AND is_none)
+      message("add_doxygen(): outputs are forced to none.")
+    endif()
+
     set(possible_outs "HTML" "MAN" "LATEX")
     foreach (o ${possible_outs})
       list(APPEND extra_force GENERATE_${o})
-      if (out_${o})
+      if (is_none)
+        add_doxygen_override_var(GENERATE_${o} "NO")
+      elseif (out_${o})
         add_doxygen_override_var(GENERATE_${o} "YES")
       else()
         add_doxygen_override_var(GENERATE_${o} "NO")
@@ -909,8 +948,8 @@

 # Set up a load of variables for a later call to doxygen_install.
 macro(doxgyen_setup_flags flags_var target wants)
+  message(STATUS "Setting doxygen flags.")
   message("doxgyen_setup_flags(): this function is deprected")
-  message(STATUS "Setting doxygen flags.")

   set(DOXYGEN_OUT_DIR "${CMAKE_BINARY_DIR}/${target}")


updated models hash

updated models hash

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -16,7 +16,7 @@

 set(CTEST_PROJECT_NAME "Embree")
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(TEST_MODELS_HASH 0b47d408445db5b3ce4c7b363df395a09010b31f)
+set(TEST_MODELS_HASH 1890ce6da5ff9fb258d54c70420c0b0bf75b9293)

 IF (NOT CTEST_DROP_SITE)
   set(CTEST_DROP_METHOD "http")


maybe we need to include first?

maybe we need to include first?

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -2,8 +2,9 @@
 ## Then modify the CMakeLists.txt file in the root directory of your
 ## project to incorporate the testing dashboard.
 ## # The following are required to uses Dart and the Cdash dashboard
+
+include(CTest)
 enable_testing()
-include(CTest)
 set(CTEST_PROJECT_NAME "phonon")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CET")


Fix version >= check in FLP

Fix version >= check in FLP

--- FindLibraryPackage.cmake
+++ FindLibraryPackage.cmake
@@ -178,12 +178,11 @@
         endif()
       endif()
     else()
-      if( NOT ${name}_FIND_VERSION VERSION_EQUAL ${_flp_NAME}_VERSION AND
-          NOT ${name}_FIND_VERSION VERSION_GREATER ${_flp_NAME}_VERSION )
+      if( ${name}_FIND_VERSION VERSION_GREATER ${_flp_NAME}_VERSION )
         set(_flp_EPIC_FAIL TRUE)
         if(_flp_output)
           message(${_flp_version_output_type}
-            "Version ${${name}_FIND_VERSION} or higher of ${name} is required."
+            "Version ${${name}_FIND_VERSION} or higher of ${name} is required. "
             "Version ${${_flp_NAME}_VERSION} was found in ${${_flp_NAME}_INCLUDE_DIR}.")
         endif()
       endif()


cmake: Add possible support for SCO OpenServer 6 with GCC compiler

--- platforms/scosv-gcc/platform.cmake
+++ platforms/scosv-gcc/platform.cmake
@@ -2,18 +2,29 @@
 set (PLIB_IPC_MODEL sysv)
 set (PLIB_TIME_PROFILER_MODEL posix)
 set (PLIB_DIR_MODEL posix)
-
-set (PLIB_PLATFORM_LINK_LIBRARIES socket nsl gthreads)

 set (PLIB_PLATFORM_DEFINES
         -D_REENTRANT
         -D_SIMPLE_R
 )

-message ("
-         You need a working port of FSU Pthreads in order to
-         compile with multi-threading support. Please refer to
-         http://moss.csc.ncsu.edu/~mueller/pthreads/ for more
-         details. Make sure that it is compiled with thread-safe
-         memory allocation (usually -DMALLOC macro definition).
-         ")
+if (CMAKE_SYSTEM_VERSION VERSION_LESS "5.0")
+        set (PLIB_PLATFORM_LINK_LIBRARIES socket nsl gthreads)
+
+        message ("
+                 You need a working port of FSU Pthreads in order to
+                 compile with multi-threading support. Please refer to
+                 http://moss.csc.ncsu.edu/~mueller/pthreads/ for more
+                 details. Make sure that it is compiled with thread-safe
+                 memory allocation (usually -DMALLOC macro definition).
+                 ")
+else()
+        set (PLIB_PLATFORM_LINK_LIBRARIES socket nsl -pthread)
+        set (PLIB_PLATFORM_CFLAGS -pthread)
+
+        message ("
+                 SCO OpenServer 6 was not actually tested with GCC
+                 compiler. This build may or may not work properly.
+                 Consider running tests before usage.
+                 ")
+endif()


CMake: Removed `ENABLE_DEBUG` option.

CMake: Removed `ENABLE_DEBUG` option.

This option was added as a mapping from the Autotools `--enable-debug`
flag. However, it does not work as expected, since some CMake generators
are multi-configuration. That is, CMake does not necessarily configure a
particular Debug or Release configuration, and instead (for some
generators, such as Visual Studio) it produces build files where the
congfiguration can be changed at build time.

The CMake documentation states that the variable `CMAKE_BUILD_TYPE`
should never be set in a CMake file (although it can be referenced, as
CMake is automatically invoked during builds, where it may be defined).
Thus multi-configuration generators did not respect what a user intended
with `-DENABLE_DEBUG=1` nor with `-DENABLE_DEBUG=0`, and the default
configuration was meaningless.

Review: https://reviews.apache.org/r/59773/

--- cmake/CompilationConfigure.cmake
+++ cmake/CompilationConfigure.cmake
@@ -19,11 +19,6 @@
 option(VERBOSE "Enable verbose CMake statements and compilation output" ON)
 set(CMAKE_VERBOSE_MAKEFILE ${VERBOSE})

-option(ENABLE_DEBUG "Set default build configuration to debug" ON)
-if (ENABLE_DEBUG)
-  set(CMAKE_BUILD_TYPE Debug)
-endif (ENABLE_DEBUG)
-
 option(BUILD_SHARED_LIBS "Build shared libraries." OFF)

 option(ENABLE_PRECOMPILED_HEADERS


PythonQt needs to be installed outside of the DisplayCluster source directory for the installed executable to be able to find the library.

--- cmake/modules/FindPythonQt.cmake
+++ cmake/modules/FindPythonQt.cmake
@@ -15,13 +15,13 @@
 # Include dir
 find_path(PythonQt_INCLUDE_DIR
   NAMES PythonQt.h
-  PATHS ${PythonQt_PKGCONF_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/dependencies/PythonQt2.0.1/src
+  PATHS ${PythonQt_PKGCONF_INCLUDE_DIRS}
 )

 # Finally the library itself
 find_library(PythonQt_LIBRARY
   NAMES PythonQt
-  PATHS ${PythonQt_PKGCONF_LIBRARY_DIRS} ${CMAKE_SOURCE_DIR}/dependencies/PythonQt2.0.1/lib
+  PATHS ${PythonQt_PKGCONF_LIBRARY_DIRS}
 )

 # Set the include dir variables and the libraries and let libfind_process do the rest.


plugin description changed

plugin description changed

--- src/PluginConfig.cmake
+++ src/PluginConfig.cmake
@@ -11,7 +11,7 @@

 set(PLUGIN_NAME "WebChimera")
 set(PLUGIN_PREFIX "WebChimera")
-set( PLUGIN_DESCRIPTION "Web Plugin powered by Firebreath/Qt Qml/Vlc" )
+set( PLUGIN_DESCRIPTION "Browser Video plugin/player powered by Firebreath/Qt Qml/Vlc" )
 set( FBVLC_PLUGIN_DESCRIPTION "FireBreathed VLC (aka FBVLC) emulator" )
 set(PRODUCT_NAME "WebChimera Plugin")
 set(PROJECT_OWNER "Sergey Radionov")


Accidentally had the wrong library synonym in my Findparsical.cmake file

--- src/Findparsical.cmake
+++ src/Findparsical.cmake
@@ -22,7 +22,7 @@
 )

 set(PARSICAL_INCLUDE_DIRS ${PARSICAL_INCLUDE_DIR})
-set(PARSICAL_LIBRARIES ${PARSICAL_LIBRARIES})
+set(PARSICAL_LIBRARIES ${PARSICAL_LIBRARY})

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(


Set default host in UploadPPA

Set default host in UploadPPA

--- UploadPPA.cmake
+++ UploadPPA.cmake
@@ -23,6 +23,14 @@
 endif()

 set(UPLOADPPA_FOUND TRUE)
+
+if(NOT DPUT_HOST)
+  if(RELEASE_VERSION)
+    set(DPUT_HOST "ppa:eilemann/equalizer")
+  else()
+    set(DPUT_HOST "ppa:eilemann/equalizer-dev")
+  endif()
+endif()

 # DEBIAN/control
 # debian policy enforce lower case for package name


Fix syntax error

Fix syntax error

--- UploadPPA.cmake
+++ UploadPPA.cmake
@@ -224,6 +224,6 @@
 function(UPLOAD_PPAS)
   foreach(UBUNTU_CODENAME ${UBUNTU_CODENAMES})
     upload_ppa(${UBUNTU_CODENAME})
-  endif()
+  endforeach()
   add_custom_target(dput DEPENDS ${DPUT_TARGETS})
 endfunction()


FindLLVM.cmake: Fix LLVM_LIBS_CORE detection

Currently, link phase fails as follows:

  [ 24%] Linking CXX shared library libcpu.so
  c++: error: unknown: No such file or directory
  c++: error: component: No such file or directory
  c++: error: name:: No such file or directory
  c++: error: ipa: No such file or directory

The problem is that there's no "ipa" component in LLVM 8. Let's switch
to "llvm-config --libs all", instead, for LLVM_LIBS_CORE.

--- CMake/FindLLVM.cmake
+++ CMake/FindLLVM.cmake
@@ -107,7 +107,7 @@
   MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS})
   exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --ldflags   OUTPUT_VARIABLE LLVM_LDFLAGS )
   MESSAGE(STATUS "LLVM LD flags: " ${LLVM_LDFLAGS})
-  exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --libs core ipa ipo instrumentation bitreader bitwriter linker OUTPUT_VARIABLE LLVM_LIBS_CORE )
+  exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --libs all OUTPUT_VARIABLE LLVM_LIBS_CORE )
   MESSAGE(STATUS "LLVM core libs: " ${LLVM_LIBS_CORE})
   IF(APPLE AND UNIVERSAL)
     FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "jit native x86 PowerPC ARM" LLVM_LIBS_JIT LLVM_LIBS_JIT_OBJECTS )


Fix perf test detection

Fix perf test detection

--- CommonCPPCTest.cmake
+++ CommonCPPCTest.cmake
@@ -87,7 +87,7 @@
   set_target_properties(ctest_${TEST_NAME} PROPERTIES
     EXCLUDE_FROM_DEFAULT_BUILD ON FOLDER ${PROJECT_NAME}/tests/ctest)

-  if(NAME MATCHES "^perf.*")
+  if("${NAME}" MATCHES "^perf.*")
     list(APPEND ALL_CPP_PERF_TESTS ctest_${TEST_NAME})
   else()
     list(APPEND ALL_CPP_TESTS ctest_${TEST_NAME})


FIX (#6149): make helper apps executable

--- CMake/CoreHelpers.cmake
+++ CMake/CoreHelpers.cmake
@@ -468,6 +468,9 @@
   ${MITK_BINARY_DIR}/bin/${intermediate_dir}
   ${_install_LIBRARY_DIRS}
   )
+IF(APPLE)
+  LIST(APPEND DIRS "/usr/lib")
+ENDIF(APPLE)

 FOREACH(_target ${_install_EXECUTABLES})

@@ -482,7 +485,7 @@
       SET(_qt_conf_install_dirs bin)
       SET(_target_locations bin/${_target_name})
       SET(${_target_locations}_qt_plugins_install_dir bin)
-      INSTALL(FILES ${_target} DESTINATION bin)
+      INSTALL(PROGRAMS ${_target} DESTINATION bin)
     ELSE(NOT MACOSX_BUNDLE_NAMES)
       FOREACH(bundle_name ${MACOSX_BUNDLE_NAMES})
         LIST(APPEND _qt_conf_install_dirs ${bundle_name}.app/Contents/Resources)
@@ -490,14 +493,14 @@
 	    LIST(APPEND _target_locations ${_current_target_location})
 		SET(${_current_target_location}_qt_plugins_install_dir ${bundle_name}.app/Contents/MacOS)

-		INSTALL(FILES ${_target} DESTINATION ${bundle_name}.app/Contents/MacOS/)
+		INSTALL(PROGRAMS ${_target} DESTINATION ${bundle_name}.app/Contents/MacOS/)
       ENDFOREACH(bundle_name)
     ENDIF(NOT MACOSX_BUNDLE_NAMES)
 ELSE()
   SET(_target_locations bin/${_target_name})
   SET(${_target_locations}_qt_plugins_install_dir bin)
   SET(_qt_conf_install_dirs bin)
-  INSTALL(FILES ${_target} DESTINATION bin)
+  INSTALL(PROGRAMS ${_target} DESTINATION bin)
 ENDIF()

 FOREACH(_target_location ${_target_locations})


Do not look for release and debug libraries separately for external projects

--- CMake/FindDCMTK.cmake
+++ CMake/FindDCMTK.cmake
@@ -95,12 +95,15 @@
   mark_as_advanced(DCMTK_${lib}_LIBRARY_DEBUG)

   # Add libraries to variable according to build type
+  set(DCMTK_${lib}_LIBRARY)
   if(DCMTK_${lib}_LIBRARY_RELEASE)
     list(APPEND DCMTK_LIBRARIES optimized ${DCMTK_${lib}_LIBRARY_RELEASE})
+    list(APPEND DCMTK_${lib}_LIBRARY optimized ${DCMTK_${lib}_LIBRARY_RELEASE})
   endif()

   if(DCMTK_${lib}_LIBRARY_DEBUG)
     list(APPEND DCMTK_LIBRARIES debug ${DCMTK_${lib}_LIBRARY_DEBUG})
+    list(APPEND DCMTK_${lib}_LIBRARY debug ${DCMTK_${lib}_LIBRARY_DEBUG})
   endif()

 endforeach()
@@ -162,37 +165,15 @@
   mark_as_advanced(DCMTK_dcmtk_INCLUDE_DIR)
 endif()

-# If either Debug or Release has been build, but the other has not
-# we return still should not return a not found
-
-foreach(lib
-    dcmimgle
-    dcmdata
-    ofstd
-    )
-
-  if( DCMTK_${lib}_LIBRARY_RELEASE AND NOT DCMTK_${lib}_LIBRARY_DEBUG )
-    set(DCMTK_${lib}_LIBRARY_DEBUG ${DCMTK_${lib}_LIBRARY_RELEASE} )
-  endif()
-
-  if( DCMTK_${lib}_LIBRARY_DEBUG AND NOT DCMTK_${lib}_LIBRARY_RELEASE )
-    set(DCMTK_${lib}_LIBRARY_RELEASE ${DCMTK_${lib}_LIBRARY_DEBUG} )
-  endif()
-
-endforeach()
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(DCMTK DEFAULT_MSG
   DCMTK_config_INCLUDE_DIR
   DCMTK_ofstd_INCLUDE_DIR
-  DCMTK_ofstd_LIBRARY_RELEASE
-  DCMTK_ofstd_LIBRARY_DEBUG
+  DCMTK_ofstd_LIBRARY
   DCMTK_dcmdata_INCLUDE_DIR
-  DCMTK_dcmdata_LIBRARY_RELEASE
-  DCMTK_dcmdata_LIBRARY_DEBUG
+  DCMTK_dcmdata_LIBRARY
   DCMTK_dcmimgle_INCLUDE_DIR
-  DCMTK_dcmimgle_LIBRARY_RELEASE
-  DCMTK_dcmimgle_LIBRARY_DEBUG
+  DCMTK_dcmimgle_LIBRARY
   )

 # Compatibility: This variable is deprecated


Patch 3517455 - Rename the COPYING file due to CPack not allowing files without extensions.

--HG--
branch : v1-8

--- CMake/Packaging.cmake
+++ CMake/Packaging.cmake
@@ -18,7 +18,11 @@
 set(CPACK_PACKAGE_NAME "OGRE")
 set(CPACK_PACKAGE_VENDOR "Torus Knot Software")

-set(CPACK_RESOURCE_FILE_LICENSE "${OGRE_SOURCE_DIR}/COPYING")
+# CPack won't allow file without recognized extension to be used as
+# license file.
+configure_file("${OGRE_SOURCE_DIR}/COPYING" "${OGRE_BINARY_DIR}/COPYING.txt" COPYONLY)
+set(CPACK_RESOURCE_FILE_LICENSE "${OGRE_BINARY_DIR}/COPYING.txt")
+
 #set(CPACK_PACKAGE_ICON "${OGRE_SOURCE_DIR}\\\\ogrelogo.gif")

 set(CPACK_PACKAGE_CONTACT "OGRE Team <sinbad@ogre3d.org>")


Don't use "SOVERSION" with Android - Android doesn't support shared libraries not ending with ".so".

--- cmake/CEGUIMacros.cmake
+++ cmake/CEGUIMacros.cmake
@@ -250,7 +250,7 @@
     # Do not version modules, since we dlopen these directly and need to know
     # the name is what we think it will be (and not rely on symlinks which will
     # not be installed always, but usually only as part of *-dev packages).
-    if (NOT ${_IS_MODULE})
+    if (NOT ${_IS_MODULE} AND NOT ANDROID)
         if (NOT APPLE OR CEGUI_APPLE_DYLIB_SET_VERSION_INFO)
             set_target_properties(${_LIB_NAME} PROPERTIES
                 VERSION ${CEGUI_ABI_VERSION}


GEODE-5847: Ignore formatting non-C++ source files.

--- cmake/ClangFormat.cmake
+++ cmake/ClangFormat.cmake
@@ -32,13 +32,14 @@
     set(_clangformat_SOURCES "")
     foreach (_source ${_target_SOURCES})
       if (NOT TARGET ${_source})
-        get_source_file_property(_source_LOCATION "${_source}" LOCATION)
         get_source_file_property(_source_GENERATED "${_source}" GENERATED)
-
-        if(_source_GENERATED)
+        string(REGEX MATCH "\\.(h(pp|xx)?|c(pp|xx)?)(\\..*)?$" _source_extension_match ${_source})
+        if(_source_GENERATED
+            OR _source_extension_match STREQUAL "")
           break()
         endif()

+        get_source_file_property(_source_LOCATION "${_source}" LOCATION)
         file(RELATIVE_PATH _source_RELATIVE_PATH ${_target_SOURCE_DIR} ${_source_LOCATION})
         string(REPLACE ".." "__" _format_file "${_target_BINARY_DIR}/CMakeFiles/${_clangformat}.dir/${_source_RELATIVE_PATH}.format")
         get_filename_component(_format_DIRECTORY ${_format_file} DIRECTORY)


Fix FindOpenSim.cmake to find correct path for Simbody includes

After testing build on Linux, with Simbody and OpenSim built from released source archives, an inconsistency was found in how simbody include dir is computed from OpenSim one. We'll check which is the correct directory, verifying that it exists

--- cmake/FindOpenSim.cmake
+++ cmake/FindOpenSim.cmake
@@ -161,12 +161,25 @@

 # This change is necessary for Simbody 3.4 and beyond, and is incompatible
 # with Simbody 3.3 and below.
-set(OPENSIM_SIMBODY_INCLUDE_RELPATH "include")
-
-set(OPENSIMSIMBODY_INCLUDE_DIR
-    ${OPENSIM_INCLUDE_DIR}
-    ${OPENSIM_INCLUDE_DIR}/SimTK/${OPENSIM_SIMBODY_INCLUDE_RELPATH}
-    )
+#set(OPENSIM_SIMBODY_INCLUDE_RELPATH "include")
+
+# I found that OpenSim 3.3 source installs files in a "simbody" subdir instead of "include"
+# Let's check both
+if(EXISTS "${OPENSIM_INCLUDE_DIR}/SimTK/include" AND IS_DIRECTORY "${OPENSIM_INCLUDE_DIR}/SimTK/include")
+    set(OPENSIMSIMBODY_INCLUDE_DIR
+        ${OPENSIM_INCLUDE_DIR}
+        ${OPENSIM_INCLUDE_DIR}/SimTK/include
+        )
+elseif(EXISTS "${OPENSIM_INCLUDE_DIR}/SimTK/simbody" AND IS_DIRECTORY "${OPENSIM_INCLUDE_DIR}/SimTK/simbody")
+    set(OPENSIMSIMBODY_INCLUDE_DIR
+        ${OPENSIM_INCLUDE_DIR}
+        ${OPENSIM_INCLUDE_DIR}/SimTK/simbody
+        )
+else()
+    set(OPENSIMSIMBODY_INCLUDE_DIR
+        ${OPENSIM_INCLUDE_DIR}
+       )
+endif()

 # OPENSIM_ROOT_DIR


Add back the /lib for windows to work.

Add back the /lib for windows to work.

--- cmake/FindSoundIO.cmake
+++ cmake/FindSoundIO.cmake
@@ -12,7 +12,7 @@

 find_library(SOUNDIO_LIBRARY NAMES soundio)
 find_library(SOUNDIO_LIBRARY NAMES soundio
-    HINTS $ENV{SOUNDIO_ROOT})
+    HINTS $ENV{SOUNDIO_ROOT}/lib)

 include(FindPackageHandleStandardArgs)


Extended CMake hint for CCI since if used from source there is no include directory

--- cmake/FindSystemC.cmake
+++ cmake/FindSystemC.cmake
@@ -43,6 +43,7 @@
   ${CONAN_INCLUDE_DIRS_SYSTEMC-CCI}
   ${CONAN_LIB_DIRS_SYSTEMC-CCI}
   $ENV{CCI_HOME}/include
+  $ENV{CCI_HOME}/src
   $ENV{CCI_HOME}/lib
   $ENV{CCI_HOME}/lib-linux
   $ENV{CCI_HOME}/lib-linux64


add delimited_message_util.cc to libprotobuf.cmake

--- cmake/libprotobuf.cmake
+++ cmake/libprotobuf.cmake
@@ -30,6 +30,7 @@
   ${protobuf_source_dir}/src/google/protobuf/timestamp.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/type.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/unknown_field_set.cc
+  ${protobuf_source_dir}/src/google/protobuf/util/delimited_message_util.cc
   ${protobuf_source_dir}/src/google/protobuf/util/field_comparator.cc
   ${protobuf_source_dir}/src/google/protobuf/util/field_mask_util.cc
   ${protobuf_source_dir}/src/google/protobuf/util/internal/datapiece.cc


Comment tweak.

Comment tweak.

svn path=/trunk/; revision=10072

--- cmake/modules/gcw.cmake
+++ cmake/modules/gcw.cmake
@@ -31,7 +31,7 @@
 #			    ENABLE_DYNDRIVERS OFF.  (gcw_TARGETS not included
 #			    since source code used instead of this target
 #			    for ENABLE_DYNDRIVERS OFF.)
-# gcw_SOURCE		  - list of source files other than gcw.c
+# gcw_SOURCE		  - list of source files to be appended to gcw.c
 # PYGCW_CFLAGS		  - blank-separated COMPILE_FLAGS required to
 #			    compile pygcw bindings.
 # PYGCW_LIBS		  - list of LINK_FLAGS for pygcw bindings.


Update libc++ feature to indicate that it is not OS X only

--- CMake/FeatureSummary.cmake
+++ CMake/FeatureSummary.cmake
@@ -124,7 +124,7 @@
 	set(_core "${_core}  + ZIP archives\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_LIBCPP_SUPPORT)
-	set(_core "${_core}  + libc++ support for OS X\n")
+	set(_core "${_core}  + libc++ support\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_VIEWPORT_ORIENTATIONMODE)
 	set(_core "${_core}  + Viewport orientation mode support\n")


FindMKL.cmake: don't print status message if mkl wasn't found

--- CMakeModules/FindMKL.cmake
+++ CMakeModules/FindMKL.cmake
@@ -278,6 +278,5 @@
         IMPORTED_LOCATION "${MKL_Core_DLL_LIBRARY}"
         IMPORTED_IMPLIB "${MKL_Core_LINK_LIBRARY}")
   endif()
-endif()
-
-message(STATUS "'${MKL_THREAD_LAYER}' used for MKL parallelisation")
+  message(STATUS "'${MKL_THREAD_LAYER}' used for MKL parallelisation")
+endif()


Graph Control 3.10.8-3rc Release Candidate 3

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

--- version.cmake
+++ version.cmake
@@ -6,7 +6,7 @@
 set ( HPCC_MINOR 10 )
 set ( HPCC_POINT 8 )
 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." )


[axl] rollback version to 5.9.0

[axl] rollback version to 5.9.0


Fix "cegui_add_dependency_dynamic_libs" and "cegui_add_dependency_static_libs" so that if only debug libraries are available, they link to those libraries.

--HG--
branch : mingw

--- cmake/CEGUIMacros.cmake
+++ cmake/CEGUIMacros.cmake
@@ -87,6 +87,8 @@
             else()
                 target_link_libraries(${_TARGET_NAME} ${${_DEP_NAME}_LIBRARIES})
             endif()
+        elseif (${_DEP_NAME}_LIBRARIES_DBG)
+                target_link_libraries(${_TARGET_NAME} ${${_DEP_NAME}_LIBRARIES_DBG})
         endif()
     endif()
 endmacro()
@@ -110,6 +112,8 @@
             else()
                 target_link_libraries(${_TARGET_NAME} ${${_DEP_NAME}_LIBRARIES_STATIC})
             endif()
+        elseif (${_DEP_NAME}_LIBRARIES_STATIC_DBG)
+            target_link_libraries(${_TARGET_NAME} ${${_DEP_NAME}_LIBRARIES_STATIC_DBG})
         else()
             cegui_add_dependency_dynamic_libs(${_TARGET_NAME} ${_DEP_NAME})
         endif()


Update to FindFASTJET.cmake; now accepts also for -DFASTJET= option

--- cmake/FindFASTJET.cmake
+++ cmake/FindFASTJET.cmake
@@ -2,28 +2,39 @@
 #
 # Author: Marco van Leeuwen
 #
-# Simple first version; checks env variables and fastjet-config; does not verify that includes and libs are really present
+# Simple first version; checks env variables and fastjet-config; verifies that fastjet/PseudoJet.hh exists

 cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)

-set(FASTJET_ROOT $ENV{FASTJET_ROOT})
+# FASTJET_ROOT is a legacy env variable; could be removed
+if (NOT FASTJET)
+  set(FASTJET $ENV{FASTJET_ROOT})
+endif(NOT FASTJET)

-if (NOT FASTJET_ROOT)
-  set(FASTJET_ROOT $ENV{FASTJET})
-endif(NOT FASTJET_ROOT)
+if (NOT FASTJET)
+  set(FASTJET $ENV{FASTJET})
+endif(NOT FASTJET)

-if (NOT FASTJET_ROOT)
-  execute_process (COMMAND fastjet-config --prefix OUTPUT_VARIABLE FASTJET_ROOT)
-  string (STRIP "${FASTJET_ROOT}" FASTJET_ROOT)
-endif(NOT FASTJET_ROOT)
+if (NOT FASTJET)
+  execute_process (COMMAND fastjet-config --prefix OUTPUT_VARIABLE FASTJET)
+  string (STRIP "${FASTJET}" FASTJET)
+endif(NOT FASTJET)

-if (FASTJET_ROOT)
-  message(STATUS "FASTJET found in ${FASTJET_ROOT}")
+# Check for one of the header files
+if (FASTJET)
+  find_path(FASTJET include/fastjet/PseudoJet.hh PATHS ${FASTJET})
+  if (FASTJET-NOTFOUND)
+    message(STATUS "Header file fastjet/PseudoJet.hh not found in ${FASTJET}/include")
+  endif (FASTJET-NOTFOUND)
+endif (FASTJET)
+
+if (FASTJET AND NOT FASTJET-NOTFOUND)
+  message(STATUS "FASTJET found in ${FASTJET}")
   set (FASTJET_FOUND true)
-  set (FASTJET_INCLUDE_DIR ${FASTJET_ROOT}/include)
+  set (FASTJET_INCLUDE_DIR ${FASTJET}/include)
   message(STATUS "FASTJET include directory: ${FASTJET_INCLUDE_DIR}")
   set (FASTJET_DEFINITIONS -DHAVE_FASTJET)
 else()
   message(STATUS "FASTJET not found; make sure to set the FASTJET_ROOT environment variable or have fastjet-config in your path to use fastjet")
-endif(FASTJET_ROOT)
+endif(FASTJET AND NOT FASTJET-NOTFOUND)


Conformance/CMake: Remove non-existence binary_json_conformance_main.cc file.

--- cmake/conformance.cmake
+++ cmake/conformance.cmake
@@ -21,7 +21,6 @@
 add_executable(conformance_test_runner
   ${protobuf_source_dir}/conformance/conformance.pb.cc
   ${protobuf_source_dir}/conformance/conformance_test.cc
-  ${protobuf_source_dir}/conformance/binary_json_conformance_main.cc
   ${protobuf_source_dir}/conformance/binary_json_conformance_suite.cc
   ${protobuf_source_dir}/conformance/binary_json_conformance_suite.h
   ${protobuf_source_dir}/conformance/conformance_test_runner.cc


Add comment that dated pkg-config gnome-python-2.0 module logic now needs a
review.  That review should be done by a gnome canvas expert who is familiar
with all the libraries and headers involved.

svn path=/trunk/; revision=7210

--- cmake/modules/gcw.cmake
+++ cmake/modules/gcw.cmake
@@ -125,6 +125,12 @@
   pkgconfig(pygtk-2.0 includedir libdir linkflags cflags)
   if(linkflags AND cflags)
     pkgconfig(gnome-python-2.0 includedir libdir linkflags1 cflags1)
+    # This logic needs review.  It was copied right out of cf/gcw.ac
+    # which checks for the existence of gnome-python-2.0 but uses no
+    # compile or link flag returned by that check.  That made sense
+    # at the time because the returned values were blank, but now (2006-11-27)
+    # Ubuntu dapper drake, for example, returns an interesting value
+    # "-I/usr/include/gnome-python-2.0" for --cflags1.
     if(linkflags1 AND cflags1)
       set(PYGCW_CFLAGS "${cflags}")
       set(PYGCW_LIBS "${linkflags}")


added missing @PCL_ENABLE_SSE@ option from cmake options (per feature #859)

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

--- cmake/pcl_options.cmake
+++ cmake/pcl_options.cmake
@@ -26,3 +26,7 @@
 option(PCL_NO_PRECOMPILE "Do not precompile PCL code for any point types at all." OFF)
 mark_as_advanced(PCL_NO_PRECOMPILE)

+# Enable or Disable the check for SSE optimizations
+option(PCL_ENABLE_SSE "Enable or Disable SSE optimizations." ON)
+mark_as_advanced(PCL_ENABLE_SSE)
+


install shared libraries

install shared libraries

git-svn-id: 1af002208e930b4d920e7c2b948d1e98a012c795@777 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_targets.cmake
+++ cmake/pcl_targets.cmake
@@ -91,7 +91,9 @@
         VERSION ${PCL_VERSION}
         SOVERSION ${PCL_MAJOR_VERSION}
         DEFINE_SYMBOL "PCLAPI_EXPORTS")
-    install(TARGETS ${_name} LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+    install(TARGETS ${_name}
+        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
         ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
         COMPONENT ${_component})
 endmacro(PCL_ADD_LIBRARY)


${COMPANY_NAME} removed completely

${COMPANY_NAME} removed completely

--- src/PluginConfig.cmake
+++ src/PluginConfig.cmake
@@ -10,7 +10,7 @@
 set(PLUGIN_PREFIX "WebChimera")
 set(PLUGIN_DESCRIPTION "Web Plugin powered by Firebreath/Qt Qml/Vlc")
 set(PRODUCT_NAME "Chimera Web Plugin")
-set(COMPANY_NAME "RSATom")
+set(PROJECT_OWNER "Sergey Radionov")
 set(COMPANY_DOMAIN "WebChimera.org")
 set(COPYRIGHT_YEARS "2014")
 set(PLUGIN_MIMETYPE "application/x-chimera-plugin")
@@ -53,10 +53,10 @@
 endif( FB_PLATFORM_ARCH_32 )

 # strings
-set(FBSTRING_CompanyName "${COMPANY_NAME}")
+set(FBSTRING_CompanyName "${PROJECT_OWNER}")
 set(FBSTRING_PluginDescription "${PLUGIN_DESCRIPTION}")
 set(FBSTRING_PLUGIN_VERSION "${PLUGIN_VERSION}")
-set(FBSTRING_LegalCopyright "Copyright ${COPYRIGHT_YEARS} ${COMPANY_NAME}")
+set(FBSTRING_LegalCopyright "Copyright ${COPYRIGHT_YEARS} ${PROJECT_OWNER}")
 if( WIN32 )
     set(FBSTRING_PluginFileName "np${PLUGIN_NAME}.dll")
 elseif( APPLE )


cmake-unit: Move template file for generation into binary directory

--- CMakeUnit.cmake
+++ CMakeUnit.cmake
@@ -570,7 +570,7 @@
                                                    CONTENTS ${CONTENTS})

     set (TMP_SOURCE_DIR_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/${NAME}${SALT}")
-    set (TMP_BINARY_DIR_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/${NAME}${SALT}")
+    set (TMP_BINARY_DIR_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${NAME}${SALT}")
     get_filename_component (PARENT_PATH "${BINARY_DIR_LOCATION}" DIRECTORY)
     file (MAKE_DIRECTORY "${PARENT_PATH}")
     file (RENAME "${TMP_SOURCE_DIR_LOCATION}"


Avoid accumulating of parameters when compiling multiple files

--- common/cmake/ispc.cmake
+++ common/cmake/ispc.cmake
@@ -97,6 +97,12 @@
     SET(ISPC_OPT_FLAGS -O2 -g)
   ENDIF()

+  IF (WIN32)
+    SET(ISPC_ADDITIONAL_ARGS ${ISPC_ADDITIONAL_ARGS} --dllexport)
+  ELSE()
+    SET(ISPC_ADDITIONAL_ARGS ${ISPC_ADDITIONAL_ARGS} --pic)
+  ENDIF()
+
   SET(ISPC_OBJECTS "")

   FOREACH(src ${ARGN})
@@ -129,12 +135,6 @@
           SET(results ${results} "${outdir}/${fname}.dev_${target}${ISPC_TARGET_EXT}")
         ENDFOREACH()
       ENDIF()
-    ENDIF()
-
-    IF (WIN32)
-      SET(ISPC_ADDITIONAL_ARGS ${ISPC_ADDITIONAL_ARGS} --dllexport)
-    ELSE()
-      SET(ISPC_ADDITIONAL_ARGS ${ISPC_ADDITIONAL_ARGS} --pic)
     ENDIF()

     ADD_CUSTOM_COMMAND(


cmake: option -mstackrealign on win32 builds

--- cmake/DPF-plugin.cmake
+++ cmake/DPF-plugin.cmake
@@ -503,6 +503,9 @@
     C_VISIBILITY_PRESET "hidden"
     CXX_VISIBILITY_PRESET "hidden"
     VISIBILITY_INLINES_HIDDEN TRUE)
+  if (MINGW)
+    target_compile_options("${NAME}" PUBLIC "-mstackrealign")
+  endif()
 endfunction()

 # dpf__add_module
@@ -520,6 +523,9 @@
   if ((NOT WIN32 AND NOT APPLE) OR MINGW)
     target_link_libraries("${NAME}" PRIVATE "-Wl,--no-undefined")
   endif()
+  if (MINGW)
+    target_compile_options("${NAME}" PUBLIC "-mstackrealign")
+  endif()
 endfunction()

 # dpf__add_static_library
@@ -534,6 +540,9 @@
     C_VISIBILITY_PRESET "hidden"
     CXX_VISIBILITY_PRESET "hidden"
     VISIBILITY_INLINES_HIDDEN TRUE)
+  if (MINGW)
+    target_compile_options("${NAME}" PUBLIC "-mstackrealign")
+  endif()
 endfunction()

 # dpf__add_plugin_main


Add environment PATH to hints to find Cython.

--- cmake/FindCython.cmake
+++ cmake/FindCython.cmake
@@ -29,7 +29,7 @@
   get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
   find_program( CYTHON_EXECUTABLE
     NAMES cython cython.bat
-    HINTS ${_python_path}
+    HINTS ENV PATH ${_python_path}
     )
 else()
   find_program( CYTHON_EXECUTABLE


[cmake] fix openblas on fedora

[cmake] fix openblas on fedora

--- cmake/FindLAPACK.cmake
+++ cmake/FindLAPACK.cmake
@@ -248,7 +248,7 @@
       if(LAPACK_LIBRARIES)
 	set(WITH_LAPACK "openblas" CACHE STRING "lapack implementation type [mkl/openblas/atlas/accelerate/generic]" FORCE)
 	set(LAPACKE_HEADER lapacke.h)
-	set(LAPACK_INCLUDE_SUFFIXES openblas/lapacke)
+	set(LAPACK_INCLUDE_SUFFIXES "openblas;openblas/lapacke")
       else()
 	set(WITH_LAPACK "" CACHE STRING "lapack implementation type [mkl/openblas/atlas/accelerate/generic]" FORCE)
       endif(LAPACK_LIBRARIES)


Fix bug in FindSodium cmake script.

Fix bug in FindSodium cmake script.

--- cmake/FindSodium.cmake
+++ cmake/FindSodium.cmake
@@ -33,15 +33,6 @@

 # static library option
 option(sodium_USE_STATIC_LIBS "enable to statically link against sodium")
-if(NOT (sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST))
-  unset(sodium_LIBRARY CACHE)
-  unset(sodium_LIBRARY_DEBUG CACHE)
-  unset(sodium_LIBRARY_RELEASE CACHE)
-  unset(sodium_DLL_DEBUG CACHE)
-  unset(sodium_DLL_RELEASE CACHE)
-  set(sodium_USE_STATIC_LIBS_LAST ${sodium_USE_STATIC_LIBS} CACHE INTERNAL "internal change tracking variable")
-endif()
-

 ########################################################################
 # UNIX


Don't hardcode the target name when setting coverage check

The function param is used when setting sanitizers but not when setting coverage check.

--- cmake/Sanitizers.cmake
+++ cmake/Sanitizers.cmake
@@ -5,8 +5,8 @@
     option(ENABLE_COVERAGE "Enable coverage reporting for gcc/clang" FALSE)

     if(ENABLE_COVERAGE)
-      target_compile_options(project_options INTERFACE --coverage -O0 -g)
-      target_link_libraries(project_options INTERFACE --coverage)
+      target_compile_options(${project_name} INTERFACE --coverage -O0 -g)
+      target_link_libraries(${project_name} INTERFACE --coverage)
     endif()

     set(SANITIZERS "")


cmake: Support renode 1.8.2.

cmake: Support renode 1.8.2.

Renode 1.8 introduced a behaviour change in which it automatically
launches the telnet monitor on the TCP port 1234 by default.

In order to prevent sanitycheck failures from multiple renode instances
attempting to listen on the TCP port 1234 simultaneously, this commit
disables renode telnet monitor by specifying '--port -2' (a negative
number lower than -1 is required to disable telnet monitor because of
the way renode command line parser is implemented).

Signed-off-by: Stephanos Ioannidis <dc76e9f0c0006e8f919e0c515c66dbba3982f785@stephanos.io>

--- cmake/emu/renode.cmake
+++ cmake/emu/renode.cmake
@@ -7,6 +7,7 @@

 set(RENODE_FLAGS
   --disable-xwt
+  --port -2
   --pid-file renode.pid
   )


[kinetic/lunar] Dynamically check gtest library type

Same as but for kinetic/lunar

--- cmake/test/gtest.cmake
+++ cmake/test/gtest.cmake
@@ -163,9 +163,9 @@
   endif()
 else()
   message(STATUS "Found gtest: gtests will be built")
-  add_library(gtest SHARED IMPORTED)
+  add_library(gtest UNKNOWN IMPORTED)
   set_target_properties(gtest PROPERTIES IMPORTED_LOCATION "${GTEST_LIBRARIES}")
-  add_library(gtest_main SHARED IMPORTED)
+  add_library(gtest_main UNKNOWN IMPORTED)
   set_target_properties(gtest_main PROPERTIES IMPORTED_LOCATION "${GTEST_MAIN_LIBRARIES}")
   set(GTEST_FOUND ${GTEST_FOUND} CACHE INTERNAL "")
   set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} CACHE INTERNAL "")


Remove obsolete config_win32.cmake

Remove obsolete config_win32.cmake

--- src/config_win32.cmake
+++ src/config_win32.cmake
@@ -1,17 +0,0 @@
-#pragma once
-
-#cmakedefine HAVE_IO_H @HAVE_IO_H@
-
-#define DSOUND_SUPPORT 1
-#define WINMIDI_SUPPORT 1
-
-#define STDIN_FILENO 0
-#define STDOUT_FILENO 1
-#define STDERR_FILENO 2
-
-#pragma warning(disable : 4244)
-#pragma warning(disable : 4101)
-#pragma warning(disable : 4305)
-#pragma warning(disable : 4996)
-
-typedef int socklen_t;


adding support for comments in CI models file

--- common/cmake/test.cmake
+++ common/cmake/test.cmake
@@ -92,6 +92,9 @@
     STRING(REGEX REPLACE "\n" ";" models "${models}")

     FOREACH (model ${models})
+      IF (model MATCHES "^#")
+        CONTINUE()
+      ENDIF()
       STRING(REGEX REPLACE " .*" "" modelname "${model}")
       STRING(REGEX REPLACE "/" "_" modelname "${modelname}")
       STRING(REGEX REPLACE ".ecs" "" modelname "${modelname}")


ENH: Update BridgeNumPy to most recent version (2017.03.27)

Francois Budin (2):
      ENH: Support covariant vector images
      ENH: Wraps Symmetric Second Rank Tensors images

Matt McCormick (2):
      Merge pull request #15 from fbudin69500/SupportCovariantVector
      Merge pull request #16 from fbudin69500/WrappingSymmetricSecondRankTensorImages

Change-Id: Iad300de405e8d5659f221eaa8221bd63cbf2fef4

--- Modules/Remote/BridgeNumPy.remote.cmake
+++ Modules/Remote/BridgeNumPy.remote.cmake
@@ -21,5 +21,5 @@
   See http://insight-journal.org/browse/publication/85
       https://hdl.handle.net/1926/188"
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKBridgeNumPy.git
-  GIT_TAG 4ad1dd6b4388071f1437dd9b652421c91f8302b8
+  GIT_TAG fed4d06c8c47a35f863f21ac046faecd7de06a7a
   )


Multiple LEMON library naming hints.

Multiple LEMON library naming hints.

--- src/cmakeFindModules/FindLemon.cmake
+++ src/cmakeFindModules/FindLemon.cmake
@@ -41,7 +41,7 @@

   SET(LEMON_INCLUDE_DIR ${LEMON_DIR})

-  FIND_LIBRARY(LEMON_LIBRARY NAMES Lemon)
+  FIND_LIBRARY(LEMON_LIBRARY NAMES Lemon lemon emon)

   # locate Lemon libraries
   IF(DEFINED LEMON_LIBRARY)


Use CMP0025 new policy for Lua compilation

--- SuperBuild/lua.cmake
+++ SuperBuild/lua.cmake
@@ -2,7 +2,7 @@

 if(POLICY CMP0025)
-  cmake_policy(SET CMP0025 OLD)
+  cmake_policy(SET CMP0025 NEW)
 endif()

@@ -47,11 +47,9 @@
   SET( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} /wd4334" )
 endif()

-if( APPLE )
-  if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-    # suppress Clang warnings about empty loop bodies and deprecated declarations (tmpnam)
-    SET( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -Wno-empty-body -Wno-deprecated-declarations" )
-  endif()
+if("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang" )
+  # suppress Clang warnings about empty loop bodies and deprecated declarations (tmpnam)
+  SET( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -Wno-empty-body -Wno-deprecated-declarations" )
 endif()

 # define the lua core source files


Removed OpenGL, GLU, GLUT, and GLEW dependencies from SOFA.

--- CMakeExternals/SOFA.cmake
+++ CMakeExternals/SOFA.cmake
@@ -132,26 +132,23 @@
   list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-modules.cmake)
   list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-modules.cmake)

-  if(MSVC OR APPLE)
+  if(MSVC)
     if(MSVC90)
       if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(file "sofa-dependencies-win64-msvc-2008-1.0-rc1.zip")
-        set(md5 "11bc875da23e2f4e8f8094bf136d19ea")
+        set(md5 "5aaf89c36bbd6b87f8c5784a505bf789")
       else()
         set(file "sofa-dependencies-win32-msvc-2008-1.0-rc1.zip")
-        set(md5 "de1fedeb6468e1938857ceb07abc26fb")
+        set(md5 "b4240694393bd5014f1870a394e84d38")
       endif()
     elseif(MSVC10)
       if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(file "dependencies-win64-msvc-2010-1.0-rc1.zip")
-        set(md5 "a6901ebe20752c5bd6a00d43df6f150e")
+        set(md5 "57014882593b28e3b3e5a4fa85803776")
       else()
         set(file "dependencies-win32-msvc-2010-1.0-rc1.zip")
-        set(md5 "c720994e5dedc186176b0bb711a0d5d3")
+        set(md5 "b6de57312d36d5bd56980ef0284b9ab9")
       endif()
-    elseif(APPLE)
-      set(file "sofa-dependencies-mac-1.0-rc1.zip")
-      set(md5 "e93402fbf596693880007921985ddaea")
     endif()

     write_downloadfile_script(
@@ -171,8 +168,27 @@
     list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-dependencies.cmake)
   endif()

+  set(file "sofa-patch-1.0-rc1.zip")
+  set(md5 "25e078187ce57b96357f4d713856a195")
+
+  write_downloadfile_script(
+    "${stamp_dir}/download-cmake.cmake"
+    "${url_base}${file}"
+    "${download_dir}/${file}"
+    "${md5}"
+  )
+
+  write_extractfile_script(
+    "${stamp_dir}/extract-cmake.cmake"
+    "${download_dir}/${file}"
+    "${source_dir}"
+  )
+
+  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-cmake.cmake)
+  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-cmake.cmake)
+
   set(file "sofa-cmake-1.0-rc1.zip")
-  set(md5 "10b35b4101ac655abaa51547f7356a84")
+  set(md5 "41fc95b1a51a404c28eac5860932b017")

   write_downloadfile_script(
     "${stamp_dir}/download-cmake.cmake"


Allow for multiple in and output directories

--- CMakeModules/Docker.cmake
+++ CMakeModules/Docker.cmake
@@ -21,17 +21,31 @@

 FUNCTION(DOCKER_RUN)
       set(options)
-      set(oneValueArgs TARGET IMAGE INPUT OUTPUT)
-      set(multiValueArgs COMMAND DEPENDS)
+      set(oneValueArgs TARGET IMAGE)
+      set(multiValueArgs INPUT OUTPUT COMMAND DEPENDS)
       cmake_parse_arguments(DOCKER_RUN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )

       MESSAGE("-- Will create new target ${DOCKER_RUN_TARGET} for running ${DOCKER_RUN_COMMAND} on ${DOCKER_RUN_IMAGE}")
       SET(DOCKER_RUN_CMAKE_SCRIPT "${CMAKE_BINARY_DIR}/${DOCKER_RUN_TARGET}.cmake")

+      IF(DOCKER_RUN_INPUT)
+          FOREACH(MAPPING IN ITEMS ${DOCKER_RUN_INPUT})
+              STRING(CONCAT DOCKER_RUN_INPUT_TMP "${DOCKER_RUN_INPUT_TMP}" "-v " ${MAPPING} ":ro ")
+          ENDFOREACH()
+          set(DOCKER_RUN_INPUT ${DOCKER_RUN_INPUT_TMP})
+      ENDIF()
+
+      IF(DOCKER_RUN_OUTPUT})
+          FOREACH(MAPPING IN ITEMS ${DOCKER_RUN_OUTPUT})
+              STRING(CONCAT DOCKER_RUN_OUTPUT_TMP "${DOCKER_RUN_OUTPUT_TMP}" "-v " ${MAPPING} " ")
+          ENDFOREACH()
+          set(DOCKER_RUN_OUTPUT ${DOCKER_RUN_OUTPUT_TMP})
+      ENDIF()
+
       FILE(WRITE ${DOCKER_RUN_CMAKE_SCRIPT}
 "
 MESSAGE(\"-- Starting ${DOCKER_RUN_IMAGE}\")
-EXEC_PROGRAM(docker ARGS \"run --rm -it -v ${DOCKER_RUN_INPUT}:ro -v ${DOCKER_RUN_OUTPUT} ${DOCKER_RUN_IMAGE} ${DOCKER_RUN_COMMAND}\")
+EXEC_PROGRAM(docker ARGS \"run --rm -it ${DOCKER_RUN_INPUT} ${DOCKER_RUN_OUTPUT} ${DOCKER_RUN_IMAGE} ${DOCKER_RUN_COMMAND}\")
 MESSAGE(\"-- Done on ${DOCKER_RUN_IMAGE}\")
 "
       )


ci: Disable Install.Make.Fortran test

ci: Disable Install.Make.Fortran test

Currently unknow why this test fails in CI but this disables it for the time
being until it can be fixed and re-enabled.

--- scripts/ci/cmake/ci-el7-gnu8-openmpi-ohpc-static.cmake
+++ scripts/ci/cmake/ci-el7-gnu8-openmpi-ohpc-static.cmake
@@ -40,7 +40,12 @@
 PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7
 ")

-set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)
+set(CTEST_TEST_ARGS
+  PARALLEL_LEVEL 1
+
+  # Unclear why this test currently dies.  Disabling until it can be addressed.
+  EXCLUDE "Install.Make.Fortran"
+)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)


Add "src" in the current source dir

Add "src" in the current source dir

--- VeraPPUtilities.cmake
+++ VeraPPUtilities.cmake
@@ -22,7 +22,7 @@
 set (VERAPP_EXIT_FAILURE_ON_STDERR_WRAPPER_EXECUTABLE
      veracpp_exit_failure_on_stderr_wrapper)

-add_subdirectory (src)
+add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/src)

 function (verapp_list_files_in_external_directory DIRECTORY MATCH RETURN_FILES)
     find_program (_verapp_ls ls)


CastXML 0.4.2

CastXML 0.4.2

--- src/Version.cmake
+++ src/Version.cmake
@@ -1,7 +1,7 @@
 # CastXML version number components.
 set(CastXML_VERSION_MAJOR 0)
 set(CastXML_VERSION_MINOR 4)
-set(CastXML_VERSION_PATCH 1)
+set(CastXML_VERSION_PATCH 2)
 set(CastXML_VERSION_RC 0)
 set(CastXML_VERSION_IS_DIRTY 0)


Don't pass SITK_REQUIRED_ITK_MODULES in Superbuild

Change-Id: I26e003d9945fd1b5e22d1c3d1bc2ef6b50ab4f28

--- sitkCheckForITKModuleDependencies.cmake
+++ sitkCheckForITKModuleDependencies.cmake
@@ -14,7 +14,7 @@
 # is dependent on most of the IO modules so we only need to force 'review on' to
 # ensure that we have the 'IO on' too.
 #
-list(APPEND SITK_REQUIRED_ITK_MODULES
+list(APPEND _SITK_REQUIRED_ITK_MODULES
   ITKAnisotropicSmoothing
   ITKAntiAlias
   ITKBiasCorrection
@@ -58,9 +58,9 @@
   ITKWatersheds
 )

-foreach(itkDependency ${SITK_REQUIRED_ITK_MODULES})
+foreach(itkDependency ${_SITK_REQUIRED_ITK_MODULES})
   list(FIND ITK_MODULES_ENABLED ${itkDependency} ITKDependency_FOUND)
   if(ITKDependency_FOUND EQUAL -1)
     message(FATAL_ERROR "SimpleITK requires that the ${itkDependency} module be turned on in ITK")
   endif()
-endforeach(itkDependency)
+endforeach()


Fix the test name issue in plugin.cmake

Fix the test name issue in plugin.cmake

--- plugin.cmake
+++ plugin.cmake
@@ -55,6 +55,7 @@

 add_python_test(segmentation_label
     SUBMODULE TraceBoundsTest
+    DBNAME core_segmentation_trace_bounds
     PLUGIN HistomicsTK
 )


boards: lora_e5_dev_board: set defaults for blackmagicprobe

This sets the commonly used serial port alias for blackmagicprobe, as
well as the flag to reset on connect, so that flashing works in low
power.

Signed-off-by: Fabio Baltieri <161d407f4dc681bfd4aedb33b8273b2aafd727bc@gmail.com>

--- boards/arm/lora_e5_dev_board/board.cmake
+++ boards/arm/lora_e5_dev_board/board.cmake
@@ -5,6 +5,7 @@
 board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset")
 board_runner_args(jlink "--device=STM32WLE5JC" "--speed=4000" "--reset-after-load")
 board_runner_args(stm32cubeprogrammer "--port=swd" "--reset=hw")
+board_runner_args(blackmagicprobe "--gdb-serial=/dev/ttyBmpGdb" "--connect-srst")

 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)


fix c++11 detection under MSVC

fix c++11 detection under MSVC

It turns out MSVC defines __cplusplus as 1997 even with MSVC 2017. Sigh.
Instead of trying to parse what support we have, just skip this macro
check and hope we catch all problems with the configuration tests
itself.

--- cmake/checks/check_01_cxx_features.cmake
+++ cmake/checks/check_01_cxx_features.cmake
@@ -177,8 +177,9 @@
   thread_local std::array<int,3> p;
   std::condition_variable c;

-  // check the version language macro
-  #if !(__cplusplus >= 201103L)
+  // Check the version language macro, but skip MSVC because
+  // MSVC reports 199711 even in MSVC 2017.
+  #if __cplusplus < 201103L && !defined(_MSC_VER)
   #  error \"insufficient support for C++11\"
   #endif


Install ament_cmake_auto executables to libexec by default (#97)

* Install ament_cmake_auto executables to libexec by default

* update docblock

* simplify installing executables

--- ament_cmake_auto/cmake/ament_auto_package.cmake
+++ ament_cmake_auto/cmake/ament_auto_package.cmake
@@ -17,6 +17,15 @@
 # extension point ``ament_auto_package`` and invoke
 # ``ament_package()``.
 #
+# :param INSTALL_TO_PATH: if set, install executables to `bin` so that
+#   they are available on the `PATH`.
+#   By default they are being installed into `lib/${PROJECT_NAME}`.
+#   It is currently not possible to install some executable into `bin`
+#   and some into `lib/${PROJECT_NAME}`.
+#   Libraries are not affected by this option.
+#   They are always installed into `lib` and `dll`s into `bin`.
+# :type INSTALL_TO_PATH: option
+#
 # Export all found build dependencies which are also run
 # dependencies.
 # If the package has an include directory install all recursively
@@ -29,6 +38,12 @@
 #

 macro(ament_auto_package)
+  cmake_parse_arguments(_ARG "INSTALL_TO_PATH" "" "" ${ARGN})
+  if(_ARG_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "ament_auto_find_build_dependencies() called with "
+      "unused arguments: ${_ARG_UNPARSED_ARGUMENTS}")
+  endif()
+
   # export all found build dependencies which are also run dependencies
   set(_run_depends
     ${${PROJECT_NAME}_BUILD_EXPORT_DEPENDS}
@@ -61,11 +76,14 @@

   # install all executables
   if(NOT ${PROJECT_NAME}_EXECUTABLES STREQUAL "")
+    if(_ARG_INSTALL_TO_PATH)
+      set(_destination "bin")
+    else()
+      set(_destination "lib/${PROJECT_NAME}")
+    endif()
     install(
       TARGETS ${${PROJECT_NAME}_EXECUTABLES}
-      ARCHIVE DESTINATION lib
-      LIBRARY DESTINATION lib
-      RUNTIME DESTINATION bin
+      DESTINATION ${_destination}
     )
   endif()


BUG: disable caching mechanism of FFMPEG try compile results temporarily.

--- CMake/vtkTestFFMPEG.cmake
+++ CMake/vtkTestFFMPEG.cmake
@@ -1,5 +1,5 @@
 IF (FFMPEG_INCLUDE_DIR)
-  IF("VTK_FFMPEG_HAS_OLD_HEADER" MATCHES "^VTK_FFMPEG_HAS_OLD_HEADER$" OR NOT "VTK_FFMPEG_CACHED_INCLUDE" MATCHES "^${FFMPEG_INCLUDE_DIR}$")
+  #IF("VTK_FFMPEG_HAS_OLD_HEADER" MATCHES "^VTK_FFMPEG_HAS_OLD_HEADER$" OR NOT "VTK_FFMPEG_CACHED_INCLUDE" MATCHES "^${FFMPEG_INCLUDE_DIR}$")
     IF (EXISTS ${FFMPEG_INCLUDE_DIR}/ffmpeg)
       SET(VTK_FFMPEG_HAS_OLD_HEADER "TRUE" CACHE INTERNAL "Is the FFMPEG include in the old location" FORCE)
     ELSE (EXISTS ${FFMPEG_INCLUDE_DIR}/ffmpeg)
@@ -11,9 +11,9 @@
       MESSAGE(STATUS "Checking if FFMPEG uses old style header files - no")
     ENDIF (VTK_FFMPEG_HAS_OLD_HEADER)
     SET(VTK_FFMPEG_CACHED_INCLUDE ${FFMPEG_INCLUDE_DIR} CACHE INTERNAL "Previous value of FFMPEG_INCLUDE_DIR" FORCE)
-  ENDIF("VTK_FFMPEG_HAS_OLD_HEADER" MATCHES "^VTK_FFMPEG_HAS_OLD_HEADER$" OR NOT "VTK_FFMPEG_CACHED_INCLUDE" MATCHES "^${FFMPEG_INCLUDE_DIR}$")
+  #ENDIF("VTK_FFMPEG_HAS_OLD_HEADER" MATCHES "^VTK_FFMPEG_HAS_OLD_HEADER$" OR NOT "VTK_FFMPEG_CACHED_INCLUDE" MATCHES "^${FFMPEG_INCLUDE_DIR}$")

-  IF("VTK_FFMPEG_HAS_IMG_CONVERT" MATCHES "^VTK_FFMPEG_HAS_IMG_CONVERT$" OR NOT "VTK_FFMPEG_CACHED_AVCODEC" MATCHES "^${FFMPEG_avcodec_LIBRARY}$")
+  #IF("VTK_FFMPEG_HAS_IMG_CONVERT" MATCHES "^VTK_FFMPEG_HAS_IMG_CONVERT$" OR NOT "VTK_FFMPEG_CACHED_AVCODEC" MATCHES "^${FFMPEG_avcodec_LIBRARY}$")
     IF(VTK_FFMPEG_HAS_OLD_HEADER)
       SET(VTK_FFMPEG_CDEFS "HAS_OLD_HEADER")
     ELSE(VTK_FFMPEG_HAS_OLD_HEADER)
@@ -41,10 +41,10 @@
       ENDIF(VTK_FFMPEG_HAS_IMG_CONVERT)
     ENDIF(FFMPEG_avcodec_LIBRARY)
     SET(VTK_FFMPEG_CACHED_AVCODEC ${FFMPEG_avcodec_LIBRARY} CACHE INTERNAL "Previous value of FFMPEG_avcodec_LIBRARY" FORCE)
-  ENDIF("VTK_FFMPEG_HAS_IMG_CONVERT" MATCHES "^VTK_FFMPEG_HAS_IMG_CONVERT$" OR NOT "VTK_FFMPEG_CACHED_AVCODEC" MATCHES "^${FFMPEG_avcodec_LIBRARY}$")
+  #ENDIF("VTK_FFMPEG_HAS_IMG_CONVERT" MATCHES "^VTK_FFMPEG_HAS_IMG_CONVERT$" OR NOT "VTK_FFMPEG_CACHED_AVCODEC" MATCHES "^${FFMPEG_avcodec_LIBRARY}$")

-SET(VTK_FFMPEG_OLD_URL_FCLOSE "VTK_FFMPEG_OLD_URL_FCLOSE")
-  IF("VTK_FFMPEG_OLD_URL_FCLOSE" MATCHES "^VTK_FFMPEG_OLD_URL_FCLOSE$" OR NOT "VTK_FFMPEG_CACHED_AVFORMAT" MATCHES "^${FFMPEG_avformat_LIBRARY}$")
+  SET(VTK_FFMPEG_OLD_URL_FCLOSE "VTK_FFMPEG_OLD_URL_FCLOSE")
+  #IF("VTK_FFMPEG_OLD_URL_FCLOSE" MATCHES "^VTK_FFMPEG_OLD_URL_FCLOSE$" OR NOT "VTK_FFMPEG_CACHED_AVFORMAT" MATCHES "^${FFMPEG_avformat_LIBRARY}$")
     IF(VTK_FFMPEG_HAS_OLD_HEADER)
       SET(VTK_FFMPEG_CDEFS "HAS_OLD_HEADER")
     ELSE(VTK_FFMPEG_HAS_OLD_HEADER)
@@ -72,9 +72,9 @@
                   "${OUTPUT}\n\n")
         ENDIF(VTK_FFMPEG_OLD_URL_FCLOSE)
     ENDIF(FFMPEG_avformat_LIBRARY)
-  ENDIF("VTK_FFMPEG_OLD_URL_FCLOSE" MATCHES "^VTK_FFMPEG_OLD_URL_FCLOSE$" OR NOT "VTK_FFMPEG_CACHED_AVFORMAT" MATCHES "^${FFMPEG_avformat_LIBRARY}$")
+  #ENDIF("VTK_FFMPEG_OLD_URL_FCLOSE" MATCHES "^VTK_FFMPEG_OLD_URL_FCLOSE$" OR NOT "VTK_FFMPEG_CACHED_AVFORMAT" MATCHES "^${FFMPEG_avformat_LIBRARY}$")

-  IF("VTK_FFMPEG_NEW_ALLOC" MATCHES "^VTK_FFMPEG_NEW_ALLOC$" OR NOT "VTK_FFMPEG_CACHED_AVFORMAT" MATCHES "^${FFMPEG_avformat_LIBRARY}$")
+  #IF("VTK_FFMPEG_NEW_ALLOC" MATCHES "^VTK_FFMPEG_NEW_ALLOC$" OR NOT "VTK_FFMPEG_CACHED_AVFORMAT" MATCHES "^${FFMPEG_avformat_LIBRARY}$")
     IF(VTK_FFMPEG_HAS_OLD_HEADER)
       SET(VTK_FFMPEG_CDEFS "HAS_OLD_HEADER")
     ELSE(VTK_FFMPEG_HAS_OLD_HEADER)
@@ -103,5 +103,5 @@
         ENDIF(VTK_FFMPEG_NEW_ALLOC)
     ENDIF(FFMPEG_avformat_LIBRARY)
     SET(VTK_FFMPEG_CACHED_AVFORMAT ${FFMPEG_avformat_LIBRARY} CACHE INTERNAL "Previous value of FFMPEG_avformat_LIBRARY" FORCE)
-  ENDIF("VTK_FFMPEG_NEW_ALLOC" MATCHES "^VTK_FFMPEG_NEW_ALLOC$" OR NOT "VTK_FFMPEG_CACHED_AVFORMAT" MATCHES "^${FFMPEG_avformat_LIBRARY}$")
+  #ENDIF("VTK_FFMPEG_NEW_ALLOC" MATCHES "^VTK_FFMPEG_NEW_ALLOC$" OR NOT "VTK_FFMPEG_CACHED_AVFORMAT" MATCHES "^${FFMPEG_avformat_LIBRARY}$")
 ENDIF (FFMPEG_INCLUDE_DIR)


Revert "Merge the perviously introduced 3 top level targets for a test back to 1 top level target"

*sigh*

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

--- deal.II/cmake/macros/macro_deal_ii_add_test.cmake
+++ deal.II/cmake/macros/macro_deal_ii_add_test.cmake
@@ -79,10 +79,40 @@
         ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX}
         )

+      ADD_CUSTOM_TARGET(${_full_test}.build
+        COMMAND ${CMAKE_COMMAND} -E echo "${_full_test}: BUILD successful              -------------------"
+        DEPENDS ${_full_test}
+        )
+
+
       #
-      # Determine correct file for comparison:
+      # Add a top level target to run the test...
       #
+      ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
+        COMMAND
+          ${_full_test}
+          || (echo "Running the test failed with the following partial output:"
+              && cat output
+              && rm output
+              && exit 1)
+        COMMAND
+            ${PERL_EXECUTABLE} -pi
+            ${CMAKE_SOURCE_DIR}/cmake/scripts/normalize.pl
+            ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_test}
+        DEPENDS ${_full_test} ${CMAKE_SOURCE_DIR}/cmake/scripts/normalize.pl
+        )

+      ADD_CUSTOM_TARGET(${_full_test}.run
+        COMMAND ${CMAKE_COMMAND} -E echo "${_full_test}: RUN successful                -------------------"
+        DEPENDS ${_full_test}.build
+                ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
+        )
+
+
+      #
+      # and compare the output:
+      #
       SET(_comparison ${CMAKE_CURRENT_SOURCE_DIR}/${_test_name})
       IF(EXISTS ${_comparison}.${_build_lowercase}.output)
         SET(_comparison ${_comparison}.${_build_lowercase}.output)
@@ -90,25 +120,7 @@
         SET(_comparison ${_comparison}.output)
       ENDIF()

-      #
-      # Add a top level target to run and compare the test:
-      #
-
       ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
-        COMMAND
-          ${CMAKE_COMMAND} -E echo "${_full_test}: BUILD successful"
-        COMMAND
-          ${_full_test}
-          || (echo "${_full_test}: RUN failed. Output:"
-              && cat output
-              && rm output
-              && exit 1)
-        COMMAND
-          ${PERL_EXECUTABLE} -pi
-          ${CMAKE_SOURCE_DIR}/cmake/scripts/normalize.pl
-          ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
-        COMMAND
-          ${CMAKE_COMMAND} -E echo "${_full_test}: RUN successful"
         COMMAND
           ${TEST_DIFF}
             ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
@@ -116,26 +128,22 @@
             > ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
           || (mv ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
                  ${CMAKE_CURRENT_BINARY_DIR}/${_test}/failing_diff
-              && echo "${_full_test}: DIFF failed. Output:"
-              && cat ${CMAKE_CURRENT_BINARY_DIR}/${_test}/failing_diff
+              && echo ${CMAKE_CURRENT_BINARY_DIR}/${_test}/failing_diff
               && exit 1)
-        COMMAND
-          ${CMAKE_COMMAND} -E echo "${_full_test}: DIFF successful"
-        WORKING_DIRECTORY
-          ${CMAKE_CURRENT_BINARY_DIR}/${_test}
         DEPENDS
-          ${_full_test}
-          ${CMAKE_SOURCE_DIR}/cmake/scripts/normalize.pl
+          ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
           ${_comparison}
         )
       ADD_CUSTOM_TARGET(${_full_test}.diff
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
+        COMMAND ${CMAKE_COMMAND} -E echo "${_full_test}: DIFF successful               -------------------"
+        DEPENDS ${_full_test}.run
+                ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
         )
+

       #
       # And finally add the test:
       #
-
       ADD_TEST(NAME ${_category}/${_test}
         COMMAND ${CMAKE_COMMAND}
           -DTEST=${_full_test}


Disable unittest_state_assert on NVC++.

Disable unittest_state_assert on NVC++.

Fixes #1397.

--- testing/unittest_static_assert.cmake
+++ testing/unittest_static_assert.cmake
@@ -2,3 +2,9 @@
 # This test unconditionally throws in some places, the compiler will detect that
 # control flow will never reach some instructions. This is intentional.
 target_link_libraries(${test_target} PRIVATE thrust.silence_unreachable_code_warnings)
+
+# The machinery behind this test is not compatible with NVC++.
+# See https://github.com/NVIDIA/thrust/issues/1397
+if ("NVCXX" STREQUAL "${CMAKE_CUDA_COMPILER_ID}")
+  set_tests_properties(${test_target} PROPERTIES DISABLED True)
+endif()


Fix compilation in Xcode with sync enabled

/usr/local is not on the default search path when building via Xcode, so a
simple `-lyaml-cpp` doesn't work when it's installed via homebrew. Fix this by
using pkg-config to get the correct ldflags.

--- CMake/RealmCore.cmake
+++ CMake/RealmCore.cmake
@@ -18,6 +18,7 @@

 include(ExternalProject)
 include(ProcessorCount)
+find_package(PkgConfig)

 if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
     set(MAKE_EQUAL_MAKE "MAKE=$(MAKE)")
@@ -236,10 +237,12 @@
     set_property(TARGET realm-sync-server PROPERTY IMPORTED_LOCATION_COVERAGE ${sync_server_library_debug})
     set_property(TARGET realm-sync-server PROPERTY IMPORTED_LOCATION_RELEASE ${sync_server_library_release})
     set_property(TARGET realm-sync-server PROPERTY IMPORTED_LOCATION ${sync_server_library_release})
-    if(APPLE)
-        set_property(TARGET realm-sync-server PROPERTY INTERFACE_LINK_LIBRARIES ${FOUNDATION} ${SECURITY} -lyaml-cpp)
+
+    pkg_check_modules(YAML QUIET yaml-cpp)
+    if(APPLE)
+        set_property(TARGET realm-sync-server PROPERTY INTERFACE_LINK_LIBRARIES ${FOUNDATION} ${SECURITY} ${YAML_LDFLAGS})
     else()
-        set_property(TARGET realm-sync-server PROPERTY INTERFACE_LINK_LIBRARIES -lcrypto -lssl -lyaml-cpp)
+        set_property(TARGET realm-sync-server PROPERTY INTERFACE_LINK_LIBRARIES -lcrypto -lssl  ${YAML_LDFLAGS})
     endif()

     set(REALM_SYNC_INCLUDE_DIR ${sync_directory}/src PARENT_SCOPE)


BUG: corrected mix up it and it_glob variables

Additionaly changed from string concatanation in cmake to use list
append operation.

--- CMake/UseCSharp.cmake
+++ CMake/UseCSharp.cmake
@@ -69,16 +69,16 @@
     else( )
       # Argument is a source file
       if( EXISTS ${it} )
-        set( sources "${it} ${sources}" )
-        set( sources_dep "${it} ${sources_dep}" )
+        list( APPEND sources ${it} )
+        list( APPEND sources_dep ${it} )
       elseif( EXISTS ${CSHARP_SOURCE_DIRECTORY}/${it} )
-        set( sources "${CSHARP_SOURCE_DIRECTORY}/${it} ${sources}" )
-        set( sources_dep "${CSHARP_SOURCE_DIRECTORY}/${it} ${sources_dep}" )
+        list( APPEND sources "${CSHARP_SOURCE_DIRECTORY}/${it}" )
+        list( APPEND sources_dep "${CSHARP_SOURCE_DIRECTORY}/${it}" )
       elseif( ${it} MATCHES "[*]" )
         # For dependencies, we need to expand wildcards
         FILE( GLOB it_glob ${it} )
-        set( sources "${it} ${sources}" )
-        set( sources_dep "${it_glob} ${sources_dep}" )
+        list( APPEND sources ${it_glob} )
+	list( APPEND sources_dep ${it_glob} )
       endif( )
     endif ( )
   endforeach( )


fix spacing

fix spacing

--- libs/g3log/Build.cmake
+++ libs/g3log/Build.cmake
@@ -22,12 +22,12 @@
 ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
    MESSAGE("cmake for GCC ")
    IF (APPLE)
-       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-Wall -Wunused -std=c++11  -pthread -D_GLIBCXX_USE_NANOSLEEP")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused -std=c++11  -pthread -D_GLIBCXX_USE_NANOSLEEP")
    ELSEIF (MINGW)
-       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-Wall -Wunused -std=c++11  -pthread -D_GLIBCXX_USE_NANOSLEEP -D_GLIBCXX_USE_SCHED_YIELD")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused -std=c++11  -pthread -D_GLIBCXX_USE_NANOSLEEP -D_GLIBCXX_USE_SCHED_YIELD")
    ELSE()
        set(PLATFORM_LINK_LIBRIES rt)
-       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-Wall -rdynamic -Wunused -std=c++11 -pthread -D_GLIBCXX_USE_NANOSLEEP -D_GLIBCXX_USE_SCHED_YIELD")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -rdynamic -Wunused -std=c++11 -pthread -D_GLIBCXX_USE_NANOSLEEP -D_GLIBCXX_USE_SCHED_YIELD")
    ENDIF()
 ENDIF()


openvino: use 2018R3 defines

openvino: use 2018R3 defines

--- cmake/OpenCVDetectInferenceEngine.cmake
+++ cmake/OpenCVDetectInferenceEngine.cmake
@@ -78,9 +78,9 @@

 if(INF_ENGINE_TARGET)
   if(NOT INF_ENGINE_RELEASE)
-    message(WARNING "InferenceEngine version have not been set, 2018R2 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.")
+    message(WARNING "InferenceEngine version have not been set, 2018R3 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.")
   endif()
-  set(INF_ENGINE_RELEASE "2018020000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2018R2.0.2 -> 2018020002)")
+  set(INF_ENGINE_RELEASE "2018030000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2018R2.0.2 -> 2018020002)")
   set_target_properties(${INF_ENGINE_TARGET} PROPERTIES
     INTERFACE_COMPILE_DEFINITIONS "HAVE_INF_ENGINE=1;INF_ENGINE_RELEASE=${INF_ENGINE_RELEASE}"
   )


CMake: tests: Support skipping a test with a reason

Add a new argument `TEST_SKIPPED` to `mbed_greentea_add_test()` to
indicate a test is skipped and give a reason (e.g. the Mbed target
and/or configuration does not provide what the test requires).

The skip reason of a test is printed when running tests with `ctest`,
and the test is marked as "Skipped" in the test report.

--- tools/cmake/mbed_greentea.cmake
+++ tools/cmake/mbed_greentea.cmake
@@ -20,8 +20,12 @@
 # TEST_SOURCES - Test suite sources
 # TEST_REQUIRED_LIBS - Test suite required libraries
 # HOST_TESTS_DIR - Path to the "host_tests" directory
+# TEST_SKIPPED - Reason if suite is skipped
 #
 # calling the macro:
+# if(MBED_GREENTEA_TEST_BAREMETAL)
+#     set(skip_reason "RTOS required")
+# endif()
 # mbed_greentea_add_test(
 #     TEST_NAME
 #         mbed-platform-system-reset
@@ -35,11 +39,16 @@
 #         mbed-xyz
 #     HOST_TESTS_DIR
 #         ${CMAKE_CURRENT_LIST_DIR}/host_tests
+#     TEST_SKIPPED
+#         ${skip_reason}
 # )

 function(mbed_greentea_add_test)
     set(options)
-    set(singleValueArgs TEST_NAME)
+    set(singleValueArgs
+        TEST_NAME
+        TEST_SKIPPED
+    )
     set(multipleValueArgs
         TEST_INCLUDE_DIRS
         TEST_SOURCES
@@ -52,6 +61,22 @@
         "${multipleValueArgs}"
         ${ARGN}
     )
+
+    if(NOT "${MBED_GREENTEA_TEST_SKIPPED}" STREQUAL "")
+        add_test(
+            NAME
+                ${MBED_GREENTEA_TEST_NAME}
+            COMMAND
+                ${CMAKE_COMMAND} -E echo
+                "Skipping ${MBED_GREENTEA_TEST_NAME}:"
+                "${MBED_GREENTEA_TEST_SKIPPED}"
+        )
+        set_tests_properties(${MBED_GREENTEA_TEST_NAME}
+            PROPERTIES
+                SKIP_REGULAR_EXPRESSION "."
+        )
+        return()
+    endif()

     # TODO: After we convert all greentea tests to use CTest, remove this
     # add_subdirectory call. We will attach the tests to the mbed-os project,


Disable evaluation_test from cmake build. It is disabled in bazel already. Change: 148691841

--- tensorflow/contrib/cmake/tf_tests.cmake
+++ tensorflow/contrib/cmake/tf_tests.cmake
@@ -155,6 +155,7 @@
       # misc
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/variable_scope_test.py"
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/reshape_op_test.py"
+      "${tensorflow_source_dir}/tensorflow/python/training/evaluation_test.py"
       "${tensorflow_source_dir}/tensorflow/tensorboard/backend/server_test.py"
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/diag_op_test.py"  # Silently failing with GPU kernel disabled.
       # int32/int64 mixup


[windows] fix installation of dlls

[windows] fix installation of dlls

--- rosidl_typesupport_introspection_cpp/cmake/rosidl_typesupport_introspection_cpp_generate_interfaces.cmake
+++ rosidl_typesupport_introspection_cpp/cmake/rosidl_typesupport_introspection_cpp_generate_interfaces.cmake
@@ -87,7 +87,9 @@

 install(
   TARGETS ${rosidl_generate_interfaces_TARGET}${_target_suffix}
-  DESTINATION "lib"
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+  RUNTIME DESTINATION bin
 )

 ament_export_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix})


Fix for problems executing test build script

--- indra/cmake/LLTestCommand.cmake
+++ indra/cmake/LLTestCommand.cmake
@@ -1,3 +1,5 @@
+include(Python)
+
 MACRO(LL_TEST_COMMAND OUTVAR LD_LIBRARY_PATH)
   # nat wonders how Kitware can use the term 'function' for a construct that
   # cannot return a value. And yet, variables you set inside a FUNCTION are


Bump GAPID version to v1.1.0

Bump GAPID version to v1.1.0

--- version.cmake
+++ version.cmake
@@ -15,8 +15,8 @@
 # True source of GAPID versions.
 # Increment these numbers immediately after releasing a new version.
 set(GAPID_VERSION_MAJOR 1)
-set(GAPID_VERSION_MINOR 0)
-set(GAPID_VERSION_POINT 1)
+set(GAPID_VERSION_MINOR 1)
+set(GAPID_VERSION_POINT 0)

 if (NOT DEFINED GAPID_BUILD_NUMBER)
     set(GAPID_BUILD_NUMBER 0)


Split off 7.12.60

Split off 7.12.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 7 )
 set ( HPCC_MINOR 12 )
-set ( HPCC_POINT 59 )
+set ( HPCC_POINT 61 )
 set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 0 )
 ###


Split off 8.8.0

Split off 8.8.0

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

--- version.cmake
+++ version.cmake
@@ -4,7 +4,7 @@
 set ( HPCC_NAME "Nagios Monitoring" )
 set ( HPCC_PROJECT "nagios-monitoring" )
 set ( HPCC_MAJOR 8 )
-set ( HPCC_MINOR 7 )
+set ( HPCC_MINOR 9 )
 set ( HPCC_POINT 0 )
 set ( HPCC_MATURITY "trunk" )
 set ( HPCC_SEQUENCE 0 )


COMP: Temporarily removed SegmentationInterpolationTest

--- Modules/Segmentation/Testing/files.cmake
+++ Modules/Segmentation/Testing/files.cmake
@@ -2,7 +2,7 @@
   mitkContourMapper2DTest.cpp
   mitkContourTest.cpp
   mitkDataNodeSegmentationTest.cpp
-  mitkSegmentationInterpolationTest.cpp
+#  mitkSegmentationInterpolationTest.cpp
   mitkOverwriteSliceFilterTest.cpp
 #  mitkOverwriteSliceFilterObliquePlaneTest.cpp
   mitkContourModelTest.cpp


Add conan-center repo to be able to find missing packages (e.g. catch2)

--- cmake/Conan.cmake
+++ cmake/Conan.cmake
@@ -6,6 +6,12 @@
   endif()

   include(${CMAKE_BINARY_DIR}/conan.cmake)
+
+  conan_add_remote(
+    NAME
+    conan-center
+    URL
+    https://api.bintray.com/conan/conan/conan-center)

   conan_add_remote(
     NAME


Synchronize adm files

Synchronize adm files

--- adm_local_without_kernel/cmake_files/SalomeMacros.cmake
+++ adm_local_without_kernel/cmake_files/SalomeMacros.cmake
@@ -846,7 +846,14 @@
 MACRO(SALOME_APPEND_LIST_OF_LIST result element_list)
   SET(_tmp_res)
   STRING(REPLACE ";" "," _tmp_res "${${element_list}}")
-  SET(${result} "${${result}};${_tmp_res}")  # LIST(APPEND ...) doesn't handle well empty elements!?
+
+  LIST(LENGTH result _list_len)
+  IF(NOT _list_len EQUAL 0)
+    SET(${result} "${${result}}${_tmp_res};")  # LIST(APPEND ...) doesn't handle well empty elements!?
+  ELSE()
+    SET(${result} "${_tmp_res};")              # to avoid redundant ';' at the beginning of the list
+  ENDIF()
+
 ENDMACRO(SALOME_APPEND_LIST_OF_LIST)

 #########################################################################


Remove debugging message I accidently left behind in 831b276f3c3ac50c7f25aad7213fbb13a5473b46

--- HalideGenerator.cmake
+++ HalideGenerator.cmake
@@ -107,7 +107,6 @@

   else()
     if (NOT target_is_pnacl)
-      message(STATUS "The filter lib is ${FILTER_LIB}")
       add_custom_command(OUTPUT "${SCRATCH_DIR}/${FILTER_LIB}" "${SCRATCH_DIR}/${FILTER_HDR}"
         DEPENDS "${args_GENERATOR_TARGET}"
         COMMAND "${CMAKE_BINARY_DIR}/bin/${generator_exec}" ${invoke_args}


Fixing spelling error

Fixing spelling error

--- support/cmake/support_macros.cmake
+++ support/cmake/support_macros.cmake
@@ -342,7 +342,7 @@

             # Create registration file
             string(TOUPPER ${module} module_upper)
-            string(TOLOWER ${module{ module_lower)
+            string(TOLOWER ${module} module_lower)
             unset(MODULE_NAME)
             unset(MODULE_PATH)
             include(${CMAKE_BINARY_DIR}/modules/${module_lower}/modulename.cmake)


Minor cleanup for Mac packaging

Minor cleanup for Mac packaging

Change-Id: I957c1dba961ee45568bf7f0898a49baf330c6c57

--- cmake/AvogadroCPack.cmake
+++ cmake/AvogadroCPack.cmake
@@ -4,7 +4,14 @@
 set(CPACK_PACKAGE_VERSION_PATCH ${AvogadroApp_VERSION_PATCH})
 set(CPACK_PACKAGE_VERSION ${AvogadroApp_VERSION})
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Avogadro2")
-set(CPACK_RESOURCE_FILE_LICENSE "${AvogadroApp_SOURCE_DIR}/COPYING")
+
+if(APPLE)
+  configure_file("${AvogadroApp_SOURCE_DIR}/COPYING"
+    "${AvogadroApp_BINARY_DIR}/COPYING.txt" @ONLY)
+  set(CPACK_RESOURCE_FILE_LICENSE "${AvogadroApp_BINARY_DIR}/COPYING.txt")
+else()
+  set(CPACK_RESOURCE_FILE_LICENSE "${AvogadroApp_SOURCE_DIR}/COPYING")
+endif()

 set(CPACK_PACKAGE_EXECUTABLES "avogadro" "Avogadro2")
 set(CPACK_CREATE_DESKTOP_LINKS "avogadro")


include generated config.h

include generated config.h

--- cmake/InstallThrift.cmake
+++ cmake/InstallThrift.cmake
@@ -1,8 +1,8 @@
 ExternalProject_Add(thrift
     URL                 http://www-us.apache.org/dist/thrift/${THRIFT_VERSION_STRING}/thrift-0.10.0.tar.gz
     URL_MD5             ${THRIFT_URL_MD5}
-    CONFIGURE_COMMAND   CMAKE_INCLUDE_PATH=<BINARY_DIR>/lib/cpp/src <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --with-openssl=${OPENSSL_ROOT_DIR} --with-boost=${BOOST_ROOT} --without-c_glib --without-csharp --without-python --without-java --without-nodejs --without-lua --without-ruby --without-php --without-erlang --without-go --without-nodejs --without-qt4 --without-qt5 --disable-plugin
-    BUILD_COMMAND       make
+    CONFIGURE_COMMAND   CPPFLAGS=-I<BINARY_DIR>/lib/cpp/src <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --with-openssl=${OPENSSL_ROOT_DIR} --with-boost=${BOOST_ROOT} --without-c_glib --without-csharp --without-python --without-java --without-nodejs --without-lua --without-ruby --without-php --without-erlang --without-go --without-nodejs --without-qt4 --without-qt5 --disable-plugin
+    BUILD_COMMAND       CPPFLAGS=-I<BINARY_DIR>/lib/cpp/src make
     INSTALL_COMMAND     make install
 )


commented out warning (for now)

commented out warning (for now)

--- cmake/MacroRootDict.cmake
+++ cmake/MacroRootDict.cmake
@@ -137,7 +137,7 @@

 # for backwards compatibility
 MACRO( GEN_ROOT_DICT_SOURCES _dict_src_filename )
-    MESSAGE( "USING DEPRECATED GEN_ROOT_DICT_SOURCES. PLEASE USE GEN_ROOT_DICT_SOURCE instead." )
+    #MESSAGE( "USING DEPRECATED GEN_ROOT_DICT_SOURCES. PLEASE USE GEN_ROOT_DICT_SOURCE instead." )
     SET( ROOT_DICT_OUTPUT_SOURCES )
     GEN_ROOT_DICT_SOURCE( ${_dict_src_filename} )
 ENDMACRO()


[cmake] use file(COPY) instead of configure_file.

--- cmake/OpenSimMacros.cmake
+++ cmake/OpenSimMacros.cmake
@@ -149,9 +149,8 @@
 function(OpenSimCopySharedTestFiles)
     if(BUILD_TESTING)
         foreach(filename ${ARGN})
-            configure_file("${OPENSIM_SHARED_TEST_FILES_DIR}/${filename}"
-                "${CMAKE_CURRENT_BINARY_DIR}"
-                COPYONLY)
+            file(COPY "${OPENSIM_SHARED_TEST_FILES_DIR}/${filename}"
+                 DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
         endforeach()
     endif()
 endfunction()


Add sparsepp headers to cmake/VendorHeaders.cmake

--- cmake/VendorHeaders.cmake
+++ cmake/VendorHeaders.cmake
@@ -1,5 +1,16 @@
 set(VENDOR_FREE_STANDING_HEADERS
   json.hpp
+  )
+set(VENDOR_SPARSEPP_HEADERS
+  spp_stdint.h
+  spp_timer.h
+  spp.h
+  spp_memory.h
+  spp_smartptr.h
+  spp_config.h
+  spp_utils.h
+  spp_dlalloc.h
+  spp_traits.h
   )
 set(VENDOR_SPDLOG_HEADERS
   details/async_logger_impl.h


Actually passing CMAKE_BUILD_TYPE to parent project

--- cmake/elemental_sub.cmake
+++ cmake/elemental_sub.cmake
@@ -1,4 +1,5 @@
 set(LIBRARY_TYPE ${LIBRARY_TYPE} PARENT_SCOPE)
+set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} PARENT_SCOPE)
 string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_BUILD_TYPE)
 set(CMAKE_CXX_FLAGS_${UPPER_BUILD_TYPE} ${CMAKE_CXX_FLAGS_${UPPER_BUILD_TYPE}} PARENT_SCOPE)
 set(MPI_C_COMPILER ${MPI_C_COMPILER} PARENT_SCOPE)


FIX: Fixed counting of vertices.

FIX: Fixed counting of vertices.

--- CMake/ctkFunctionGenerateDGraphInput.cmake
+++ CMake/ctkFunctionGenerateDGraphInput.cmake
@@ -63,8 +63,6 @@
       ENDIF()
       #MESSAGE(STATUS target_project_name:${target_project_name})

-      LIST(APPEND vertices ${target_project_name})
-
       # Make sure the variable is cleared
       SET(dependencies )

@@ -77,16 +75,24 @@
       # filter dependencies starting with CTK
       ctkMacroGetAllCTKTargetLibraries("${dependencies}" ctk_dependencies)

+      IF(ctk_dependencies)
+        LIST(APPEND vertices ${target_project_name})
+      ENDIF()
+
       # Generate XML related to the dependencies
       FOREACH(dependency_name ${ctk_dependencies})
         LIST(APPEND edges ${dependency_name})
         SET(dgraph_list ${dgraph_list} "${target_project_name} ${dependency_name}\n")
+        LIST(APPEND vertices ${dependency_name})
       ENDFOREACH()

     ENDIF()

   ENDFOREACH()

+  IF(vertices)
+    LIST(REMOVE_DUPLICATES vertices)
+  ENDIF()
   LIST(LENGTH vertices numberOfVertices)
   LIST(LENGTH edges numberOfEdges)


NMake: add hunter variables

NMake: add hunter variables

--- nmake-vs2013-x64.cmake
+++ nmake-vs2013-x64.cmake
@@ -14,3 +14,6 @@
 set(POLLY_TOOLCHAIN_TAG "nmake-vs2013-x64")

 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
+set(HUNTER_MSVC_ARCH "amd64")
+set(HUNTER_MSVC_VCVARSALL "$ENV{VS120COMNTOOLS}/../../VC/vcvarsall.bat")
+set(HUNTER_CMAKE_GENERATOR "NMake Makefiles")


[FIX] minor fix

[FIX] minor fix

--- testing/run_tests.sh.cmake
+++ testing/run_tests.sh.cmake
@@ -182,10 +182,10 @@
     local ref_out=$ref_exe.out
     # Do nothing if no reference implementation is found.
     if [ ! -x $ref_exe ]; then
-	echo "[EXECUTE] No reference implementation found for $target" >&2
+	echo "[EXECUTE] No reference implementation found." >&2
 	# Check if other implementation variants exist. If true,
 	# warn about the lack of an implementation for this target
-	if ! ls {CMAKE_CURRENT_BINARY_DIR}/tests/$src_name.ref.*.exe > \
+	if ls ${CMAKE_CURRENT_BINARY_DIR}/tests/$src_name.manual.*.exe > \
 	    /dev/null 2>&1 ; then
 	    warn "Missing reference implementation for $target?"
 	fi
@@ -194,7 +194,7 @@
     if [ $ref_exe -ot $ref_out ]; then
 	echo "[EXECUTE] Previous output found." >&2
     else
-	echo "[EXECUTE] Executing reference implementation ($ref_exe)" >&2
+	echo "[EXECUTE] Executing reference implementation ($ref_exe)." >&2
 	$ref_exe > $ref_out
     fi
     return 0


Make Wolfgang happy ;-)

Make Wolfgang happy ;-)

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

--- tests/submit_results.cmake
+++ tests/submit_results.cmake
@@ -30,9 +30,16 @@
 IF("${CTEST_SOURCE_DIRECTORY}" STREQUAL "")
   GET_FILENAME_COMPONENT(_path "${CMAKE_CURRENT_LIST_DIR}" PATH)
   SET(CTEST_SOURCE_DIRECTORY ${_path}/deal.II)
+  IF(NOT EXISTS ${CTEST_SOURCE_DIRECTORY}/CTestConfig.cmake)
+    SET(CTEST_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  ENDIF()
 ENDIF()

+MESSAGE("-- CTEST_SOURCE_DIRECTORY: ${CTEST_SOURCE_DIRECTORY}")
+
 SET(CTEST_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+MESSAGE("-- CTEST_BINARY_DIRECTORY: ${CTEST_BINARY_DIRECTORY}")

 FILE(STRINGS ${CTEST_BINARY_DIRECTORY}/Testing/TAG _tag)
 LIST(GET _tag 1 _track)


Disable usage of rdtsc in protobuf on darwin.

--- build_settings.cmake
+++ build_settings.cmake
@@ -86,6 +86,9 @@
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden ")
+endif()
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGOOGLE_PROTOBUF_NO_RDTSC")
 endif()

 # Linker flags


Add Apple install rule for documentation pdf.

--- Projects/apple/velodyneviewer.bundle.cmake
+++ Projects/apple/velodyneviewer.bundle.cmake
@@ -7,6 +7,10 @@
 install(CODE "
      file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}\" USE_SOURCE_PERMISSIONS TYPE DIRECTORY FILES
           \"${install_location}/bin/VeloView.app\")
+
+     file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}\" USE_SOURCE_PERMISSIONS TYPE FILE FILES
+          \"${SuperBuild_BINARY_DIR}/velodyneviewer/src/velodyneviewer/Doc/VeloView_Developer_Guide.pdf\")
+
      file(WRITE \"\${CMAKE_INSTALL_PREFIX}/VeloView.app/Contents/Resources/qt.conf\"
                 \"\")
      execute_process(


Copy dictionaries for executables to the bin directory.

--- cmake/BioDynaMo.cmake
+++ cmake/BioDynaMo.cmake
@@ -79,7 +79,7 @@
     if (DEFINED CMAKE_INSTALL_LIBDIR)
       add_custom_command(TARGET ${TARGET}
             POST_BUILD
-            COMMAND cp -f ${DICT_FILE}_rdict.pcm ${CMAKE_INSTALL_LIBDIR})
+            COMMAND ${CMAKE_COMMAND} -E copy ${DICT_FILE}_rdict.pcm ${CMAKE_INSTALL_BINDIR})
     endif()
   else()
     add_executable(${TARGET} ${ARG_SOURCES})
@@ -110,7 +110,7 @@
     if (DEFINED CMAKE_INSTALL_LIBDIR)
       add_custom_command(TARGET ${TARGET}
             POST_BUILD
-            COMMAND cp -f ${DICT_FILE}_rdict.pcm ${CMAKE_INSTALL_LIBDIR})
+            COMMAND ${CMAKE_COMMAND} -E copy ${DICT_FILE}_rdict.pcm ${CMAKE_INSTALL_LIBDIR})
     endif()
   else()
     add_library(${TARGET} SHARED ${ARG_SOURCES})


cmake: respect -DTESSDATA_PREFIX=/path (on linux)

--- cmake/Configure.cmake
+++ cmake/Configure.cmake
@@ -123,6 +123,13 @@
 #cmakedefine HAVE_LIBARCHIVE ${HAVE_LIBARCHIVE}
 ")

+if(TESSDATA_PREFIX)
+ add_definitions(-DTESSDATA_PREFIX=${TESSDATA_PREFIX})
+ file(APPEND ${AUTOCONFIG_SRC} "
+#cmakedefine TESSDATA_PREFIX ${TESSDATA_PREFIX}
+")
+endif()
+
 test_big_endian(WORDS_BIGENDIAN)

 file(APPEND ${AUTOCONFIG_SRC} "


Simplify (and fix) FindGLib2.cmake

Simplify (and fix) FindGLib2.cmake

When searching for libraries and includes, add `$ENV{GLIB_PATH}` to (a
local copy of) `CMAKE_PREFIX_PATH` rather than specifying the paths
manually. Modify helper to find includes to take an optional list of
libraries to use as additional search paths, which drastically
simplifies how we find glibconfig.h (and may be necessary in case
multiple copies for different architectures are installed).

This also "fixes" (by completely refactoring the relevant logic) a bug
where `CMAKE_LIBRARY_ARCHITECTURE` paths were not being added due to an
egregious typo.

--- cmake/FindGLib2.cmake
+++ cmake/FindGLib2.cmake
@@ -4,50 +4,30 @@

 #------------------------------------------------------------------------------
 function(_glib2_find_include VAR HEADER)
-  set(_suffixes
-    glib-2.0
-    glib-2.0/include
-  )
+  list(APPEND CMAKE_PREFIX_PATH $ENV{GLIB_PATH})

-  set(_paths "")
-  foreach(_prefix ${CMAKE_PREFIX_PATH} /usr/local /usr $ENV{GLIB_PATH})
-    if(CMAKE_LIBRARY_ARCHITECTURE)
-      list(APPEND ${_prefix}/lib/${CMAKE_LIBRARY_ARCHITECTURE})
-    endif()
-    list(APPEND _paths
-      ${_prefix}/include
-      ${_prefix}/lib${LIB_SUFFIX}
-      ${_prefix}/lib64
-      ${_prefix}/lib
-    )
+  set(_paths)
+  foreach(_lib ${ARGN})
+    get_filename_component(_libpath ${GLIB2_${_lib}_LIBRARY} DIRECTORY)
+    list(APPEND _paths ${_libpath})
   endforeach()

   find_path(GLIB2_${VAR}_INCLUDE_DIR ${HEADER}
     PATHS ${_paths}
-    PATH_SUFFIXES ${_suffixes}
+    PATH_SUFFIXES glib-2.0 glib-2.0/include
   )
   mark_as_advanced(GLIB2_${VAR}_INCLUDE_DIR)
 endfunction()

 #------------------------------------------------------------------------------
 function(_glib2_find_library VAR LIB)
-  set(_paths
-    $ENV{GLIB_PATH}/lib${LIB_SUFFIX}
-    $ENV{GLIB_PATH}/lib64
-    $ENV{GLIB_PATH}/lib
-  )
+  list(APPEND CMAKE_PREFIX_PATH $ENV{GLIB_PATH})

- find_library(GLIB2_${VAR}_LIBRARY
-    NAMES ${LIB}-2.0 ${LIB}
-    PATHS ${_paths}
-  )
+  find_library(GLIB2_${VAR}_LIBRARY NAMES ${LIB}-2.0 ${LIB})
   mark_as_advanced(GLIB2_${VAR}_LIBRARY)

   if(WIN32)
-    find_program(GLIB2_${VAR}_RUNTIME
-      NAMES lib${LIB}-2.0-0.dll
-      PATHS $ENV{GLIB_PATH}/bin
-    )
+    find_program(GLIB2_${VAR}_RUNTIME NAMES lib${LIB}-2.0-0.dll)
     mark_as_advanced(GLIB2_${VAR}_RUNTIME)
   endif()
 endfunction()
@@ -83,9 +63,9 @@

 ###############################################################################

+_glib2_find_library(GLIB glib)
 _glib2_find_include(GLIB glib.h)
-_glib2_find_include(GLIBCONFIG glibconfig.h)
-_glib2_find_library(GLIB glib)
+_glib2_find_include(GLIBCONFIG glibconfig.h GLIB)

 _glib2_add_target(glib GLIB GLIB GLIBCONFIG)