Added _LIBRARIES var to mix

Added _LIBRARIES var to mix

--- CMakeModules/Find3rdPartyDependencies.cmake
+++ CMakeModules/Find3rdPartyDependencies.cmake
@@ -9,19 +9,19 @@

     SET(MY_PATH_INCLUDE )
     SET(MY_PATH_LIB )
-
+
     FOREACH( MYPATH ${SEARCHPATHLIST} )
         SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include)
         SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib)
     ENDFOREACH( MYPATH ${SEARCHPATHLIST} )
-
+
     FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE}
       ${MY_PATH_INCLUDE}
       NO_DEFAULT_PATH
     )
     MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR")
     #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--")
-
+
     SET(LIBRARY_NAMES "")
     FOREACH(LIBNAME ${LIBRARY_NAMES_BASE})
         LIST(APPEND LIBRARY_NAMES "${LIBNAME}${EXSUFFIX}")
@@ -35,7 +35,7 @@
     FOREACH(LIBNAME ${LIBRARY_NAMES_BASE})
         LIST(APPEND LIBRARY_NAMES_DEBUG "${LIBNAME}${DEBUGSUFFIX}${EXSUFFIX}")
     ENDFOREACH(LIBNAME)
-    FIND_LIBRARY("${DEPNAME}_LIBRARY_DEBUG"
+    FIND_LIBRARY("${DEPNAME}_LIBRARY_DEBUG"
         NAMES ${LIBRARY_NAMES_DEBUG}
       PATHS ${MY_PATH_LIB}
       NO_DEFAULT_PATH
@@ -49,7 +49,13 @@
           MESSAGE("-- Warning Debug ${DEPNAME} not found, using: ${${DEPNAME}_LIBRARY}")
           SET(${DEPNAME}_LIBRARY_DEBUG "${${DEPNAME}_LIBRARY}")
       ENDIF(NOT ${DEPNAME}_LIBRARY_DEBUG)
+
+      SET(${DEPNAME}_LIBRARIES debug ${${DEPNAME}_LIBRARY_DEBUG} optimized ${${DEPNAME}_LIBRARY} )
+
     ENDIF(${DEPNAME}_INCLUDE_DIR AND ${DEPNAME}_LIBRARY)
+
+
+
 ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST DEBUGSUFFIX)

@@ -61,7 +67,7 @@
         FIND_DEPENDENCY(TIFF tiff.h libtiff ${OSG_3RDPARTY_BIN} "D" "_i")
         FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype2311MT;freetype234;freetype234MT;freetype235;freetype237;freetype238;freetype244;freetype250;" ${OSG_3RDPARTY_BIN} "d" "")
         IF(FREETYPE_FOUND)
-            #forcing subsequent FindFreeType stuff to not search for other variables.... kind of a hack
+            #forcing subsequent FindFreeType stuff to not search for other variables.... kind of a hack
             SET(FREETYPE_INCLUDE_DIR_ft2build ${FREETYPE_INCLUDE_DIR} CACHE PATH "" FORCE)
             SET(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR} CACHE PATH "" FORCE)
             MARK_AS_ADVANCED(FREETYPE_INCLUDE_DIR_ft2build FREETYPE_INCLUDE_DIR_freetype2)
@@ -72,7 +78,7 @@
         FIND_DEPENDENCY(GDAL gdal.h "gdal;gdal16" ${OSG_3RDPARTY_BIN} "d" "_i")
         FIND_DEPENDENCY(GLUT GL/glut.h glut32 ${OSG_3RDPARTY_BIN} "D" "")
         IF(GLUT_FOUND)
-            #forcing subsequent FindGlut stuff to not search for other variables.... kind of a hack
+            #forcing subsequent FindGlut stuff to not search for other variables.... kind of a hack
             SET(GLUT_glut_LIBRARY ${GLUT_LIBRARY} CACHE FILEPATH "")
             MARK_AS_ADVANCED(GLUT_glut_LIBRARY)
         ENDIF(GLUT_FOUND)
@@ -81,14 +87,14 @@
         IF(ZLIB_FOUND)
             FIND_DEPENDENCY(PNG png.h "libpng;libpng13;libpng15;libpng16" ${OSG_3RDPARTY_BIN} "D" "")
             IF(PNG_FOUND)
-                #forcing subsequent FindPNG stuff to not search for other variables.... kind of a hack
+                #forcing subsequent FindPNG stuff to not search for other variables.... kind of a hack
                 SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE FILEPATH "")
                 MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR)
             ENDIF(PNG_FOUND)
         ENDIF(ZLIB_FOUND)
-        FIND_DEPENDENCY(LIBXML2 libxml2 "libxml2" ${OSG_3RDPARTY_BIN} "D" "")
+        FIND_DEPENDENCY(LIBXML2 libxml2 "libxml2" ${OSG_3RDPARTY_BIN} "D" "")
         IF(LIBXML2_FOUND)
-            # The CMAKE find libxml module uses LIBXML2_LIBRARIES -> fill it.... kind of a hack
+            # The CMAKE find libxml module uses LIBXML2_LIBRARIES -> fill it.... kind of a hack
             SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY} CACHE FILEPATH "" FORCE)
             SET(LIBXML2_XMLLINT_EXECUTABLE ${OSG_3RDPARTY_BIN}/bin/xmllint.exe CACHE FILEPATH "Path to xmllint executable" FORCE)
         ENDIF(LIBXML2_FOUND)
@@ -132,7 +138,7 @@
             SET(TEST_3RDPARTY_DIR "${PARENT_DIR}/3rdParty_win32binaries_vs90sp1")
         ENDIF()
     ENDIF(NOT EXISTS ${TEST_3RDPARTY_DIR})
-
+
     SET(ACTUAL_3RDPARTY_DIR "${TEST_3RDPARTY_DIR}" CACHE PATH "Location of 3rdparty dependencies")
     SET(ACTUAL_3DPARTY_DIR "${ACTUAL_3RDPARTY_DIR}")  # kept for backcompatibility
     IF(EXISTS ${ACTUAL_3RDPARTY_DIR})


(split) BUG: Propagate build, linker, and OSX settings to external projects

Change-Id: I5d18375a98eabec9525b04897d53a339abc7d913

--- Superbuild.cmake
+++ Superbuild.cmake
@@ -16,14 +16,24 @@

 include( ExternalProject )

-# Compute -G arg for configuring external projects with the same CMake gener    ator:
+# Compute -G arg for configuring external projects with the same CMake generator:
 if(CMAKE_EXTRA_GENERATOR)
   set(gen "${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}")
 else()
   set(gen "${CMAKE_GENERATOR}" )
 endif()

+set(CMAKE_OSX_EXTERNAL_PROJECT_ARGS)
+if(APPLE)
+  list(APPEND CMAKE_OSX_EXTERNAL_PROJECT_ARGS
+    -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+    -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+    -DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}
+  )
+endif(APPLE)
+
 set(ep_common_args
+  -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
   -DCMAKE_CXX_COMPILER:PATH=${CMAKE_CXX_COMPILER}
   -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
   -DCMAKE_C_COMPILER:PATH=${CMAKE_C_COMPILER}
@@ -31,6 +41,7 @@
   -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
   -DCMAKE_GENERATOR:STRING=${CMAKE_GENERATOR}
   -DCMAKE_EXTRA_GENERATOR:STRING=${CMAKE_EXTRA_GENERATOR}
+  ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
   )

 set( ITKApps_DEPENDENCIES )


fix cmake lint failures

fix cmake lint failures

--- opensplice_cmake_module/cmake/Modules/FindOpenSplice.cmake
+++ opensplice_cmake_module/cmake/Modules/FindOpenSplice.cmake
@@ -38,6 +38,8 @@
 #   # use OpenSplice_* variables
 #
 ###############################################################################
+
+# lint_cmake: -convention/filename, -package/stdargs

 set(OpenSplice_FOUND FALSE)

@@ -108,3 +110,14 @@
     set(OpenSplice_FOUND TRUE)
   endif()
 endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OpenSplice
+  FOUND_VAR OpenSplice_FOUND
+  REQUIRED_VARS
+    OpenSplice_INCLUDE_DIRS
+    OpenSplice_LIBRARIES
+    OpenSplice_LIBRARY_DIRS
+    OpenSplice_DEFINITIONS
+    OpenSplice_IDLPP
+)


undo last change

undo last change

--- superbuild/Projects/apple/netcdf.cmake
+++ superbuild/Projects/apple/netcdf.cmake
@@ -30,7 +30,7 @@
       DEPENDEES update
       DEPENDERS patch)

-if( ${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.6" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.7" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.8")
+if( ${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.6" )
 add_external_project_step(patch2
       COMMENT "Fixing missing include files."
       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/Projects/patches/netcdf.daputil.c <SOURCE_DIR>/libdap2/daputil.c


Doh! Update the CMake file that controls drag and drop to turn it ON

--- indra/cmake/DragDrop.cmake
+++ indra/cmake/DragDrop.cmake
@@ -4,7 +4,7 @@

   OPTION (OS_DRAG_DROP
   "Build the viewer with OS level drag and drop turned on or off"
-  OFF)
+  ON)

   if (OS_DRAG_DROP)


cmake: fix issues in the FindGMock module

Summary:
- Fix the variable name passed to FIND_PACKAGE_HANDLE_STANDARD_ARGS() so that
  it matches the module name (`FindGMock.cmake`).  This makes sure that the
  failure is detected correctly if GMock is not found.
- googletest depends on pthreads, so use `find_package(Threads)` and add
  `Threads::Threads` to the list of required library dependencies.

Reviewed By: yfeldblum

Differential Revision: D9212536

fbshipit-source-id: eae6220a2dbfe777bff1ac0ee0fb4df53de16955

--- CMake/FindGMock.cmake
+++ CMake/FindGMock.cmake
@@ -20,6 +20,7 @@
 FIND_LIBRARY(LIBGTEST_LIBRARY_DEBUG NAMES gtestd)
 FIND_LIBRARY(LIBGTEST_LIBRARY_RELEASE NAMES gtest)

+find_package(Threads REQUIRED)
 INCLUDE(SelectLibraryConfigurations)
 SELECT_LIBRARY_CONFIGURATIONS(LIBGMOCK_MAIN)
 SELECT_LIBRARY_CONFIGURATIONS(LIBGMOCK)
@@ -29,6 +30,7 @@
   ${LIBGMOCK_MAIN_LIBRARY}
   ${LIBGMOCK_LIBRARY}
   ${LIBGTEST_LIBRARY}
+  Threads::Threads
 )

 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
@@ -44,7 +46,7 @@
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-  LIBGMOCK
+  GMock
   DEFAULT_MSG
   LIBGMOCK_MAIN_LIBRARY
   LIBGMOCK_LIBRARY


Add ALLOW_BUILD_FAIL option to add_cmake_build_test.

Sometimes we want to ensure that a build fails, so add a new option
to allow that to happen and then check for it later in the
Verify stage.

--- CMakeUnitRunner.cmake
+++ CMakeUnitRunner.cmake
@@ -74,19 +74,22 @@
     file (MAKE_DIRECTORY ${TEST_DIRECTORY_NAME})
     file (MAKE_DIRECTORY ${TEST_WORKING_DIRECTORY_NAME})
     set (TEST_DRIVER_SCRIPT_CONTENTS
-         "function (add_driver_command COMMAND_VAR OUTPUT_FILE ERROR_FILE)\n"
+         "function (add_driver_command COMMAND_VAR\n"
+         "                             OUTPUT_FILE\n"
+         "                             ERROR_FILE\n"
+         "                             ALLOW_FAIL)\n"
          "    message (\"Running \" \${\${COMMAND_VAR}})\n"
          "    execute_process (COMMAND \${\${COMMAND_VAR}}\n"
          "                     RESULT_VARIABLE RESULT\n"
          "                     OUTPUT_VARIABLE OUTPUT\n"
          "                     ERROR_VARIABLE ERROR)\n"
-         "    if (RESULT EQUAL 0)\n"
+         "    if (RESULT EQUAL 0 OR ALLOW_FAIL)\n"
          "        message (\"\\n\${OUTPUT}\\n\${ERROR}\")\n"
-         "    else (RESULT EQUAL 0)\n"
+         "    else (RESULT EQUAL 0 OR ALLOW_FAIL)\n"
          "        message (FATAL_ERROR \n"
          "                 \"The command \${\${COMMAND_VAR}}} failed with \"\n"
          "                 \"\${RESULT}\\n\${ERROR}\\n\${OUTPUT}\")\n"
-         "    endif (RESULT EQUAL 0)\n"
+         "    endif (RESULT EQUAL 0 OR ALLOW_FAIL)\n"
          "    file (WRITE\n"
          "          \${OUTPUT_FILE}\n"
          "          \"Output:\\n\"\n"
@@ -105,10 +108,11 @@

 function (_add_driver_step DRIVER_SCRIPT STEP)

+    set (DRIVER_STEP_OPTION_ARGS ALLOW_FAIL)
     set (DRIVER_STEP_MULTIVAR_ARGS COMMAND)

     cmake_parse_arguments (ADD_DRIVER_STEP
-                           ""
+                           "${DRIVER_STEP_OPTION_ARGS}"
                            ""
                            "${DRIVER_STEP_MULTIVAR_ARGS}"
                            ${ARGN})
@@ -118,12 +122,23 @@
         message (FATAL_ERROR "A COMMAND must be provided to add_driver_step")

     endif (NOT ADD_DRIVER_STEP_COMMAND)
+
+    if (ADD_DRIVER_STEP_ALLOW_FAIL)
+
+        set (ALLOW_FAIL ON)
+
+    else (ADD_DRIVER_STEP_ALLOW_FAIL)
+
+        set (ALLOW_FAIL OFF)
+
+    endif (ADD_DRIVER_STEP_ALLOW_FAIL)

     file (APPEND ${DRIVER_SCRIPT}
           "set (${STEP} ${ADD_DRIVER_STEP_COMMAND})\n"
           "add_driver_command (${STEP}\n"
           "                    \${CMAKE_CURRENT_BINARY_DIR}/${STEP}.output\n"
-          "                    \${CMAKE_CURRENT_BINARY_DIR}/${STEP}.error)\n")
+          "                    \${CMAKE_CURRENT_BINARY_DIR}/${STEP}.error\n"
+          "                    ${ALLOW_FAIL})\n")

 endfunction (_add_driver_step DRIVER_SCRIPT STEP COMMAND_VAR)

@@ -184,6 +199,20 @@
                              TEST_WORKING_DIRECTORY_NAME
                              TARGET)

+    set (BUILD_STEP_OPTION_ARGS ALLOW_FAIL)
+
+    cmake_parse_arguments (BUILD_STEP
+                           "${BUILD_STEP_OPTION_ARGS}"
+                           ""
+                           ""
+                           ${ARGN})
+
+    if (BUILD_STEP_ALLOW_FAIL)
+
+        set (ALLOW_FAIL_OPTION ALLOW_FAIL)
+
+    endif (BUILD_STEP_ALLOW_FAIL)
+
     set (BUILD_COMMAND ${CMAKE}
                        --build
                        ${TEST_WORKING_DIRECTORY_NAME}
@@ -191,7 +220,8 @@
                        --target
                        ${TARGET})
     _add_driver_step (${DRIVER_SCRIPT} BUILD
-                      COMMAND ${BUILD_COMMAND})
+                      COMMAND ${BUILD_COMMAND}
+                      ${ALLOW_FAIL_OPTION})

 endfunction (_append_build_step)

@@ -248,7 +278,7 @@
 # VERIFY to ensure that the project built correctly.
 function (add_cmake_build_test TEST_NAME VERIFY)

-    set (ADD_CMAKE_BUILD_TEST_OPTION_ARGS)
+    set (ADD_CMAKE_BUILD_TEST_OPTION_ARGS ALLOW_BUILD_FAIL)
     set (ADD_CMAKE_BUILD_TEST_SINGLEVAR_ARGS
          TARGET)
     set (ADD_CMAKE_BUILD_TEST_MULTIVAR_ARGS)
@@ -264,6 +294,12 @@
         set (ADD_CMAKE_BUILD_TEST_TARGET all)

     endif (NOT ADD_CMAKE_BUILD_TEST_TARGET)
+
+    if (ADD_CMAKE_BUILD_TEST_ALLOW_BUILD_FAIL)
+
+        set (ALLOW_BUILD_FAIL_OPTION ALLOW_FAIL)
+
+    endif (ADD_CMAKE_BUILD_TEST_ALLOW_BUILD_FAIL)

     _define_variables_for_test (${TEST_NAME})
     _bootstrap_test_driver_script(${TEST_NAME}
@@ -277,7 +313,8 @@
                             ${TEST_FILE})
     _append_build_step (${TEST_DRIVER_SCRIPT}
                         ${TEST_WORKING_DIRECTORY_NAME}
-                        ${ADD_CMAKE_BUILD_TEST_TARGET})
+                        ${ADD_CMAKE_BUILD_TEST_TARGET}
+                        ${ALLOW_BUILD_FAIL_OPTION})
     _append_verify_step (${TEST_DRIVER_SCRIPT}
                          ${TEST_INITIAL_CACHE_FILE}
                          ${VERIFY})


Build sm50 binaries by default

Build sm50 binaries by default

Some NVIDIA driver versions appear to have bugs when converting older
PTX to the new hardeware. These issues appear as failed unit tests. The
issues go away when nvcc builds the binary.

--- CMake/hoomd/HOOMDCUDASetup.cmake
+++ CMake/hoomd/HOOMDCUDASetup.cmake
@@ -50,7 +50,9 @@
 # setup CUDA compile options
 if (ENABLE_CUDA)
     # setup nvcc to build for all CUDA architectures. Allow user to modify the list if desired
-    if (CUDA_VERSION VERSION_GREATER 4.99)
+    if (CUDA_VERSION VERSION_GREATER 5.99)
+        set(CUDA_ARCH_LIST 20 30 35 50 CACHE STRING "List of target sm_ architectures to compile CUDA code for. Separate with semicolons.")
+    elseif (CUDA_VERSION VERSION_GREATER 4.99)
         set(CUDA_ARCH_LIST 20 30 35 CACHE STRING "List of target sm_ architectures to compile CUDA code for. Separate with semicolons.")
     elseif (CUDA_VERSION VERSION_GREATER 4.1)
         set(CUDA_ARCH_LIST 20 30 CACHE STRING "List of target sm_ architectures to compile CUDA code for. Separate with semicolons.")


build: update seastar to c9d6e20

build: update seastar to c9d6e20

--- recipe/wellknown.cmake
+++ recipe/wellknown.cmake
@@ -99,9 +99,7 @@
     -DSeastar_TESTING=OFF
   EXTERNAL_PROJECT_ARGS
     GIT_REPOSITORY https://github.com/scylladb/seastar/
-    GIT_TAG 5e39990
-    #URL https://github.com/scylladb/seastar/archive/5e39990.tar.gz
-    #URL_MD5 9e57a4ca35493e375bef68288c6424ce
+    GIT_TAG c9d6e20
     )


rearrange depdencies check order

rearrange depdencies check order

--- ConfigureChecks.cmake
+++ ConfigureChecks.cmake
@@ -2,6 +2,27 @@
 # Load Modules
 #####
 INCLUDE(CheckIncludeFile)
+
+##################################################
+# Int Types
+#####
+CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
+CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILE(stddef.h HAVE_STDDEF_H)
+
+##################################################
+# Doxygen
+#####
+FIND_PACKAGE(Doxygen)
+IF(DOXYGEN_DOT_EXECUTABLE)
+  OPTION(USE_DOT "use dot in doxygen?" FLASE)
+ENDIF(DOXYGEN_DOT_EXECUTABLE)
+
+SET(USE_DOT_YESNO NO)
+IF(USE_DOT)
+  SET(USE_DOT_YESNO YES)
+ENDIF(USE_DOT)

 ##################################################
 # Boost
@@ -34,25 +55,3 @@
 # Tokoyo Cabnet
 #####
 FIND_PACKAGE(TokyoCabinet 1.4.24)
-
-##################################################
-# Int Types
-#####
-###########
-CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
-CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE(stddef.h HAVE_STDDEF_H)
-
-##################################################
-# Doxygen
-#####
-FIND_PACKAGE(Doxygen)
-IF(DOXYGEN_DOT_EXECUTABLE)
-  OPTION(USE_DOT "use dot in doxygen?" FLASE)
-ENDIF(DOXYGEN_DOT_EXECUTABLE)
-
-SET(USE_DOT_YESNO NO)
-IF(USE_DOT)
-  SET(USE_DOT_YESNO YES)
-ENDIF(USE_DOT)


Find `libjwt`: Reformat CMake code

Find `libjwt`: Reformat CMake code

--- cmake/Modules/FindLibJWT.cmake
+++ cmake/Modules/FindLibJWT.cmake
@@ -1,23 +1,20 @@
+# ~~~
 # Find the libjwt includes and library
 #
 #  LIBJWT_INCLUDE_DIR  - Where to find libjwt include sub-directory.
-#  LIBJWT_LIBRARY	   - Path to libjwt library.
+#  LIBJWT_LIBRARY      - Path to libjwt library.
 #  LIBJWT_FOUND        - True if libjwt found.
+# ~~~

 if (LIBJWT_INCLUDE_DIR)
-  # Already in cache, be silent.
-  set (LIBJWT_FIND_QUIETLY TRUE)
+	set (LIBJWT_FIND_QUIETLY TRUE) # Already in cache, be silent.
 endif (LIBJWT_INCLUDE_DIR)

 find_path (LIBJWT_INCLUDE_DIR jwt.h PATHS /usr/include /usr/local/include PATH_SUFFIXES jwt)
 find_library (LIBJWT_LIBRARY NAMES jwt PATHS /usr/lib /usr/lib64 /usr/local/lib)

-# Handle the QUIETLY and REQUIRED arguments and set LIBJWT_FOUND to
-# TRUE if all listed variables are TRUE.
+# Handle the QUIETLY and REQUIRED arguments and set LIBJWT_FOUND to TRUE if all listed variables are TRUE.
 include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (
-  LibJWT DEFAULT_MSG
-  LIBJWT_LIBRARY LIBJWT_INCLUDE_DIR
-)
+find_package_handle_standard_args (LibJWT DEFAULT_MSG LIBJWT_LIBRARY LIBJWT_INCLUDE_DIR)

 mark_as_advanced (LIBJWT_LIBRARY LIBJWT_INCLUDE_DIR)


Update OpenCVDetectPython.cmake

Update OpenCVDetectPython.cmake

On my MacOS the output of the sphinx-build binary is the following:

Error: Insufficient arguments.

Sphinx v1.2b1
Usage: /usr/local/bin/sphinx-build [options] sourcedir outdir [filenames...]

...

I have installed sphinx, but without this change HAVE_SPHINX==0 for me, so I can't build docs.

--- cmake/OpenCVDetectPython.cmake
+++ cmake/OpenCVDetectPython.cmake
@@ -108,7 +108,7 @@
                         OUTPUT_QUIET
                         ERROR_VARIABLE SPHINX_OUTPUT
                         OUTPUT_STRIP_TRAILING_WHITESPACE)
-        if(SPHINX_OUTPUT MATCHES "^Sphinx v([0-9][^ \n]*)")
+        if(SPHINX_OUTPUT MATCHES ".*Sphinx v([0-9][^ \n]*)")
           set(SPHINX_VERSION "${CMAKE_MATCH_1}")
           set(HAVE_SPHINX 1)
           message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}")


MKLML pipeline - update C# and CMake to handle dll dependencies (#810)

* Refactor NuGet to allow arbitrary namespaces

* Move csharp build to end of cmake

* Minor edit to ensure dll generation in sequence

--- cmake/onnxruntime_csharp.cmake
+++ cmake/onnxruntime_csharp.cmake
@@ -3,12 +3,18 @@

 set (CSHARP_ROOT ${PROJECT_SOURCE_DIR}/../csharp)
 set (CSHARP_MASTER_TARGET OnnxRuntime.CSharp)
-set (CSHARP_MASTER_PROJECT ${CSHARP_ROOT}/OnnxRuntime.CSharp.proj )
+set (CSHARP_MASTER_PROJECT ${CSHARP_ROOT}/OnnxRuntime.CSharp.proj)
+if (onnxruntime_RUN_ONNX_TESTS)
+  set (CSHARP_DEPENDS onnxruntime ${test_data_target})
+else()
+  set (CSHARP_DEPENDS onnxruntime)
+endif()
+
 include(CSharpUtilities)

 include_external_msproject(${CSHARP_MASTER_TARGET}
                            ${CSHARP_MASTER_PROJECT}
-                           onnxruntime   # make it depend on the native onnxruntime project
+			   ${CSHARP_DEPENDS}
                            )

 # generate Directory.Build.props


updated cmake log message to report building unit tests


fix build

fix build

--- cmake_admin/FindReadline.cmake
+++ cmake_admin/FindReadline.cmake
@@ -11,7 +11,7 @@
 find_library ( READLINE_LIBRARIES NAMES readline )

 if ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES )
-    set ( HAVE_READLINE TRUE CACHE BOOL )
+    set ( HAVE_READLINE TRUE CACHE BOOL "Found readline header and lib" FORCE )
 endif ( READLINE_INCLUDE_DIR AND READLINE_LIBRARIES )

 include ( FindPackageHandleStandardArgs )


Adjust FindSDL2.cmake

Adjust FindSDL2.cmake

Match paths produced by pkg-config

--- examples/cmake/FindSDL2.cmake
+++ examples/cmake/FindSDL2.cmake
@@ -1,8 +1,8 @@
 # - Locate SDL2 library (modified from CMake's FindSDL.cmake)
 # This module defines
-#  SDL2_LIBRARY, the name of the library to link against
+#  SDL2_LIBRARIES, the name of the library to link against
 #  SDL2_FOUND, if false, do not try to link to SDL
-#  SDL2_INCLUDE_DIR, where to find SDL.h
+#  SDL2_INCLUDE_DIRS, where to find SDL.h
 #  SDL2_VERSION_STRING, human-readable string containing the version of SDL2
 #
 # This module responds to the the flag:
@@ -11,15 +11,15 @@
 #    only applications need main().
 #    Otherwise, it is assumed you are building an application and this
 #    module will attempt to locate and set the the proper link flags
-#    as part of the returned SDL2_LIBRARY variable.
+#    as part of the returned SDL2_LIBRARIES variable.
 #
 # Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
-# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
+# and no SDL2_LIBRARIES, it means CMake did not find your SDL2 library
 # (SDL2.dll, libsdl2.so, SDL2.framework, etc).
 # Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
 # Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
-# as appropriate. These values are used to generate the final SDL2_LIBRARY
-# variable, but when these values are unset, SDL2_LIBRARY does not get created.
+# as appropriate. These values are used to generate the final SDL2_LIBRARIES
+# variable, but when these values are unset, SDL2_LIBRARIES does not get created.
 #
 #
 # $SDLDIR is an environment variable that would
@@ -38,7 +38,7 @@
 # See the License for more information.
 #=============================================================================

-find_path(SDL2_INCLUDE_DIR SDL.h
+find_path(SDL2_INCLUDE_DIRS SDL.h
   HINTS
     ENV SDLDIR
   PATH_SUFFIXES include/SDL2 include
@@ -52,7 +52,7 @@
 )

 if(NOT SDL2_BUILDING_LIBRARY)
-  if(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+  if(NOT ${SDL2_INCLUDE_DIRS} MATCHES ".framework")
     # Non-OS X framework versions expect you to also dynamically link to
     # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
     # seem to provide SDLmain for compatibility even though they don't
@@ -119,15 +119,15 @@
   endif()

   # Set the final string here so the GUI reflects the final state.
-  set(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
+  set(SDL2_LIBRARIES ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
   # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
   set(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
 endif()

-if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
+if(SDL2_INCLUDE_DIRS AND EXISTS "${SDL2_INCLUDE_DIRS}/SDL_version.h")
+  file(STRINGS "${SDL2_INCLUDE_DIRS}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
+  file(STRINGS "${SDL2_INCLUDE_DIRS}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
+  file(STRINGS "${SDL2_INCLUDE_DIRS}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
   string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}")
   string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}")
   string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}")
@@ -143,5 +143,5 @@
 include(FindPackageHandleStandardArgs)

 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
-                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR
+                                  REQUIRED_VARS SDL2_LIBRARIES SDL2_INCLUDE_DIRS
                                   VERSION_VAR SDL2_VERSION_STRING)


Specify 2.7 as required Python version

Specify 2.7 as required Python version

--- projects/python.use.system.cmake
+++ projects/python.use.system.cmake
@@ -1,5 +1,5 @@
-find_package(PythonLibs)
-find_package(PythonInterp)
+find_package(PythonLibs 2.7 REQUIRED)
+find_package(PythonInterp 2.7 REQUIRED)

 set (pv_python_executable "${PYTHON_EXECUTABLE}" CACHE INTERNAL "" FORCE)
 # This will add PYTHON_LIBRARY, PYTHON_EXECUTABLE, PYTHON_INCLUDE_DIR


[TASK] Update dependency to the latest C++ SDK

Related: CLI-117

--- ext/virgil_sdk/virgil_sdk.cmake
+++ ext/virgil_sdk/virgil_sdk.cmake
@@ -52,8 +52,8 @@

 ExternalProject_Add (${PROJECT_NAME}
     DOWNLOAD_DIR "@VIRGIL_DEPENDS_PACKAGE_DOWNLOAD_DIR@"
-    URL "https://github.com/VirgilSecurity/virgil-sdk-cpp/archive/e3ed9e19c006f2e352b25ff9e35aeb1def83cce3.tar.gz"
-    URL_HASH SHA1=31e6b481fefc15f74ee86082fe02f96451caf61f
+    URL "https://github.com/VirgilSecurity/virgil-sdk-cpp/archive/38a9f6497abce55ee79f9a4547607fb055b5bf63.tar.gz"
+    URL_HASH SHA1=3a0d5a485ac1237a901136b89ffc05513cbf87cd
     PREFIX "@VIRGIL_DEPENDS_PACKAGE_BUILD_DIR@"
     CMAKE_ARGS "@VIRGIL_DEPENDS_CMAKE_ARGS@"
 )


QtWebKit: require explicit enable

QtWebKit: require explicit enable

WebKit is on its way out and usually not needed anyways.

--- GUISupport/QtWebkit/module.cmake
+++ GUISupport/QtWebkit/module.cmake
@@ -1,6 +1,4 @@
 vtk_module(vtkGUISupportQtWebkit
-  GROUPS
-    Qt
   DEPENDS
     vtkViewsQt
   TEST_DEPENDS


CI: try to enable testing

CI: try to enable testing

--- CI/main_ci.cmake
+++ CI/main_ci.cmake
@@ -91,15 +91,14 @@
   message( SEND_ERROR "An error occurs during ctest_build.")
 endif()

-# Uncomment when ready for test
-# ctest_test(PARALLEL_LEVEL 8
-#            RETURN_VALUE _test_rv
-#            CAPTURE_CMAKE_ERROR _test_error
-#            )
+ctest_test(PARALLEL_LEVEL 8
+           RETURN_VALUE _test_rv
+           CAPTURE_CMAKE_ERROR _test_error
+           )

-# if ( NOT _test_rv EQUAL 0 )
-#   ctest_submit()
-#   message( SEND_ERROR "An error occurs during ctest_test.")
-# endif()
+if ( NOT _test_rv EQUAL 0 )
+  ctest_submit()
+  message( SEND_ERROR "An error occurs during ctest_test.")
+endif()

 ctest_submit()


Ensure PREFIX is absolute

Ensure PREFIX is absolute

--- DownloadProject.cmake
+++ DownloadProject.cmake
@@ -121,9 +121,13 @@
     endif()

     # Set up where we will put our temporary CMakeLists.txt file and also
-    # the base point below which the default source and binary dirs will be
+    # the base point below which the default source and binary dirs will be.
+    # The prefix must always be an absolute path.
     if (NOT DL_ARGS_PREFIX)
         set(DL_ARGS_PREFIX "${CMAKE_BINARY_DIR}")
+    else()
+        get_filename_component(DL_ARGS_PREFIX "${DL_ARGS_PREFIX}" ABSOLUTE
+                               BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
     endif()
     if (NOT DL_ARGS_DOWNLOAD_DIR)
         set(DL_ARGS_DOWNLOAD_DIR "${DL_ARGS_PREFIX}/${DL_ARGS_PROJ}-download")


Try fix RealmCore configuration problem

Try fix RealmCore configuration problem

--- CMake/RealmCore.cmake
+++ CMake/RealmCore.cmake
@@ -223,8 +223,8 @@
         BUILD_IN_SOURCE 1
         UPDATE_DISCONNECTED 1
         INSTALL_COMMAND ""
-        CONFIGURE_COMMAND cmake -B build.debug -DOpenSSL_DIR="${CMAKE_BINARY_DIR}/openssl/lib/cmake/OpenSSL" -D CMAKE_BUILD_TYPE=Debug ${CORE_SANITIZER_FLAGS} -G Ninja
-                       && cmake -B build.release -DOpenSSL_DIR="${CMAKE_BINARY_DIR}/openssl/lib/cmake/OpenSSL" -D CMAKE_BUILD_TYPE=RelWithDebInfo ${CORE_SANITIZER_FLAGS} -G Ninja
+        CONFIGURE_COMMAND cmake -B build.debug -DOpenSSL_DIR=${CMAKE_BINARY_DIR}/openssl/lib/cmake/OpenSSL -D CMAKE_BUILD_TYPE=Debug ${CORE_SANITIZER_FLAGS} -G Ninja
+                       && cmake -B build.release -DOpenSSL_DIR=${CMAKE_BINARY_DIR}/openssl/lib/cmake/OpenSSL -D CMAKE_BUILD_TYPE=RelWithDebInfo ${CORE_SANITIZER_FLAGS} -G Ninja

         BUILD_COMMAND cmake --build build.debug --target Storage --target QueryParser
                    && cmake --build build.release --target Storage --target QueryParser


Ogre3d Builds for Windows, with samples.

--- CMake/ois.cmake
+++ CMake/ois.cmake
@@ -43,15 +43,11 @@
 )
 endif(WIN32)

-set(ZZip_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/ois-v1-3/includes")
-set(ZZip_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/ois-v1-3/includes")
-set(ZZip_HOME "${CMAKE_SOURCE_DIR}/ois-v1-3")
-set(ZZip_PREFIX_PATH "${CMAKE_SOURCE_DIR}/ois-v1-3")
-set(ZZip_LIBRARIES ois)
-set(ZZip_LIBRARY ois)
-set(ZZip_LIBRARY_FWK ois)
-set(ZZip_LIBRARY_REL ois)
-set(ZZip_LIBRARY_DBG ois)
+set(OIS_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/ois-v1-3/includes")
+set(OIS_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/ois-v1-3/includes")
+set(OIS_LIBRARIES ois dxguid dinput8 xinput)
+set(OIS_LIBRARY ois)
+
 include_directories("${CMAKE_SOURCE_DIR}/ois-v1-3/includes")
 add_library(ois ${OIS_SOURCES} ${OIS_PLATFORM_SOURCES})


Fixes for module system

Fixes for module system

--- Core/Code/files.cmake
+++ Core/Code/files.cmake
@@ -189,767 +189,4 @@
   Rendering/vtkMitkRectangleProp.cpp
   Rendering/vtkMitkRenderProp.cpp
 )
-SET(CPP_FILES
-  Algorithms/mitkBaseDataSource.cpp
-  Algorithms/mitkBaseProcess.cpp
-  Algorithms/mitkCoreObjectFactory.cpp
-  Algorithms/mitkDataTreeNodeFactory.cpp
-  Algorithms/mitkDataTreeNodeSource.cpp
-  Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp
-  Algorithms/mitkHistogramGenerator.cpp
-  Algorithms/mitkImageCastPart1.cpp
-  Algorithms/mitkImageCastPart2.cpp
-  Algorithms/mitkImageCastPart3.cpp
-  Algorithms/mitkImageCastPart4.cpp
-  Algorithms/mitkImageChannelSelector.cpp
-  Algorithms/mitkImageSliceSelector.cpp
-  Algorithms/mitkImageSource.cpp
-  Algorithms/mitkImageTimeSelector.cpp
-  Algorithms/mitkImageToImageFilter.cpp
-  Algorithms/mitkPointSetSource.cpp
-  Algorithms/mitkSubImageSelector.cpp
-  Algorithms/mitkSurfaceSource.cpp
-  Algorithms/mitkUIDGenerator.cpp
-  Algorithms/mitkVolumeCalculator.cpp
-  Controllers/mitkBaseController.cpp
-  Controllers/mitkCameraController.cpp
-  Controllers/mitkCameraRotationController.cpp
-  Controllers/mitkFocusManager.cpp
-  Controllers/mitkLimitedLinearUndo.cpp
-  Controllers/mitkOperationEvent.cpp
-  Controllers/mitkRenderingManager.cpp
-  Controllers/mitkSliceNavigationController.cpp
-  Controllers/mitkSlicesCoordinator.cpp
-  Controllers/mitkSlicesRotator.cpp
-  Controllers/mitkSlicesSwiveller.cpp
-  Controllers/mitkStepper.cpp
-  Controllers/mitkTestManager.cpp
-  Controllers/mitkUndoController.cpp
-  Controllers/mitkVerboseLimitedLinearUndo.cpp
-  Controllers/mitkVtkInteractorCameraController.cpp
-  Controllers/mitkVtkLayerController.cpp
-  DataManagement/mitkAbstractTransformGeometry.cpp
-  DataManagement/mitkAnnotationProperty.cpp
-  DataManagement/mitkApplicationCursor.cpp
-  DataManagement/mitkBaseData.cpp
-  DataManagement/mitkBaseProperty.cpp
-  DataManagement/mitkClippingProperty.cpp
-  DataManagement/mitkColorProperty.cpp
-  DataManagement/mitkDataStorage.cpp
-  DataManagement/mitkDataTree.cpp
-  DataManagement/mitkDataTreeNode.cpp
-  DataManagement/mitkDataTreeStorage.cpp
-  DataManagement/mitkDisplayGeometry.cpp
-  DataManagement/mitkEnumerationProperty.cpp
-  DataManagement/mitkGeometry2D.cpp
-  DataManagement/mitkGeometry2DData.cpp
-  DataManagement/mitkGeometry3D.cpp
-  DataManagement/mitkGeometryData.cpp
-  DataManagement/mitkGroupTagProperty.cpp
-  DataManagement/mitkImage.cpp
-  DataManagement/mitkImageDataItem.cpp
-  DataManagement/mitkLandmarkBasedCurvedGeometry.cpp
-  DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
-  DataManagement/mitkLandmarkProjector.cpp
-  DataManagement/mitkLevelWindow.cpp
-  DataManagement/mitkLevelWindowManager.cpp
-  DataManagement/mitkLevelWindowPreset.cpp
-  DataManagement/mitkLevelWindowProperty.cpp
-  DataManagement/mitkLookupTable.cpp
-  DataManagement/mitkMemoryUtilities.cpp
-  DataManagement/mitkModeOperation.cpp
-  DataManagement/mitkNodePredicateAND.cpp
-  DataManagement/mitkNodePredicateBase.cpp
-  DataManagement/mitkNodePredicateCompositeBase.cpp
-  DataManagement/mitkNodePredicateData.cpp
-  DataManagement/mitkNodePredicateDataType.cpp
-  DataManagement/mitkNodePredicateDimension.cpp
-  DataManagement/mitkNodePredicateFirstLevel.cpp
-  DataManagement/mitkNodePredicateNOT.cpp
-  DataManagement/mitkNodePredicateOR.cpp
-  DataManagement/mitkNodePredicateProperty.cpp
-  DataManagement/mitkNodePredicateSource.cpp
-  DataManagement/mitkPlaneDecorationProperty.cpp
-  DataManagement/mitkPlaneOperation.cpp
-  DataManagement/mitkPointOperation.cpp
-  DataManagement/mitkPointSet.cpp
-  DataManagement/mitkProperties.cpp
-  DataManagement/mitkPropertyList.cpp
-  DataManagement/mitkRotationOperation.cpp
-  DataManagement/mitkSlicedData.cpp
-  DataManagement/mitkSlicedGeometry3D.cpp
-  DataManagement/mitkSmartPointerProperty.cpp
-  DataManagement/mitkStandaloneDataStorage.cpp
-  DataManagement/mitkStateTransitionOperation.cpp
-  DataManagement/mitkStringProperty.cpp
-  DataManagement/mitkSurface.cpp
-  DataManagement/mitkSurfaceOperation.cpp
-  DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
-  DataManagement/mitkTimeSlicedGeometry.cpp
-  DataManagement/mitkTransferFunction.cpp
-  DataManagement/mitkVector.cpp
-  DataManagement/mitkVtkInterpolationProperty.cpp
-  DataManagement/mitkVtkRepresentationProperty.cpp
-  DataManagement/mitkVtkResliceInterpolationProperty.cpp
-  DataManagement/mitkVtkScalarModeProperty.cpp
-  DataManagement/mitkVtkVolumeRenderingProperty.cpp
-  DataManagement/mitkWeakPointerProperty.cpp
-  DataManagement/mitkXMLIO.cpp
-  Interactions/mitkAction.cpp
-  Interactions/mitkAffineInteractor.cpp
-  Interactions/mitkCoordinateSupplier.cpp
-  Interactions/mitkDisplayCoordinateOperation.cpp
-  Interactions/mitkDisplayInteractor.cpp
-  Interactions/mitkDisplayPositionEvent.cpp
-  Interactions/mitkDisplayVectorInteractor.cpp
-  Interactions/mitkEvent.cpp
-  Interactions/mitkEventDescription.cpp
-  Interactions/mitkEventMapper.cpp
-  Interactions/mitkGlobalInteraction.cpp
-  Interactions/mitkInteractor.cpp
-  Interactions/mitkPointSetInteractor.cpp
-  Interactions/mitkPositionEvent.cpp
-  Interactions/mitkPositionTracker.cpp
-  Interactions/mitkState.cpp
-  Interactions/mitkStateEvent.cpp
-  Interactions/mitkStateMachine.cpp
-  Interactions/mitkStateMachineFactory.cpp
-  Interactions/mitkTransition.cpp
-  IO/mitkBaseDataIOFactory.cpp
-  IO/mitkBaseXMLWriter.cpp
-  IO/mitkFileReader.cpp
-  IO/mitkFileSeriesReader.cpp
-  IO/mitkFileWriter.cpp
-  IO/mitkIpPicGet.c
-  IO/mitkImageWriter.cpp
-  IO/mitkImageWriterFactory.cpp
-  IO/mitkItkImageFileIOFactory.cpp
-  IO/mitkItkImageFileReader.cpp
-  IO/mitkItkImageWrite.cpp
-  IO/mitkLookupTableProperty.cpp
-  IO/mitkMaterialProperty.cpp
-  IO/mitkOperation.cpp
-  IO/mitkPicFileIOFactory.cpp
-  IO/mitkPicFileReader.cpp
-  IO/mitkPicFileWriter.cpp
-  IO/mitkPicHelper.cpp
-  IO/mitkPicVolumeTimeSeriesIOFactory.cpp
-  IO/mitkPicVolumeTimeSeriesReader.cpp
-  IO/mitkPixelType.cpp
-  IO/mitkPlaneGeometry.cpp
-  IO/mitkPointSetIOFactory.cpp
-  IO/mitkPointSetReader.cpp
-  IO/mitkPointSetWriter.cpp
-  IO/mitkPointSetWriterFactory.cpp
-  IO/mitkRawImageFileReader.cpp
-  IO/mitkStandardFileLocations.cpp
-  IO/mitkSTLFileIOFactory.cpp
-  IO/mitkSTLFileReader.cpp
-  IO/mitkSurfaceVtkWriter.cpp
-  IO/mitkSurfaceVtkWriterFactory.cpp
-  IO/mitkVtiFileIOFactory.cpp
-  IO/mitkVtiFileReader.cpp
-  IO/mitkVtkImageIOFactory.cpp
-  IO/mitkVtkImageReader.cpp
-  IO/mitkVtkSurfaceIOFactory.cpp
-  IO/mitkVtkSurfaceReader.cpp
-  IO/mitkXMLReader.cpp
-  IO/mitkXMLWriter.cpp
-  IO/vtkPointSetXMLParser.cpp
-  Rendering/mitkBaseRenderer.cpp
-  Rendering/mitkBaseVtkMapper2D.cpp
-  Rendering/mitkBaseVtkMapper3D.cpp
-  Rendering/mitkColoredRectangleRendering.cpp
-  Rendering/mitkGeometry2DDataMapper2D.cpp
-  Rendering/mitkGeometry2DDataVtkMapper3D.cpp
-  Rendering/mitkGLMapper2D.cpp
-  Rendering/mitkGradientBackground.cpp
-  Rendering/mitkImageMapper2D.cpp
-  Rendering/mitkLogoRendering.cpp
-  Rendering/mitkMapper2D.cpp
-  Rendering/mitkMapper3D.cpp
-  Rendering/mitkMapper.cpp
-  Rendering/mitkPointSetMapper2D.cpp
-  Rendering/mitkPointSetVtkMapper3D.cpp
-  Rendering/mitkPolyDataGLMapper2D.cpp
-  Rendering/mitkSurfaceMapper2D.cpp
-  Rendering/mitkSurfaceVtkMapper3D.cpp
-  Rendering/mitkVolumeDataVtkMapper3D.cpp
-  Rendering/mitkVtkPropRenderer.cpp
-  Rendering/mitkVtkWidgetRendering.cpp
-  Rendering/vtkMitkRectangleProp.cpp
-  Rendering/vtkMitkRenderProp.cpp
-)
-SET(CPP_FILES
-  Algorithms/mitkBaseDataSource.cpp
-  Algorithms/mitkBaseProcess.cpp
-  Algorithms/mitkCoreObjectFactory.cpp
-  Algorithms/mitkDataTreeNodeFactory.cpp
-  Algorithms/mitkDataTreeNodeSource.cpp
-  Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp
-  Algorithms/mitkHistogramGenerator.cpp
-  Algorithms/mitkImageCastPart1.cpp
-  Algorithms/mitkImageCastPart2.cpp
-  Algorithms/mitkImageCastPart3.cpp
-  Algorithms/mitkImageCastPart4.cpp
-  Algorithms/mitkImageChannelSelector.cpp
-  Algorithms/mitkImageSliceSelector.cpp
-  Algorithms/mitkImageSource.cpp
-  Algorithms/mitkImageTimeSelector.cpp
-  Algorithms/mitkImageToImageFilter.cpp
-  Algorithms/mitkPointSetSource.cpp
-  Algorithms/mitkSubImageSelector.cpp
-  Algorithms/mitkSurfaceSource.cpp
-  Algorithms/mitkUIDGenerator.cpp
-  Algorithms/mitkVolumeCalculator.cpp
-  Controllers/mitkBaseController.cpp
-  Controllers/mitkCameraController.cpp
-  Controllers/mitkCameraRotationController.cpp
-  Controllers/mitkFocusManager.cpp
-  Controllers/mitkLimitedLinearUndo.cpp
-  Controllers/mitkOperationEvent.cpp
-  Controllers/mitkRenderingManager.cpp
-  Controllers/mitkSliceNavigationController.cpp
-  Controllers/mitkSlicesCoordinator.cpp
-  Controllers/mitkSlicesRotator.cpp
-  Controllers/mitkSlicesSwiveller.cpp
-  Controllers/mitkStepper.cpp
-  Controllers/mitkTestManager.cpp
-  Controllers/mitkUndoController.cpp
-  Controllers/mitkVerboseLimitedLinearUndo.cpp
-  Controllers/mitkVtkInteractorCameraController.cpp
-  Controllers/mitkVtkLayerController.cpp
-  DataManagement/mitkAbstractTransformGeometry.cpp
-  DataManagement/mitkAnnotationProperty.cpp
-  DataManagement/mitkApplicationCursor.cpp
-  DataManagement/mitkBaseData.cpp
-  DataManagement/mitkBaseProperty.cpp
-  DataManagement/mitkClippingProperty.cpp
-  DataManagement/mitkColorProperty.cpp
-  DataManagement/mitkDataStorage.cpp
-  DataManagement/mitkDataTree.cpp
-  DataManagement/mitkDataTreeNode.cpp
-  DataManagement/mitkDataTreeStorage.cpp
-  DataManagement/mitkDisplayGeometry.cpp
-  DataManagement/mitkEnumerationProperty.cpp
-  DataManagement/mitkGeometry2D.cpp
-  DataManagement/mitkGeometry2DData.cpp
-  DataManagement/mitkGeometry3D.cpp
-  DataManagement/mitkGeometryData.cpp
-  DataManagement/mitkGroupTagProperty.cpp
-  DataManagement/mitkImage.cpp
-  DataManagement/mitkImageDataItem.cpp
-  DataManagement/mitkLandmarkBasedCurvedGeometry.cpp
-  DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
-  DataManagement/mitkLandmarkProjector.cpp
-  DataManagement/mitkLevelWindow.cpp
-  DataManagement/mitkLevelWindowManager.cpp
-  DataManagement/mitkLevelWindowPreset.cpp
-  DataManagement/mitkLevelWindowProperty.cpp
-  DataManagement/mitkLookupTable.cpp
-  DataManagement/mitkMemoryUtilities.cpp
-  DataManagement/mitkModeOperation.cpp
-  DataManagement/mitkNodePredicateAND.cpp
-  DataManagement/mitkNodePredicateBase.cpp
-  DataManagement/mitkNodePredicateCompositeBase.cpp
-  DataManagement/mitkNodePredicateData.cpp
-  DataManagement/mitkNodePredicateDataType.cpp
-  DataManagement/mitkNodePredicateDimension.cpp
-  DataManagement/mitkNodePredicateFirstLevel.cpp
-  DataManagement/mitkNodePredicateNOT.cpp
-  DataManagement/mitkNodePredicateOR.cpp
-  DataManagement/mitkNodePredicateProperty.cpp
-  DataManagement/mitkNodePredicateSource.cpp
-  DataManagement/mitkPlaneDecorationProperty.cpp
-  DataManagement/mitkPlaneOperation.cpp
-  DataManagement/mitkPointOperation.cpp
-  DataManagement/mitkPointSet.cpp
-  DataManagement/mitkProperties.cpp
-  DataManagement/mitkPropertyList.cpp
-  DataManagement/mitkRotationOperation.cpp
-  DataManagement/mitkSlicedData.cpp
-  DataManagement/mitkSlicedGeometry3D.cpp
-  DataManagement/mitkSmartPointerProperty.cpp
-  DataManagement/mitkStandaloneDataStorage.cpp
-  DataManagement/mitkStateTransitionOperation.cpp
-  DataManagement/mitkStringProperty.cpp
-  DataManagement/mitkSurface.cpp
-  DataManagement/mitkSurfaceOperation.cpp
-  DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
-  DataManagement/mitkTimeSlicedGeometry.cpp
-  DataManagement/mitkTransferFunction.cpp
-  DataManagement/mitkVector.cpp
-  DataManagement/mitkVtkInterpolationProperty.cpp
-  DataManagement/mitkVtkRepresentationProperty.cpp
-  DataManagement/mitkVtkResliceInterpolationProperty.cpp
-  DataManagement/mitkVtkScalarModeProperty.cpp
-  DataManagement/mitkVtkVolumeRenderingProperty.cpp
-  DataManagement/mitkWeakPointerProperty.cpp
-  DataManagement/mitkXMLIO.cpp
-  Interactions/mitkAction.cpp
-  Interactions/mitkAffineInteractor.cpp
-  Interactions/mitkCoordinateSupplier.cpp
-  Interactions/mitkDisplayCoordinateOperation.cpp
-  Interactions/mitkDisplayInteractor.cpp
-  Interactions/mitkDisplayPositionEvent.cpp
-  Interactions/mitkDisplayVectorInteractor.cpp
-  Interactions/mitkEvent.cpp
-  Interactions/mitkEventDescription.cpp
-  Interactions/mitkEventMapper.cpp
-  Interactions/mitkGlobalInteraction.cpp
-  Interactions/mitkInteractor.cpp
-  Interactions/mitkPointSetInteractor.cpp
-  Interactions/mitkPositionEvent.cpp
-  Interactions/mitkPositionTracker.cpp
-  Interactions/mitkState.cpp
-  Interactions/mitkStateEvent.cpp
-  Interactions/mitkStateMachine.cpp
-  Interactions/mitkStateMachineFactory.cpp
-  Interactions/mitkTransition.cpp
-  IO/mitkBaseDataIOFactory.cpp
-  IO/mitkBaseXMLWriter.cpp
-  IO/mitkFileReader.cpp
-  IO/mitkFileSeriesReader.cpp
-  IO/mitkFileWriter.cpp
-  IO/mitkIpPicGet.c
-  IO/mitkImageWriter.cpp
-  IO/mitkImageWriterFactory.cpp
-  IO/mitkItkImageFileIOFactory.cpp
-  IO/mitkItkImageFileReader.cpp
-  IO/mitkItkImageWrite.cpp
-  IO/mitkLookupTableProperty.cpp
-  IO/mitkMaterialProperty.cpp
-  IO/mitkOperation.cpp
-  IO/mitkPicFileIOFactory.cpp
-  IO/mitkPicFileReader.cpp
-  IO/mitkPicFileWriter.cpp
-  IO/mitkPicHelper.cpp
-  IO/mitkPicVolumeTimeSeriesIOFactory.cpp
-  IO/mitkPicVolumeTimeSeriesReader.cpp
-  IO/mitkPixelType.cpp
-  IO/mitkPlaneGeometry.cpp
-  IO/mitkPointSetIOFactory.cpp
-  IO/mitkPointSetReader.cpp
-  IO/mitkPointSetWriter.cpp
-  IO/mitkPointSetWriterFactory.cpp
-  IO/mitkRawImageFileReader.cpp
-  IO/mitkStandardFileLocations.cpp
-  IO/mitkSTLFileIOFactory.cpp
-  IO/mitkSTLFileReader.cpp
-  IO/mitkSurfaceVtkWriter.cpp
-  IO/mitkSurfaceVtkWriterFactory.cpp
-  IO/mitkVtiFileIOFactory.cpp
-  IO/mitkVtiFileReader.cpp
-  IO/mitkVtkImageIOFactory.cpp
-  IO/mitkVtkImageReader.cpp
-  IO/mitkVtkSurfaceIOFactory.cpp
-  IO/mitkVtkSurfaceReader.cpp
-  IO/mitkXMLReader.cpp
-  IO/mitkXMLWriter.cpp
-  IO/vtkPointSetXMLParser.cpp
-  Rendering/mitkBaseRenderer.cpp
-  Rendering/mitkBaseVtkMapper2D.cpp
-  Rendering/mitkBaseVtkMapper3D.cpp
-  Rendering/mitkColoredRectangleRendering.cpp
-  Rendering/mitkGeometry2DDataMapper2D.cpp
-  Rendering/mitkGeometry2DDataVtkMapper3D.cpp
-  Rendering/mitkGLMapper2D.cpp
-  Rendering/mitkGradientBackground.cpp
-  Rendering/mitkImageMapper2D.cpp
-  Rendering/mitkLogoRendering.cpp
-  Rendering/mitkMapper2D.cpp
-  Rendering/mitkMapper3D.cpp
-  Rendering/mitkMapper.cpp
-  Rendering/mitkPointSetMapper2D.cpp
-  Rendering/mitkPointSetVtkMapper3D.cpp
-  Rendering/mitkPolyDataGLMapper2D.cpp
-  Rendering/mitkSurfaceMapper2D.cpp
-  Rendering/mitkSurfaceVtkMapper3D.cpp
-  Rendering/mitkVolumeDataVtkMapper3D.cpp
-  Rendering/mitkVtkPropRenderer.cpp
-  Rendering/mitkVtkWidgetRendering.cpp
-  Rendering/vtkMitkRectangleProp.cpp
-  Rendering/vtkMitkRenderProp.cpp
-)
-SET(CPP_FILES
-  Algorithms/mitkBaseDataSource.cpp
-  Algorithms/mitkBaseProcess.cpp
-  Algorithms/mitkCoreObjectFactory.cpp
-  Algorithms/mitkDataTreeNodeFactory.cpp
-  Algorithms/mitkDataTreeNodeSource.cpp
-  Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp
-  Algorithms/mitkHistogramGenerator.cpp
-  Algorithms/mitkImageCastPart1.cpp
-  Algorithms/mitkImageCastPart2.cpp
-  Algorithms/mitkImageCastPart3.cpp
-  Algorithms/mitkImageCastPart4.cpp
-  Algorithms/mitkImageChannelSelector.cpp
-  Algorithms/mitkImageSliceSelector.cpp
-  Algorithms/mitkImageSource.cpp
-  Algorithms/mitkImageTimeSelector.cpp
-  Algorithms/mitkImageToImageFilter.cpp
-  Algorithms/mitkPointSetSource.cpp
-  Algorithms/mitkSubImageSelector.cpp
-  Algorithms/mitkSurfaceSource.cpp
-  Algorithms/mitkUIDGenerator.cpp
-  Algorithms/mitkVolumeCalculator.cpp
-  Controllers/mitkBaseController.cpp
-  Controllers/mitkCameraController.cpp
-  Controllers/mitkCameraRotationController.cpp
-  Controllers/mitkFocusManager.cpp
-  Controllers/mitkLimitedLinearUndo.cpp
-  Controllers/mitkOperationEvent.cpp
-  Controllers/mitkRenderingManager.cpp
-  Controllers/mitkSliceNavigationController.cpp
-  Controllers/mitkSlicesCoordinator.cpp
-  Controllers/mitkSlicesRotator.cpp
-  Controllers/mitkSlicesSwiveller.cpp
-  Controllers/mitkStepper.cpp
-  Controllers/mitkTestManager.cpp
-  Controllers/mitkUndoController.cpp
-  Controllers/mitkVerboseLimitedLinearUndo.cpp
-  Controllers/mitkVtkInteractorCameraController.cpp
-  Controllers/mitkVtkLayerController.cpp
-  DataManagement/mitkAbstractTransformGeometry.cpp
-  DataManagement/mitkAnnotationProperty.cpp
-  DataManagement/mitkApplicationCursor.cpp
-  DataManagement/mitkBaseData.cpp
-  DataManagement/mitkBaseProperty.cpp
-  DataManagement/mitkClippingProperty.cpp
-  DataManagement/mitkColorProperty.cpp
-  DataManagement/mitkDataStorage.cpp
-  DataManagement/mitkDataTree.cpp
-  DataManagement/mitkDataTreeNode.cpp
-  DataManagement/mitkDataTreeStorage.cpp
-  DataManagement/mitkDisplayGeometry.cpp
-  DataManagement/mitkEnumerationProperty.cpp
-  DataManagement/mitkGeometry2D.cpp
-  DataManagement/mitkGeometry2DData.cpp
-  DataManagement/mitkGeometry3D.cpp
-  DataManagement/mitkGeometryData.cpp
-  DataManagement/mitkGroupTagProperty.cpp
-  DataManagement/mitkImage.cpp
-  DataManagement/mitkImageDataItem.cpp
-  DataManagement/mitkLandmarkBasedCurvedGeometry.cpp
-  DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
-  DataManagement/mitkLandmarkProjector.cpp
-  DataManagement/mitkLevelWindow.cpp
-  DataManagement/mitkLevelWindowManager.cpp
-  DataManagement/mitkLevelWindowPreset.cpp
-  DataManagement/mitkLevelWindowProperty.cpp
-  DataManagement/mitkLookupTable.cpp
-  DataManagement/mitkMemoryUtilities.cpp
-  DataManagement/mitkModeOperation.cpp
-  DataManagement/mitkNodePredicateAND.cpp
-  DataManagement/mitkNodePredicateBase.cpp
-  DataManagement/mitkNodePredicateCompositeBase.cpp
-  DataManagement/mitkNodePredicateData.cpp
-  DataManagement/mitkNodePredicateDataType.cpp
-  DataManagement/mitkNodePredicateDimension.cpp
-  DataManagement/mitkNodePredicateFirstLevel.cpp
-  DataManagement/mitkNodePredicateNOT.cpp
-  DataManagement/mitkNodePredicateOR.cpp
-  DataManagement/mitkNodePredicateProperty.cpp
-  DataManagement/mitkNodePredicateSource.cpp
-  DataManagement/mitkPlaneDecorationProperty.cpp
-  DataManagement/mitkPlaneOperation.cpp
-  DataManagement/mitkPointOperation.cpp
-  DataManagement/mitkPointSet.cpp
-  DataManagement/mitkProperties.cpp
-  DataManagement/mitkPropertyList.cpp
-  DataManagement/mitkRotationOperation.cpp
-  DataManagement/mitkSlicedData.cpp
-  DataManagement/mitkSlicedGeometry3D.cpp
-  DataManagement/mitkSmartPointerProperty.cpp
-  DataManagement/mitkStandaloneDataStorage.cpp
-  DataManagement/mitkStateTransitionOperation.cpp
-  DataManagement/mitkStringProperty.cpp
-  DataManagement/mitkSurface.cpp
-  DataManagement/mitkSurfaceOperation.cpp
-  DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
-  DataManagement/mitkTimeSlicedGeometry.cpp
-  DataManagement/mitkTransferFunction.cpp
-  DataManagement/mitkVector.cpp
-  DataManagement/mitkVtkInterpolationProperty.cpp
-  DataManagement/mitkVtkRepresentationProperty.cpp
-  DataManagement/mitkVtkResliceInterpolationProperty.cpp
-  DataManagement/mitkVtkScalarModeProperty.cpp
-  DataManagement/mitkVtkVolumeRenderingProperty.cpp
-  DataManagement/mitkWeakPointerProperty.cpp
-  DataManagement/mitkXMLIO.cpp
-  Interactions/mitkAction.cpp
-  Interactions/mitkAffineInteractor.cpp
-  Interactions/mitkCoordinateSupplier.cpp
-  Interactions/mitkDisplayCoordinateOperation.cpp
-  Interactions/mitkDisplayInteractor.cpp
-  Interactions/mitkDisplayPositionEvent.cpp
-  Interactions/mitkDisplayVectorInteractor.cpp
-  Interactions/mitkEvent.cpp
-  Interactions/mitkEventDescription.cpp
-  Interactions/mitkEventMapper.cpp
-  Interactions/mitkGlobalInteraction.cpp
-  Interactions/mitkInteractor.cpp
-  Interactions/mitkPointSetInteractor.cpp
-  Interactions/mitkPositionEvent.cpp
-  Interactions/mitkPositionTracker.cpp
-  Interactions/mitkState.cpp
-  Interactions/mitkStateEvent.cpp
-  Interactions/mitkStateMachine.cpp
-  Interactions/mitkStateMachineFactory.cpp
-  Interactions/mitkTransition.cpp
-  IO/mitkBaseDataIOFactory.cpp
-  IO/mitkBaseXMLWriter.cpp
-  IO/mitkFileReader.cpp
-  IO/mitkFileSeriesReader.cpp
-  IO/mitkFileWriter.cpp
-  IO/mitkIpPicGet.c
-  IO/mitkImageWriter.cpp
-  IO/mitkImageWriterFactory.cpp
-  IO/mitkItkImageFileIOFactory.cpp
-  IO/mitkItkImageFileReader.cpp
-  IO/mitkItkImageWrite.cpp
-  IO/mitkLookupTableProperty.cpp
-  IO/mitkMaterialProperty.cpp
-  IO/mitkOperation.cpp
-  IO/mitkPicFileIOFactory.cpp
-  IO/mitkPicFileReader.cpp
-  IO/mitkPicFileWriter.cpp
-  IO/mitkPicHelper.cpp
-  IO/mitkPicVolumeTimeSeriesIOFactory.cpp
-  IO/mitkPicVolumeTimeSeriesReader.cpp
-  IO/mitkPixelType.cpp
-  IO/mitkPlaneGeometry.cpp
-  IO/mitkPointSetIOFactory.cpp
-  IO/mitkPointSetReader.cpp
-  IO/mitkPointSetWriter.cpp
-  IO/mitkPointSetWriterFactory.cpp
-  IO/mitkRawImageFileReader.cpp
-  IO/mitkStandardFileLocations.cpp
-  IO/mitkSTLFileIOFactory.cpp
-  IO/mitkSTLFileReader.cpp
-  IO/mitkSurfaceVtkWriter.cpp
-  IO/mitkSurfaceVtkWriterFactory.cpp
-  IO/mitkVtiFileIOFactory.cpp
-  IO/mitkVtiFileReader.cpp
-  IO/mitkVtkImageIOFactory.cpp
-  IO/mitkVtkImageReader.cpp
-  IO/mitkVtkSurfaceIOFactory.cpp
-  IO/mitkVtkSurfaceReader.cpp
-  IO/mitkXMLReader.cpp
-  IO/mitkXMLWriter.cpp
-  IO/vtkPointSetXMLParser.cpp
-  Rendering/mitkBaseRenderer.cpp
-  Rendering/mitkBaseVtkMapper2D.cpp
-  Rendering/mitkBaseVtkMapper3D.cpp
-  Rendering/mitkColoredRectangleRendering.cpp
-  Rendering/mitkGeometry2DDataMapper2D.cpp
-  Rendering/mitkGeometry2DDataVtkMapper3D.cpp
-  Rendering/mitkGLMapper2D.cpp
-  Rendering/mitkGradientBackground.cpp
-  Rendering/mitkImageMapper2D.cpp
-  Rendering/mitkLogoRendering.cpp
-  Rendering/mitkMapper2D.cpp
-  Rendering/mitkMapper3D.cpp
-  Rendering/mitkMapper.cpp
-  Rendering/mitkPointSetMapper2D.cpp
-  Rendering/mitkPointSetVtkMapper3D.cpp
-  Rendering/mitkPolyDataGLMapper2D.cpp
-  Rendering/mitkSurfaceMapper2D.cpp
-  Rendering/mitkSurfaceVtkMapper3D.cpp
-  Rendering/mitkVolumeDataVtkMapper3D.cpp
-  Rendering/mitkVtkPropRenderer.cpp
-  Rendering/mitkVtkWidgetRendering.cpp
-  Rendering/vtkMitkRectangleProp.cpp
-  Rendering/vtkMitkRenderProp.cpp
-)
-SET(CPP_FILES
-  Algorithms/mitkBaseDataSource.cpp
-  Algorithms/mitkBaseProcess.cpp
-  Algorithms/mitkCoreObjectFactory.cpp
-  Algorithms/mitkDataTreeNodeFactory.cpp
-  Algorithms/mitkDataTreeNodeSource.cpp
-  Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp
-  Algorithms/mitkHistogramGenerator.cpp
-  Algorithms/mitkImageCastPart1.cpp
-  Algorithms/mitkImageCastPart2.cpp
-  Algorithms/mitkImageCastPart3.cpp
-  Algorithms/mitkImageCastPart4.cpp
-  Algorithms/mitkImageChannelSelector.cpp
-  Algorithms/mitkImageSliceSelector.cpp
-  Algorithms/mitkImageSource.cpp
-  Algorithms/mitkImageTimeSelector.cpp
-  Algorithms/mitkImageToImageFilter.cpp
-  Algorithms/mitkPointSetSource.cpp
-  Algorithms/mitkSubImageSelector.cpp
-  Algorithms/mitkSurfaceSource.cpp
-  Algorithms/mitkUIDGenerator.cpp
-  Algorithms/mitkVolumeCalculator.cpp
-  Controllers/mitkBaseController.cpp
-  Controllers/mitkCameraController.cpp
-  Controllers/mitkCameraRotationController.cpp
-  Controllers/mitkFocusManager.cpp
-  Controllers/mitkLimitedLinearUndo.cpp
-  Controllers/mitkOperationEvent.cpp
-  Controllers/mitkRenderingManager.cpp
-  Controllers/mitkSliceNavigationController.cpp
-  Controllers/mitkSlicesCoordinator.cpp
-  Controllers/mitkSlicesRotator.cpp
-  Controllers/mitkSlicesSwiveller.cpp
-  Controllers/mitkStepper.cpp
-  Controllers/mitkTestManager.cpp
-  Controllers/mitkUndoController.cpp
-  Controllers/mitkVerboseLimitedLinearUndo.cpp
-  Controllers/mitkVtkInteractorCameraController.cpp
-  Controllers/mitkVtkLayerController.cpp
-  DataManagement/mitkAbstractTransformGeometry.cpp
-  DataManagement/mitkAnnotationProperty.cpp
-  DataManagement/mitkApplicationCursor.cpp
-  DataManagement/mitkBaseData.cpp
-  DataManagement/mitkBaseProperty.cpp
-  DataManagement/mitkClippingProperty.cpp
-  DataManagement/mitkColorProperty.cpp
-  DataManagement/mitkDataStorage.cpp
-  DataManagement/mitkDataTree.cpp
-  DataManagement/mitkDataTreeNode.cpp
-  DataManagement/mitkDataTreeStorage.cpp
-  DataManagement/mitkDisplayGeometry.cpp
-  DataManagement/mitkEnumerationProperty.cpp
-  DataManagement/mitkGeometry2D.cpp
-  DataManagement/mitkGeometry2DData.cpp
-  DataManagement/mitkGeometry3D.cpp
-  DataManagement/mitkGeometryData.cpp
-  DataManagement/mitkGroupTagProperty.cpp
-  DataManagement/mitkImage.cpp
-  DataManagement/mitkImageDataItem.cpp
-  DataManagement/mitkLandmarkBasedCurvedGeometry.cpp
-  DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
-  DataManagement/mitkLandmarkProjector.cpp
-  DataManagement/mitkLevelWindow.cpp
-  DataManagement/mitkLevelWindowManager.cpp
-  DataManagement/mitkLevelWindowPreset.cpp
-  DataManagement/mitkLevelWindowProperty.cpp
-  DataManagement/mitkLookupTable.cpp
-  DataManagement/mitkMemoryUtilities.cpp
-  DataManagement/mitkModeOperation.cpp
-  DataManagement/mitkNodePredicateAND.cpp
-  DataManagement/mitkNodePredicateBase.cpp
-  DataManagement/mitkNodePredicateCompositeBase.cpp
-  DataManagement/mitkNodePredicateData.cpp
-  DataManagement/mitkNodePredicateDataType.cpp
-  DataManagement/mitkNodePredicateDimension.cpp
-  DataManagement/mitkNodePredicateFirstLevel.cpp
-  DataManagement/mitkNodePredicateNOT.cpp
-  DataManagement/mitkNodePredicateOR.cpp
-  DataManagement/mitkNodePredicateProperty.cpp
-  DataManagement/mitkNodePredicateSource.cpp
-  DataManagement/mitkPlaneDecorationProperty.cpp
-  DataManagement/mitkPlaneOperation.cpp
-  DataManagement/mitkPointOperation.cpp
-  DataManagement/mitkPointSet.cpp
-  DataManagement/mitkProperties.cpp
-  DataManagement/mitkPropertyList.cpp
-  DataManagement/mitkRotationOperation.cpp
-  DataManagement/mitkSlicedData.cpp
-  DataManagement/mitkSlicedGeometry3D.cpp
-  DataManagement/mitkSmartPointerProperty.cpp
-  DataManagement/mitkStandaloneDataStorage.cpp
-  DataManagement/mitkStateTransitionOperation.cpp
-  DataManagement/mitkStringProperty.cpp
-  DataManagement/mitkSurface.cpp
-  DataManagement/mitkSurfaceOperation.cpp
-  DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
-  DataManagement/mitkTimeSlicedGeometry.cpp
-  DataManagement/mitkTransferFunction.cpp
-  DataManagement/mitkVector.cpp
-  DataManagement/mitkVtkInterpolationProperty.cpp
-  DataManagement/mitkVtkRepresentationProperty.cpp
-  DataManagement/mitkVtkResliceInterpolationProperty.cpp
-  DataManagement/mitkVtkScalarModeProperty.cpp
-  DataManagement/mitkVtkVolumeRenderingProperty.cpp
-  DataManagement/mitkWeakPointerProperty.cpp
-  DataManagement/mitkXMLIO.cpp
-  Interactions/mitkAction.cpp
-  Interactions/mitkAffineInteractor.cpp
-  Interactions/mitkCoordinateSupplier.cpp
-  Interactions/mitkDisplayCoordinateOperation.cpp
-  Interactions/mitkDisplayInteractor.cpp
-  Interactions/mitkDisplayPositionEvent.cpp
-  Interactions/mitkDisplayVectorInteractor.cpp
-  Interactions/mitkEvent.cpp
-  Interactions/mitkEventDescription.cpp
-  Interactions/mitkEventMapper.cpp
-  Interactions/mitkGlobalInteraction.cpp
-  Interactions/mitkInteractor.cpp
-  Interactions/mitkPointSetInteractor.cpp
-  Interactions/mitkPositionEvent.cpp
-  Interactions/mitkPositionTracker.cpp
-  Interactions/mitkState.cpp
-  Interactions/mitkStateEvent.cpp
-  Interactions/mitkStateMachine.cpp
-  Interactions/mitkStateMachineFactory.cpp
-  Interactions/mitkTransition.cpp
-  IO/mitkBaseDataIOFactory.cpp
-  IO/mitkBaseXMLWriter.cpp
-  IO/mitkFileReader.cpp
-  IO/mitkFileSeriesReader.cpp
-  IO/mitkFileWriter.cpp
-  IO/mitkIpPicGet.c
-  IO/mitkImageWriter.cpp
-  IO/mitkImageWriterFactory.cpp
-  IO/mitkItkImageFileIOFactory.cpp
-  IO/mitkItkImageFileReader.cpp
-  IO/mitkItkImageWrite.cpp
-  IO/mitkLookupTableProperty.cpp
-  IO/mitkMaterialProperty.cpp
-  IO/mitkOperation.cpp
-  IO/mitkPicFileIOFactory.cpp
-  IO/mitkPicFileReader.cpp
-  IO/mitkPicFileWriter.cpp
-  IO/mitkPicHelper.cpp
-  IO/mitkPicVolumeTimeSeriesIOFactory.cpp
-  IO/mitkPicVolumeTimeSeriesReader.cpp
-  IO/mitkPixelType.cpp
-  IO/mitkPlaneGeometry.cpp
-  IO/mitkPointSetIOFactory.cpp
-  IO/mitkPointSetReader.cpp
-  IO/mitkPointSetWriter.cpp
-  IO/mitkPointSetWriterFactory.cpp
-  IO/mitkRawImageFileReader.cpp
-  IO/mitkStandardFileLocations.cpp
-  IO/mitkSTLFileIOFactory.cpp
-  IO/mitkSTLFileReader.cpp
-  IO/mitkSurfaceVtkWriter.cpp
-  IO/mitkSurfaceVtkWriterFactory.cpp
-  IO/mitkVtiFileIOFactory.cpp
-  IO/mitkVtiFileReader.cpp
-  IO/mitkVtkImageIOFactory.cpp
-  IO/mitkVtkImageReader.cpp
-  IO/mitkVtkSurfaceIOFactory.cpp
-  IO/mitkVtkSurfaceReader.cpp
-  IO/mitkXMLReader.cpp
-  IO/mitkXMLWriter.cpp
-  IO/vtkPointSetXMLParser.cpp
-  Rendering/mitkBaseRenderer.cpp
-  Rendering/mitkBaseVtkMapper2D.cpp
-  Rendering/mitkBaseVtkMapper3D.cpp
-  Rendering/mitkColoredRectangleRendering.cpp
-  Rendering/mitkGeometry2DDataMapper2D.cpp
-  Rendering/mitkGeometry2DDataVtkMapper3D.cpp
-  Rendering/mitkGLMapper2D.cpp
-  Rendering/mitkGradientBackground.cpp
-  Rendering/mitkImageMapper2D.cpp
-  Rendering/mitkLogoRendering.cpp
-  Rendering/mitkMapper2D.cpp
-  Rendering/mitkMapper3D.cpp
-  Rendering/mitkMapper.cpp
-  Rendering/mitkPointSetMapper2D.cpp
-  Rendering/mitkPointSetVtkMapper3D.cpp
-  Rendering/mitkPolyDataGLMapper2D.cpp
-  Rendering/mitkSurfaceMapper2D.cpp
-  Rendering/mitkSurfaceVtkMapper3D.cpp
-  Rendering/mitkVolumeDataVtkMapper3D.cpp
-  Rendering/mitkVtkPropRenderer.cpp
-  Rendering/mitkVtkWidgetRendering.cpp
-  Rendering/vtkMitkRectangleProp.cpp
-  Rendering/vtkMitkRenderProp.cpp
-)
+


Working ctest configure: no option

Working ctest configure: no option

--- CI/main_ci.cmake
+++ CI/main_ci.cmake
@@ -1,15 +1,54 @@
 # This script is a prototype for the futur CI
-SET( ENV{LANG} "C" ) # Only ascii output
+set (ENV{LANG} "C") # Only ascii output
+# Create build directory
+file (MAKE_DIRECTORY /opt/otb/build/)

-SET (CTEST_SOURCE_DIRECTORY "/opt/otb/")
-SET (CTEST_BINARY_DIRECTORY "/opt/otb/build/")
+#Ctest setting
+set (CTEST_BUILD_CONFIGURATION "Release")
+set (CTEST_SOURCE_DIRECTORY "/opt/otb/")
+set (CTEST_BINARY_DIRECTORY "/opt/otb/build/")

-SET (DATA_ROOT_DIR "/opt/otb/otb-data/") # todo
+set (CTEST_CONFIGURE_COMMAND "cmake" )
+set (CTEST_BUILD_COMMAND "make")
+
+set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
+set (CTEST_BUILD_NAME "CI_TEST")
+

 ctest_start("Nightly")

 # ctest_update() no need to update it is done by Gitlab-CI

-ctest_configure()
-ctest_build()
-ctest_test()+set (DATA_ROOT_DIR "/opt/otb/otb-data/") # todo
+set(otb_configure_option
+"
+OTB_USE_OPENGL:BOOL=OFF
+OTB_USE_GLEW:BOOL=OFF
+OTB_USE_GLFW:BOOL=OFF
+OTB_USE_GLUT:BOOL=OFF
+OTB_USE_QT:BOOL=OFF
+OTB_USE_QWT:BOOL=OFF
+OTB_USE_6S:BOOL=OFF
+OTB_USE_CURL:BOOL=OFF
+OTB_USE_OPENCV:BOOL=OFF
+OTB_USE_LIBSVM:BOOL=OFF
+OTB_USE_MUPARSER:BOOL=OFF
+OTB_USE_MUPARSERX:BOOL=OFF
+OTB_WRAP_PYTHON:BOOL=OFF
+OTB_WRAP_PYTHON3:BOOL=OFF
+OTB_WRAP_JAVA:BOOL=OFF
+OTB_USE_SHARK:BOOL=OFF
+OTB_USE_OPENMP:BOOL=OFF
+BUILD_TESTING:BOOL=OFF
+")
+
+ctest_configure(OPTIONS "${CONFIGURE_OPTIONS}"
+    RETURN_VALUE _configure_rv)
+
+if ( _configure_rv EQUAL -1 )
+  message("An error occurs during ctest_configure ${_configure_rv}")
+endif()
+message("${_configure_rv}")
+
+# ctest_build()
+# ctest_test()


CI: enable testing

CI: enable testing

--- CI/main_ci.cmake
+++ CI/main_ci.cmake
@@ -39,7 +39,6 @@
 set (CMAKE_COMMAND "cmake")

 # Data directory setting
-set (OTB_DATA_ROOT "${OTB_SOURCE_DIR}/otb-data/") # todo
 set (OTB_LARGEINPUT_ROOT "") # todo

@@ -74,6 +73,6 @@
   message( SEND_ERROR "An error occurs during ctest_build.")
 endif()

-# ctest_test(PARALLEL_LEVEL 8)
+ctest_test(PARALLEL_LEVEL 8)

 ctest_submit()


Fix quiet for FindNumPy

Fix quiet for FindNumPy

--- FindNumPy.cmake
+++ FindNumPy.cmake
@@ -1,6 +1,6 @@
 # Find the Python NumPy package
 # PYTHON_NUMPY_INCLUDE_DIR
-# NUMPY_FOUND
+# NUMPY_FOUND
 # will be set by this script

 cmake_minimum_required(VERSION 2.6)
@@ -14,9 +14,9 @@

 if (PYTHON_EXECUTABLE)
   # write a python script that finds the numpy path
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/FindNumpyPath.py
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/FindNumpyPath.py
       "try: import numpy; print numpy.get_include()\nexcept:pass\n")
-
+
   # execute the find script
   exec_program("${PYTHON_EXECUTABLE}" ${CMAKE_CURRENT_BINARY_DIR}
     ARGS "FindNumpyPath.py"
@@ -38,4 +38,4 @@
 endif(PYTHON_NUMPY_INCLUDE_DIR)

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Numpy DEFAULT_MSG PYTHON_NUMPY_INCLUDE_DIR)
+find_package_handle_standard_args(NumPy DEFAULT_MSG PYTHON_NUMPY_INCLUDE_DIR)


Endorse marble/class.h #includes (instead of simple class.h) BUG: 282865 REVIEW: 103656

--- FindMarble.cmake
+++ FindMarble.cmake
@@ -1,4 +1,4 @@
- # - Try to find the Marble Library
+# - Try to find the Marble Library
 # Once done this will define
 #
 #  MARBLE_FOUND - system has Marble
@@ -8,20 +8,13 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #

-
-if ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
+IF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
    # in cache already
    SET( MARBLE_FIND_QUIETLY TRUE )
-endif ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
+ENDIF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )

-FIND_PATH( MARBLE_INCLUDE_DIR NAMES MarbleMap.h PATH_SUFFIXES marble
-)
-
+FIND_PATH( MARBLE_INCLUDE_DIR NAMES marble/MarbleModel.h )
 FIND_LIBRARY( MARBLE_LIBRARIES NAMES marblewidget )

-
-include( FindPackageHandleStandardArgs )
+INCLUDE( FindPackageHandleStandardArgs )
 FIND_PACKAGE_HANDLE_STANDARD_ARGS( marble DEFAULT_MSG MARBLE_INCLUDE_DIR MARBLE_LIBRARIES )
-
-
-


changed path to find library

changed path to find library

--- FindQuaZip.cmake
+++ FindQuaZip.cmake
@@ -1,6 +1,6 @@
 find_package(Qt4)
 find_path(QuaZip_INCLUDE_DIR quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QuaZIP_SOURCE_DIR}/include/quazip ${QuaZIP_SOURCE_DIR}/quazip ${QuaZIP_SOURCE_DIR}/include)
-find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QuaZIP_DIR}/lib64 ${QuaZIP_DIR}/lib ${QuaZIP_DIR}/quazip/Debug ${QuaZIP_DIR}/quazip/Relase ${QuaZIP_DIR})
+find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QuaZIP_DIR}/lib64 ${QuaZIP_DIR}/lib ${QuaZIP_DIR}/quazip/Debug ${QuaZIP_DIR}/quazip/Release ${QuaZIP_DIR})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(quazip DEFAULT_MSG QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
 set(QuaZip_LIBRARIES ${QuaZip_LIBRARY})


[t:4814] don't error on __libc_freeres with valgrind

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

--- DartConfig.cmake
+++ DartConfig.cmake
@@ -1,4 +1,4 @@
 if(BUILD_TESTING)
-  set(MEMORYCHECK_COMMAND_OPTIONS "--gen-suppressions=no --num-callers=20 --leak-check=full --show-reachable=yes --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown" CACHE INTERNAL "options for valgrind")
+  set(MEMORYCHECK_COMMAND_OPTIONS "--gen-suppressions=no --num-callers=20 --leak-check=full --show-reachable=yes --run-libc-freeres=no --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown" CACHE INTERNAL "options for valgrind")
   set(MEMORYCHECK_SUPPRESSIONS_FILE "${CMAKE_CURRENT_BINARY_DIR}/valgrind.suppressions" CACHE INTERNAL "suppressions file for valgrind")
 endif()


psq_check_and_report_tool_version already prints the version number.

There's no need to print it again.

--- FindVeraPP.cmake
+++ FindVeraPP.cmake
@@ -93,7 +93,7 @@
     endif (VERAPP_EXECUTABLE)

     psq_check_and_report_tool_version (VeraPP
-                                       "${CLANG_TIDY_VERSION}"
+                                       "${VERAPP_VERSION}"
                                        REQUIRED_VARS
                                        VERAPP_EXECUTABLE
                                        VERAPP_VERSION
@@ -101,13 +101,6 @@
                                        VERAPP_RULES
                                        VERAPP_PROFILES)

-    psq_print_if_not_quiet (VeraPP
-                            MSG "VeraPP version"
-                                "${VERAPP_VERSION} found at"
-                                "${VERAPP_EXECUTABLE}"
-                            DEPENDS VERAPP_EXECUTABLE
-                                    VERAPP_VERSION)
-
     set (VeraPP_FOUND ${VeraPP_FOUND} PARENT_SCOPE)

 endfunction (_find_verapp)


specify libxml2 include dir for mlpack

specify libxml2 include dir for mlpack

--- mlpack.cmake
+++ mlpack.cmake
@@ -36,6 +36,7 @@
         -DBUILD_SHARED_LIBS=ON
         -DCMAKE_INSTALL_PREFIX=${BUILDEM_DIR}
         -DCMAKE_PREFIX_PATH=${BUILDEM_DIR}
+        -DLIBXML2_INCLUDE_DIR=${BUILDEM_DIR}/include/libxml2

     BUILD_COMMAND       ${BUILDEM_ENV_STRING} make


COMP: Warn about VisualStudio parallel build issues.

Warn during CMake configuration that VisualStudio 10 currently has
issues building ITK with BUILD_EXAMPLES and BUILD_TESTING turned on.  It
cannot handle the number of projects when built in parallel.  Give
suggested courses of action.

Change-Id: I9fc80eb5f390e8173575439b2a695cffe58e0e1e

--- CMake/ITKSetStandardCompilerFlags.cmake
+++ CMake/ITKSetStandardCompilerFlags.cmake
@@ -276,6 +276,20 @@
     CHECK_CXX_SOURCE_COMPILES(${ITK_CXX_DISABLE_OPTIMIZATION_FLAG} CXX_HAS_DISABLE_OPTIMIZATION_FLAG)
   endif()

+  #-----------------------------------------------------------------------------
+  # Warn about hanging in VisualStudio 10.
+  if(CMAKE_GENERATOR MATCHES "^Visual Studio 1.*"
+        AND BUILD_TESTING AND BUILD_EXAMPLES)
+      message(WARNING "${CMAKE_GENERATOR} is known to hang with BUILD_TESTING AND BUILD_EXAMPLES ON.
+Current workarounds to
+- turn off parallel project builds with
+    Set Tools>Options>Projects and Solutions>Build and Run>Maximum number of parallel project builds = 1.
+
+- turn BUILD_TESTING or BUILD_EXAMPLES off.
+
+- use NMake or JOM as detailed here:
+    http://www.itk.org/Wiki/ITK/Compilers")
+  endif()
   #----------------------------------------------------------------------------
   # Allowing GNU extensions with CLang throws a zillion warnings in vnl_math.h
   # which has (optionally) in-class const float member variable initialization


Ensure the CMAKE_OSX_DEPLOYMENT_TARGET is set to empty for iOS build. Fix #1628.

--- CMake/Modules/Urho3D-CMake-common.cmake
+++ CMake/Modules/Urho3D-CMake-common.cmake
@@ -63,12 +63,9 @@
         set (CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${IPHONEOS_DEPLOYMENT_TARGET})
     endif ()
     set (CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
-    if (DEFINED ENV{TRAVIS})
-        # TODO: recheck this again and remove this workaround later
-        # Ensure the CMAKE_OSX_DEPLOYMENT_TARGET is set to empty, something is wrong with Travis-CI OSX CI environment at the moment
-        set (CMAKE_OSX_DEPLOYMENT_TARGET)
-        unset (CMAKE_OSX_DEPLOYMENT_TARGET CACHE)
-    endif ()
+    # Workaround what appears to be a bug in CMake/Xcode generator, ensure the CMAKE_OSX_DEPLOYMENT_TARGET is set to empty for iOS build
+    set (CMAKE_OSX_DEPLOYMENT_TARGET)
+    unset (CMAKE_OSX_DEPLOYMENT_TARGET CACHE)
 elseif (XCODE)
     set (CMAKE_OSX_SYSROOT macosx)    # Set Base SDK to "Latest OS X"
     if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)


Fixed patch string because "SET" changed to "set".

--- CMakeExternals/PatchGDCM-20130814.cmake
+++ CMakeExternals/PatchGDCM-20130814.cmake
@@ -14,8 +14,8 @@

 # fix issues with whitespace in source directories
 file(STRINGS CMake/ExportConfiguration/GDCMConfig.cmake.in sourceCode NEWLINE_CONSUME)
-string(REPLACE "SET( GDCM_INCLUDE_DIRS @GDCM_INCLUDE_PATH@)" "SET( GDCM_INCLUDE_DIRS \"@GDCM_INCLUDE_PATH@\")" sourceCode ${sourceCode})
-string(REPLACE "SET(GDCM_LIBRARY_DIRS @GDCM_LIBRARY_DIR@)" "SET(GDCM_LIBRARY_DIRS \"@GDCM_LIBRARY_DIR@\")" sourceCode ${sourceCode})
+string(REPLACE "set( GDCM_INCLUDE_DIRS @GDCM_INCLUDE_PATH@)" "set( GDCM_INCLUDE_DIRS \"@GDCM_INCLUDE_PATH@\")" sourceCode ${sourceCode})
+string(REPLACE "set(GDCM_LIBRARY_DIRS @GDCM_LIBRARY_DIR@)" "set(GDCM_LIBRARY_DIRS \"@GDCM_LIBRARY_DIR@\")" sourceCode ${sourceCode})
 SET(GDCM_LIBRARY_DIRS @GDCM_LIBRARY_DIR@)
 # set variable CONTENTS, which is substituted in TEMPLATE_FILE
 set(CONTENTS ${sourceCode})


Adapt testing to have correct dependencies

Part of #18

--- test/base_test.cmake
+++ test/base_test.cmake
@@ -56,8 +56,10 @@

 if(NOT IGNORE_TEST)
   # Compare reference transformed code and output of the transformation
-  add_test(NAME ast-transform-${TEST_NAME} COMMAND diff ${OUTPUT_FILE} ${REFERENCE_FILE})
-  set_tests_properties(ast-transform-${TEST_NAME} PROPERTIES DEPENDS transform-${TEST_NAME})
+  add_test(NAME ast-transform-${TEST_NAME} COMMAND "${CMAKE_COMMAND}"  --build ${CMAKE_BINARY_DIR} --target transform-${TEST_NAME})
+  add_test(NAME ast-compare-${TEST_NAME} COMMAND diff ${OUTPUT_FILE} ${REFERENCE_FILE})
+  set_tests_properties(ast-compare-${TEST_NAME} PROPERTIES DEPENDS ast-transform-${TEST_NAME})
+
   # Compare the output of both executable
   if(OUTPUT_TEST)
     set (TEST_PARAMETERS "<(./${EXECUTABLE_ORIGINAL}) <(./${EXECUTABLE_TRANSFORMED})")


Added resource locks to the metadata extractor tests.  THis should prevent the travis build from failing so often.

--- plugins/metadata_extractor/plugin.cmake
+++ plugins/metadata_extractor/plugin.cmake
@@ -14,8 +14,8 @@
 #  limitations under the License.
 ###############################################################################

-add_python_test(client_metadata_extractor PLUGIN metadata_extractor)
-add_python_test(server_metadata_extractor PLUGIN metadata_extractor)
+add_python_test(client_metadata_extractor PLUGIN metadata_extractor RESOURCE_LOCKS cherrypy)
+add_python_test(server_metadata_extractor PLUGIN metadata_extractor RESOURCE_LOCKS cherrypy)

 add_python_style_test(python_static_analysis_metadata_extractor
                       "${PROJECT_SOURCE_DIR}/plugins/metadata_extractor/server")


COMP: Also bumped Elastix version. (To its last commit, "Fix installing as library", 3 days ago.) Hopefully fixes CMake install errors related to ITK 4.13.

--- SuperBuild/ExternalElastix.cmake
+++ SuperBuild/ExternalElastix.cmake
@@ -20,7 +20,7 @@
 set( proj Elastix )

 set( ELASTIX_GIT_REPOSITORY https://github.com/SuperElastix/elastix )
-set( ELASTIX_GIT_TAG e8354222396c6bd78e9fe6d5a39e4ecac4bb0d52 )
+set( ELASTIX_GIT_TAG 058253a1e7804e2e0d704dae372b97d853defbe5 )

 UPDATE_SELX_SUPERBUILD_COMMAND(${proj})


update

update

--- modules/CppBenchmark.cmake
+++ modules/CppBenchmark.cmake
@@ -7,6 +7,6 @@
   add_subdirectory("CppBenchmark")

   # Module folder
-  set_target_properties(cppbenchmark PROPERTIES FOLDER modules/CppBenchmark)
+  set_target_properties(cppbenchmark PROPERTIES FOLDER "modules/CppBenchmark")

 endif()


BUG: Superbuild - CTKData_DIR is now passed to CTK project

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -208,6 +208,7 @@
     -DCTK_CXX_FLAGS:STRING=${CTK_CXX_FLAGS}
     -DCTK_C_FLAGS:STRING=${CTK_C_FLAGS}
     -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+    -DCTKData_DIR:PATH=${CTKData_DIR}
 	  -DZMQ_DIR:PATH=${ZMQ_DIR}                     # FindVTK expects VTK_DIR variable to be defined
 	  -DOpenIGTLink_DIR:PATH=${OpenIGTLink_DIR}     # FindOpenIGTLink expects OpenIGTLink_DIR variable to be defined
     -DCTK_KWSTYLE_EXECUTABLE:FILEPATH=${CTK_KWSTYLE_EXECUTABLE}


sitl_gazebo build single threaded

sitl_gazebo build single threaded

 - building sitl_gazebo in parallel within a parallel PX4 build isn't load balanced

--- platforms/posix/cmake/sitl_target.cmake
+++ platforms/posix/cmake/sitl_target.cmake
@@ -45,7 +45,7 @@
 	USES_TERMINAL_BUILD true
 	EXCLUDE_FROM_ALL true
 	BUILD_ALWAYS 1
-	BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR>
+	BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> -- -j1
 )

 ExternalProject_Add(mavsdk_tests


Add pre-commit check for NOCHECKIN

Add pre-commit check for NOCHECKIN

SVN-Revision: 1375

--- tests/runsuite.cmake
+++ tests/runsuite.cmake
@@ -1,5 +1,5 @@
 # **********************************************************
-# Copyright (c) 2010-2012 Google, Inc.  All rights reserved.
+# Copyright (c) 2010-2013 Google, Inc.  All rights reserved.
 # Copyright (c) 2009-2010 VMware, Inc.  All rights reserved.
 # **********************************************************

@@ -111,6 +111,12 @@
     string(REGEX MATCH "NOTIFY[^(\n]*\\([^)]*\\\\n" match "${string}")
     if (NOT "${match}" STREQUAL "")
       message(FATAL_ERROR "In ${cfile}, use NL macro, not \\n, for NOTIFY string: ${match}")
+    endif ()
+
+    # Check for NOCHECKIN
+    string(REGEX MATCH "NOCHECKIN" match "${string}")
+    if (NOT "${match}" STREQUAL "")
+      message(FATAL_ERROR "In ${cfile}, remove NOCHECKIN: ${match}")
     endif ()

     # Check for CR.  Unfortunately file(READ) seems to throw away CR's


Don't set RPATH when making native packages. #1135

We don't need it for native packages and we're setting it wrong
for some platforms (should be $ORIGIN/../lib64/condor).

--- build/cmake/CondorConfigure.cmake
+++ build/cmake/CondorConfigure.cmake
@@ -436,7 +436,7 @@
 	message(STATUS "********* Configuring externals using [uw-externals] a.k.a NONPROPER *********")
 	option(CACHED_EXTERNALS "enable/disable cached externals" ON)

-	if (LINUX)
+	if (LINUX AND NOT CONDOR_PACKAGE_BUILD)
 		set(CMAKE_SKIP_RPATH FALSE)
 		set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/condor")
 		set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)


fixing openni lib hints

fixing openni lib hints

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

--- cmake/Modules/FindOpenNI.cmake
+++ cmake/Modules/FindOpenNI.cmake
@@ -25,7 +25,7 @@
 find_library(OPENNI_LIBRARY
              NAMES OpenNI64 OpenNI
              HINTS ${PC_OPENNI_LIBDIR} ${PC_OPENNI_LIBRARY_DIRS} /usr/lib
-             PATHS "$ENV{PROGRAMFILES}/OpenNI/Lib${OPENNI_SUFFIX}" "$ENV{PROGRAMW6432}/OpenNI/Lib${OPENNI_SUFFIX}")
+             PATHS "$ENV{PROGRAMFILES}/OpenNI/Lib" "$ENV{PROGRAMW6432}/OpenNI/Lib64")

 set(OPENNI_INCLUDE_DIRS ${OPENNI_INCLUDE_DIR})
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")


FindAbseil.cmake: cross-platform library names (#1348)

Fixes #1347

--- cmake/modules/FindAbseil.cmake
+++ cmake/modules/FindAbseil.cmake
@@ -15,6 +15,8 @@
 cmake_minimum_required(VERSION 3.2)

 if(NOT TARGET standalone_absl)
+  set(prefix ${CMAKE_STATIC_LIBRARY_PREFIX})
+  set(suffix ${CMAKE_STATIC_LIBRARY_SUFFIX})
   include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
   set(ABSEIL_PROJECT_NAME abseil)
   set(ABSEIL_PROJECT_SRC_DIR
@@ -23,36 +25,36 @@
     ${CMAKE_CURRENT_BINARY_DIR}/${ABSEIL_PROJECT_NAME}/src/${ABSEIL_PROJECT_NAME}-build)
   set(ABSEIL_INCLUDE_DIRS ${ABSEIL_PROJECT_SRC_DIR})
   set(ABSEIL_LIBRARY_PATH
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/synchronization/libabsl_synchronization.a")
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/synchronization/${prefix}absl_synchronization${suffix}")
   set(ABSEIL_DEPENDENT_LIBRARIES
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/algorithm/libabsl_algorithm.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/libabsl_base.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/libabsl_dynamic_annotations.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/libabsl_malloc_internal.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/libabsl_spinlock_wait.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/libabsl_throw_delegate.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/container/libabsl_container.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/container/libtest_instance_tracker_lib.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/libabsl_debugging.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/libabsl_examine_stack.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/libabsl_failure_signal_handler.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/libabsl_leak_check.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/libabsl_stack_consumption.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/libabsl_stacktrace.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/libabsl_symbolize.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/memory/libabsl_memory.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/meta/libabsl_meta.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/numeric/libabsl_int128.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/numeric/libabsl_numeric.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/strings/libabsl_strings.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/time/libabsl_time.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/libabsl_any.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/libabsl_bad_any_cast.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/libabsl_bad_optional_access.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/libabsl_optional.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/libabsl_span.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/libabsl_variant.a"
-    "${ABSEIL_PROJECT_BUILD_DIR}/absl/utility/libabsl_utility.a"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/algorithm/${prefix}absl_algorithm${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/${prefix}absl_base${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/${prefix}absl_dynamic_annotations${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/${prefix}absl_malloc_internal${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/${prefix}absl_spinlock_wait${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/base/${prefix}absl_throw_delegate${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/container/${prefix}absl_container${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/container/${prefix}test_instance_tracker_lib${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/${prefix}absl_debugging${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/${prefix}absl_examine_stack${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/${prefix}absl_failure_signal_handler${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/${prefix}absl_leak_check${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/${prefix}absl_stack_consumption${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/${prefix}absl_stacktrace${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/debugging/${prefix}absl_symbolize${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/memory/${prefix}absl_memory${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/meta/${prefix}absl_meta${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/numeric/${prefix}absl_int128${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/numeric/${prefix}absl_numeric${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/strings/${prefix}absl_strings${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/time/${prefix}absl_time${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_any${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_bad_any_cast${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_bad_optional_access${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_optional${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_span${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_variant${suffix}"
+    "${ABSEIL_PROJECT_BUILD_DIR}/absl/utility/${prefix}absl_utility${suffix}"
     )

    if(CMAKE_GENERATOR MATCHES "Ninja")
@@ -83,4 +85,6 @@
     "${ABSEIL_DEPENDENT_LIBRARIES}"
   )
   add_dependencies(standalone_absl ${ABSEIL_PROJECT_NAME})
+  unset(prefix)
+  unset(suffix)
 endif()


[CMake] Allow for defining a FAILREGEX for google tests.

Enable FAILREGEX functionality for google tests. The regulare expression
will be passed on to ROOT_ADD_TEST, and can be used to check the test output.

--- cmake/modules/RootMacros.cmake
+++ cmake/modules/RootMacros.cmake
@@ -1742,15 +1742,20 @@

 #----------------------------------------------------------------------------
 # function ROOT_ADD_GTEST(<testsuite> source1 source2...
-#                        [WILLFAIL]
-#                        [COPY_TO_BUILDDIR file1 file2...] -- files to copy in the build directory
+#                        [WILLFAIL] Negate output of test
+#                        [COPY_TO_BUILDDIR file1 file2] Copy listed files when ctest invokes the test.
 #                        [LIBRARIES lib1 lib2...] -- Libraries to link against
 #                        [LABELS label1 label2...] -- Labels to annotate the test
 #                        [INCLUDE_DIRS label1 label2...] -- Extra target include directories
 #                        [REPEATS number] -- Repeats testsuite `number` times, stopping at the first failure.
-
+#                        [FAILREGEX ...] Fail test if this regex matches.
+# Creates a new googletest exectuable, and registers it as a test.
+#----------------------------------------------------------------------------
 function(ROOT_ADD_GTEST test_suite)
-  CMAKE_PARSE_ARGUMENTS(ARG "WILLFAIL" "REPEATS" "COPY_TO_BUILDDIR;LIBRARIES;LABELS;INCLUDE_DIRS" ${ARGN})
+  cmake_parse_arguments(ARG
+    "WILLFAIL"
+    "REPEATS;FAILREGEX"
+    "COPY_TO_BUILDDIR;LIBRARIES;LABELS;INCLUDE_DIRS" ${ARGN})

   # ROOTUnitTestSupport
   if(NOT TARGET ROOTUnitTestSupport)
@@ -1795,6 +1800,7 @@
     COPY_TO_BUILDDIR ${ARG_COPY_TO_BUILDDIR}
     ${willfail}
     ${labels}
+    FAILREGEX ${ARG_FAILREGEX}
   )
 endfunction()


Add dummy source file to libraries made of only generated sources

--- cmake/modules/RootMacros.cmake
+++ cmake/modules/RootMacros.cmake
@@ -1063,6 +1063,12 @@
     set(MODULE_GEN_ARG NOTARGET MODULE ${libname})
   endif()

+  if(ARG_NO_SOURCES)
+    # Workaround bug in CMake by adding a dummy source file if all sources are generated, since
+    # in that case the initial call to add_library() may not list any sources and CMake complains.
+    add_custom_command(OUTPUT dummy.cxx COMMAND ${CMAKE_COMMAND} -E touch dummy.cxx)
+  endif()
+
   if(runtime_cxxmodules)
     # Record ROOT targets to be used as a dependency targets for "onepcm" target.
     set(ROOT_LIBRARY_TARGETS "${ROOT_LIBRARY_TARGETS};${libname}" CACHE STRING "List of ROOT targets generated from ROOT_STANDARD_LIBRARY_PACKAGE()" FORCE)
@@ -1076,7 +1082,8 @@
   endif()

   if (ARG_OBJECT_LIBRARY)
-    ROOT_OBJECT_LIBRARY(${libname}Objs ${ARG_SOURCES})
+    ROOT_OBJECT_LIBRARY(${libname}Objs ${ARG_SOURCES}
+                        $<$<BOOL:${ARG_NO_SOURCES}>:dummy.cxx>)
     ROOT_LINKER_LIBRARY(${libname} $<TARGET_OBJECTS:${libname}Objs>
                         LIBRARIES ${ARG_LIBRARIES}
                         DEPENDENCIES ${ARG_DEPENDENCIES}
@@ -1084,6 +1091,7 @@
                        )
   else(ARG_OBJECT_LIBRARY)
     ROOT_LINKER_LIBRARY(${libname} ${ARG_SOURCES}
+                        $<$<BOOL:${ARG_NO_SOURCES}>:dummy.cxx>
                         LIBRARIES ${ARG_LIBRARIES}
                         DEPENDENCIES ${ARG_DEPENDENCIES}
                         BUILTINS ${ARG_BUILTINS}


Tell icc to compile with 02 as other compilers

--- cmake/modules/SetUpLinux.cmake
+++ cmake/modules/SetUpLinux.cmake
@@ -226,11 +226,11 @@
   set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS}")

   # Select flags.
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 -g -DNDEBUG")
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
   set(CMAKE_CXX_FLAGS_RELEASE        "-O -DNDEBUG")
   set(CMAKE_CXX_FLAGS_OPTIMIZED      "-O -DNDEBUG")
   set(CMAKE_CXX_FLAGS_DEBUG          "-g")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O0 -g -DNDEBUG")
+  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g -DNDEBUG")
   set(CMAKE_C_FLAGS_RELEASE          "-O -DNDEBUG")
   set(CMAKE_C_FLAGS_OPTIMIZED        "-O -DNDEBUG")
   set(CMAKE_C_FLAGS_DEBUG            "-g")


Fix a typo in the argument of an else command that was discovered by CMake-2.8.12.  I
am pretty sure the arguments of else commands are generally ignored so
this typo did not cause any misbehaviour in the past, but nevertheless
it is good to fix this issue.

svn path=/trunk/; revision=12585

--- cmake/modules/pkg-config.cmake
+++ cmake/modules/pkg-config.cmake
@@ -175,7 +175,7 @@

   if("${_link_flags_in}" STREQUAL "")
     set(${_link_flags_out})
-  else("${_link_flags_in}" STREQUAL ""})
+  else("${_link_flags_in}" STREQUAL "")
     #message("(original link flags) = ${_link_flags_in}")
     # Convert link flags to a list.  Note some link flags are blank-delimited
     # (such as "-framework whatever") so preserve those by splitting into


Include UsePkgConfig module so that other modules can use it to find compile
and link flag information for the software they depend on.

svn path=/trunk/; revision=6772

--- cmake/modules/pkg-config.cmake
+++ cmake/modules/pkg-config.cmake
@@ -34,8 +34,12 @@
 # PKG_CONFIG_ENV	  - the string PKG_CONFIG_PATH=${PKG_CONFIG_DIR} which
 #  			    is used in example builds.

+
 message(STATUS "Looking for pkg-config")
-find_program(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin)
+# Following line is in UsePkgConfig.cmake so comment it out.
+# find_program(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin)
+# Make PKGCONFIG_EXECUTABLE available as well as the PKGCONFIG macro.
+include(UsePkgConfig)

 set(pkg_config_false "#")


add <project>-all target to build only the given sub project

--- SubProject.cmake
+++ SubProject.cmake
@@ -17,6 +17,7 @@
 # - An 'update_git_subprojects_${PROJECT_NAME}' target to update the <gittag> of
 #   all the .gitsubprojects entries to their latest respective origin/master ref
 # - A generic 'update' target to execute 'update_git_subrojects' recursively
+# - A <project>-all target to build only the given sub project
 #
 # To be compatible with the SubProject feature, (sub)projects might need to
 # adapt their CMake scripts in the following way:
@@ -75,6 +76,11 @@
     set(${name}_IS_SUBPROJECT ON PARENT_SCOPE)
     # Mark globally that we've already used name as a sub project
     set_property(GLOBAL PROPERTY ${name}_IS_SUBPROJECT ON)
+    # Create <project>-all target
+    get_property(__targets GLOBAL PROPERTY ${name}_ALL_DEP_TARGETS)
+    if(__targets)
+      add_custom_target(${name}-all DEPENDS ${__targets})
+    endif()
   endif()
 endfunction()


added option BUILD_GADGETRON (default on)

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -23,6 +23,7 @@
 option(USE_SYSTEM_FFTW3 "Build using an external version of fftw" OFF)
 option(USE_SYSTEM_SIRF "Build using an external version of SIRF" OFF)

+option(BUILD_GADGETRON "Build Gadgetron" ON)

 set(${PRIMARY_PROJECT_NAME}_DEPENDENCIES
     Boost
@@ -30,10 +31,13 @@
     HDF5
     FFTW3
     ismrmrd
-    STIR
-	Gadgetron
-	SIRF
+    STIR
+    SIRF
 )
+if (BUILD_GADGETRON)
+    list(APPEND ${PRIMARY_PROJECT_NAME}_DEPENDENCIES Gadgetron)
+endif()
+
 ExternalProject_Include_Dependencies(${proj} DEPENDS_VAR ${PRIMARY_PROJECT_NAME}_DEPENDENCIES)

 message(STATUS "")


corrected grouping of flags

corrected grouping of flags

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -75,11 +75,12 @@
   -DCMAKE_CXX_FLAGS:STRING=${ep_common_CXX_FLAGS}
   #debug flags
   -DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG}
+  -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
+  #release flags
   -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}
+  -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}
+  #relwithdebinfo
   -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-  #release flags
-  -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
-  -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}
   -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO}
 )


minor typo fix

minor typo fix

--- cmake/Cuda.cmake
+++ cmake/Cuda.cmake
@@ -132,7 +132,7 @@
 endfunction()

 ################################################################################################
-# Short command for cuda comnpilation
+# Short command for cuda compilation
 # Usage:
 #   caffe_cuda_compile(<objlist_variable> <cuda_files>)
 macro(caffe_cuda_compile objlist_variable)


Add POWER10 support flag (unconditionally for now)

--- cmake/arch.cmake
+++ cmake/arch.cmake
@@ -49,6 +49,7 @@

   if (POWER)
 	  set(DYNAMIC_CORE POWER6 POWER8 POWER9 POWER10)
+	  set(CCOMMON_OPT "${CCOMMON_OPT} -DHAVE_P10_SUPPORT")
   endif ()

   if (X86)


FIX: On OS X, the .dylib extension for shared modules is pretty much ubiquitous, so why, oh why does cmake use .so for a lib declared as a MODULE?

--- cmake/CEGUIMacros.cmake
+++ cmake/CEGUIMacros.cmake
@@ -216,6 +216,13 @@
             INSTALL_NAME_DIR ${CEGUI_APPLE_DYLIB_INSTALL_PATH}
             BUILD_WITH_INSTALL_RPATH TRUE
         )
+
+        # Force the somewhat standard .dylib extension for modules over the use of
+        # the .so extension
+        if (${_IS_MODULE})
+            set_target_properties(${_LIB_NAME} PROPERTIES SUFFIX ".dylib")
+        endif()
+
     else()
         set_target_properties(${_LIB_NAME} PROPERTIES
             INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CEGUI_LIB_INSTALL_DIR}"


FastJet forced to 3.0.6

FastJet forced to 3.0.6

--- cmake/FindFASTJET.cmake
+++ cmake/FindFASTJET.cmake
@@ -59,7 +59,7 @@
         message(FATAL_ERROR "FastJet ${FASTJET_VERSION_MAJOR}.${FASTJET_VERSION_MINOR}.${FASTJET_VERSION_PATCH} version is not suported. Please install a version >= 3.0.*")
     endif()

-    if(FASTJET_VERSION_MINOR NOT EQUAL 0)
+    if(FASTJET_VERSION_MINOR GREATER 0)
         message(FATAL_ERROR "FastJet ${FASTJET_VERSION_MAJOR}.${FASTJET_VERSION_MINOR}.${FASTJET_VERSION_PATCH} version is not suported.  Please install a version >= 3.0.*")
     endif()


 Avoid unexpected line breaks in version_string.inc

The Android NDK 16b has a bug that sets the ANDROID_NDK_REVISION
variable incorrectly, generating an unexpected line break in the
middle of the string. This breaks the build as the generated
version_string.inc presents an invalid C string.

Remove leading and trailing line breaks, warns for line breaks in the
middle of 'msg' and escape them before appending to
OPENCV_BUILD_INFO_STR.

--- cmake/OpenCVUtils.cmake
+++ cmake/OpenCVUtils.cmake
@@ -784,6 +784,11 @@
   message(STATUS "${msg}")
   string(REPLACE "\\" "\\\\" msg "${msg}")
   string(REPLACE "\"" "\\\"" msg "${msg}")
+  string(REGEX REPLACE "^\n+|\n+$" "" msg "${msg}")
+  if(msg MATCHES "\n")
+    message(WARNING "String to be inserted to version_string.inc has an unexpected line break: '${msg}'")
+    string(REPLACE "\n" "\\n" msg "${msg}")
+  endif()
   set(OPENCV_BUILD_INFO_STR "${OPENCV_BUILD_INFO_STR}\"${msg}\\n\"\n" CACHE INTERNAL "")
 endfunction()


A syntax fix.

A syntax fix.

--- cmake/ROCSExtDeps.cmake
+++ cmake/ROCSExtDeps.cmake
@@ -128,7 +128,7 @@
 		# Test version
 		if(OpenCV_VERSION LESS 2.1)
 			message(FATAL_ERROR "OpenCV library found, but the version is smaller than 2.1.")
-		endif(OpenCV_VERSION LESS 2)
+		endif(OpenCV_VERSION LESS 2.1)
 		# Set includes/libraries
 		include_directories(${OpenCV_INCLUDE_DIRS}/.. ${OpenCV_INCLUDE_DIRS})
 		link_directories(${OpenCV_LIBRARY_DIRS})


libm not available in win32

libm not available in win32

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

--- cmake/pcl_targets.cmake
+++ cmake/pcl_targets.cmake
@@ -102,7 +102,10 @@
 macro(PCL_ADD_LIBRARY _name _component)
     add_library(${_name} ${PCL_LIB_TYPE} ${ARGN})
     # must link explicitly against boost.
-    target_link_libraries(${_name} m ${Boost_LIBRARIES})
+    target_link_libraries(${_name} ${Boost_LIBRARIES})
+    if(UNIX AND NOT ANDROID)
+      target_link_libraries(${_name} m)
+    endif()

 	if(MSVC90 OR MSVC10)
 	  target_link_libraries(${_name} delayimp.lib)  # because delay load is enabled for openmp.dll


Added compile define for static spdlog

Added compile define for static spdlog

--- externals/CMakeExternals.cmake
+++ externals/CMakeExternals.cmake
@@ -197,6 +197,34 @@
     add_external_library(bhtsne
       LIBRARY ${BHTSNE_LIB})

+  # fmt
+  elseif(NAME STREQUAL "fmt")
+    if(TARGET fmt)
+      return()
+    endif()
+
+    if(WIN32)
+      set(FMT_LIB "lib/fmt<SUFFIX>.lib")
+    else()
+      include(GNUInstallDirs)
+      set(FMT_LIB "${CMAKE_INSTALL_LIBDIR}/libfmt.a")
+    endif()
+
+    add_external_project(fmt STATIC
+      GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+      GIT_TAG "6.2.1"
+      BUILD_BYPRODUCTS "<INSTALL_DIR>/${FMT_LIB}"
+      DEBUG_SUFFIX "d"
+      CMAKE_ARGS
+        -DFMT_DOC=OFF
+        -DFMT_TEST=OFF
+        -DCMAKE_C_FLAGS=-fPIC
+        -DCMAKE_CXX_FLAGS=-fPIC)
+
+    add_external_library(fmt
+      LIBRARY ${FMT_LIB}
+      DEBUG_SUFFIX "d")
+
   #glad
   elseif(NAME STREQUAL "glad")
     if(TARGET glad)
@@ -484,6 +512,41 @@
       IMPORT_LIBRARY ${SNAPPY_IMPORT_LIB}
       LIBRARY ${SNAPPY_LIB})

+  # spdlog
+  elseif(NAME STREQUAL "spdlog")
+    if(TARGET spdlog)
+      return()
+    endif()
+
+    require_external(fmt)
+
+    if(WIN32)
+      set(SPDLOG_LIB "lib/spdlog<SUFFIX>.lib")
+    else()
+      include(GNUInstallDirs)
+      set(SPDLOG_LIB "${CMAKE_INSTALL_LIBDIR}/libspdlog.a")
+    endif()
+
+    external_get_property(fmt BINARY_DIR)
+
+    add_external_project(spdlog STATIC
+      GIT_REPOSITORY https://github.com/gabime/spdlog.git
+      GIT_TAG "v1.5.0"
+      DEPENDS fmt
+      BUILD_BYPRODUCTS "<INSTALL_DIR>/${SPDLOG_LIB}"
+      DEBUG_SUFFIX "d"
+      CMAKE_ARGS
+        -DSPDLOG_BUILD_EXAMPLE=OFF
+        -DSPDLOG_BUILD_TESTS=OFF
+        -DSPDLOG_FMT_EXTERNAL=ON
+        -DSPDLOG_COMPILED_LIB=ON
+        -Dfmt_DIR=${BINARY_DIR})
+
+    add_external_library(spdlog
+      LIBRARY ${SPDLOG_LIB}
+      DEBUG_SUFFIX "d"
+      DEPENDS fmt)
+
   # tinyobjloader
   elseif(NAME STREQUAL "tinyobjloader")
     if(TARGET tinyobjloader)
@@ -688,65 +751,6 @@
       PROJECT vtkm
       LIBRARY_RELEASE "${VTKM_LIB_WORKLET}"
       LIBRARY_DEBUG "${VTKM_LIB_DEBUG_WORKLET}")
-
-  elseif(NAME STREQUAL "fmt")
-    if(TARGET fmt)
-      return()
-    endif()
-
-    if(WIN32)
-      set(FMT_LIB "lib/fmt<SUFFIX>.lib")
-    else()
-      include(GNUInstallDirs)
-      set(FMT_LIB "${CMAKE_INSTALL_LIBDIR}/libfmt.a")
-    endif()
-
-    add_external_project(fmt STATIC
-      GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-      GIT_TAG "6.2.1"
-      BUILD_BYPRODUCTS "<INSTALL_DIR>/${FMT_LIB}"
-      DEBUG_SUFFIX "d"
-      CMAKE_ARGS
-        -DFMT_DOC=OFF
-        -DFMT_TEST=OFF
-        -DCMAKE_C_FLAGS=-fPIC
-        -DCMAKE_CXX_FLAGS=-fPIC)
-
-    add_external_library(fmt
-      LIBRARY ${FMT_LIB}
-      DEBUG_SUFFIX "d")
-  elseif(NAME STREQUAL "spdlog")
-    if(TARGET spdlog)
-      return()
-    endif()
-
-    require_external(fmt)
-
-    if(WIN32)
-      set(SPDLOG_LIB "lib/spdlog<SUFFIX>.lib")
-    else()
-      include(GNUInstallDirs)
-      set(SPDLOG_LIB "${CMAKE_INSTALL_LIBDIR}/libspdlog.a")
-    endif()
-
-    external_get_property(fmt BINARY_DIR)
-
-    add_external_project(spdlog STATIC
-      GIT_REPOSITORY https://github.com/gabime/spdlog.git
-      GIT_TAG "v1.5.0"
-      DEPENDS fmt
-      BUILD_BYPRODUCTS "<INSTALL_DIR>/${SPDLOG_LIB}"
-      DEBUG_SUFFIX "d"
-      CMAKE_ARGS
-        -DSPDLOG_BUILD_EXAMPLE=OFF
-        -DSPDLOG_BUILD_TESTS=OFF
-        -DSPDLOG_FMT_EXTERNAL=ON
-        -Dfmt_DIR=${BINARY_DIR})
-
-    add_external_library(spdlog
-      LIBRARY ${SPDLOG_LIB}
-      DEBUG_SUFFIX "d"
-      DEPENDS fmt)
   else()
     message(FATAL_ERROR "Unknown external required \"${NAME}\"")
   endif()