Extracting proper libraries, include and library path from fastjet-config

--- cmake/FindFASTJET.cmake
+++ cmake/FindFASTJET.cmake
@@ -60,22 +60,51 @@
     if(error)
         message(FATAL_ERROR "Error retrieving FastJet compilation flags : ${error}")
     endif(error)
+
+    # Extracting the include path from the CXX flags
+    set(FASTJET_INCLUDE_DIR)
+    if(FASTJET_CXXFLAGS)
+	string(STRIP ${FASTJET_CXXFLAGS} FASTJET_CXXFLAGS)
+	string(REGEX MATCHALL  "[-][I]([^ ])+" incfolders ${FASTJET_CXXFLAGS})
+
+	foreach(incfolder ${incfolders})
+	    string(REPLACE "-I" "" incfolder ${incfolder})
+	    set(FASTJET_INCLUDE_DIR ${incfolder} ${FASTJET_INCLUDE_DIR})
+	endforeach()
+    endif(FASTJET_CXXFLAGS)

     # Extracting libraries and linking options
     execute_process(COMMAND ${FASTJET_CONFIG} --libs OUTPUT_VARIABLE FASTJET_CONFIGLIBS ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
     if(error)
         message(FATAL_ERROR "Error retrieving FastJet libs : ${error}")
     endif(error)
-    string(REGEX MATCHALL "[-][l]([^ ])+" FASTJET_CONFIGLIBS "${FASTJET_CONFIGLIBS}")
+
+    # Extracting the list of needed libraries during linking and the linking folders
+    set(FASTJET_LIBS)
+    set(FASTJET_LIBS_DIR)
+    if(FASTJET_CONFIGLIBS)
+	string(STRIP ${FASTJET_CONFIGLIBS} FASTJET_CONFIGLIBS)
+
+	# Extracting the list of libraries needed during linking
+	# -l strings
+	string(REGEX MATCHALL "[-][l]([^ ])+" fjlibs "${FASTJET_CONFIGLIBS}")
+
+	foreach(flib ${fjlibs})
+    	    string(REPLACE "-l" "" flib "${flib}")
+    	    set(FASTJET_LIBS ${FASTJET_LIBS} ${flib})
+	endforeach()

-    foreach(flib ${FASTJET_CONFIGLIBS})
-        string(REPLACE "-l" "" flib "${flib}")
-        set(FASTJET_LIBS ${FASTJET_LIBS} ${flib})
-    endforeach()
+	# Extracting the list of libraries folders
+	# -L strings
+	string(REGEX MATCHALL "[-][L]([^ ])+" fjlibdirs "${FASTJET_CONFIGLIBS}")
+
+	foreach(fjlibdir ${fjlibdirs})
+	    string(REPLACE "-L" "" fjlibdir ${fjlibdir})
+	    set(FASTJET_LIBS_DIR ${fjlibdir} ${FASTJET_LIBS_DIR})
+	endforeach()
+    endif()

     set(FASTJET_FOUND TRUE)
-    set(FASTJET_INCLUDE_DIR ${FASTJET}/include)
-    set(FASTJET_LIBS_DIR ${FASTJET}/lib)
     set(FASTJET_DEFINITIONS "-DHAVE_FASTJET")
     message(STATUS "FastJet ${FASTJET_VERSION_MAJOR}.${FASTJET_VERSION_MINOR}.${FASTJET_VERSION_PATCH} installation found: ${FASTJET}")
 else()


don't install headers into version-prefixed path

--- cmake/hexer_utils.cmake
+++ cmake/hexer_utils.cmake
@@ -81,7 +81,7 @@
     set(HEXER_LIB_DIR "lib")
   endif (NOT DEFINED LIB_INSTALL_DIR)
     set(HEXER_INCLUDE_ROOT
-        "include/${PROJECT_NAME_LOWER}-${HEXER_VERSION_MAJOR}.${HEXER_VERSION_MINOR}")
+        "include/${PROJECT_NAME_LOWER}")
     set(HEXER_INCLUDE_DIR "${HEXER_INCLUDE_ROOT}/hexer")
     set(HEXER_DOC_DIR "share/doc/${PROJECT_NAME_LOWER}-${HEXER_VERSION_MAJOR}.${HEXER_VERSION_MINOR}")
     set(HEXER_BIN_DIR "bin")


use absolute path of pf-mpi exec

use absolute path of pf-mpi exec

--- cmake/vSMCFindMPI.cmake
+++ cmake/vSMCFindMPI.cmake
@@ -1,4 +1,3 @@
-UNSET (VSMC_MPI_FOUND CACHE)
 IF (NOT VSMC_MPI_FOUND)
     UNSET (VSMC_MPI_FOUND CACHE)
     INCLUDE (FindMPI)


cmake: Also depend on libqt4codegen.py when using qt4-{client/constants/types}-gen.py.

--- cmake/modules/TpQt4Macros.cmake
+++ cmake/modules/TpQt4Macros.cmake
@@ -205,7 +205,9 @@
         COMMAND ${PYTHON_EXECUTABLE}
         ARGS ${ARGS}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DEPENDS ${CMAKE_SOURCE_DIR}/tools/qt4-client-gen.py)
+
+        DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqt4codegen.py
+                ${CMAKE_SOURCE_DIR}/tools/qt4-client-gen.py)
     add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp)

     if (client_generator_depends)
@@ -239,7 +241,9 @@
         COMMAND ${PYTHON_EXECUTABLE}
         ARGS ${ARGS}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DEPENDS ${CMAKE_SOURCE_DIR}/tools/qt4-client-gen.py)
+
+        DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqt4codegen.py
+                ${CMAKE_SOURCE_DIR}/tools/qt4-client-gen.py)
     add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp)

     if (future_client_generator_depends)
@@ -307,7 +311,8 @@
                                --specxml=${_SPEC_XML}
                                > ${_OUTFILE}

-                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/qt4-constants-gen.py
+                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqt4codegen.py
+                               ${CMAKE_SOURCE_DIR}/tools/qt4-constants-gen.py
                                ${_SPEC_XML} ${depends_xml_files})
     add_custom_target(${_TARGET_NAME} DEPENDS ${_OUTFILE})

@@ -332,7 +337,8 @@
                             ${types_gen_args}
                             --specxml=${_SPEC_XML}

-                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/qt4-types-gen.py
+                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqt4codegen.py
+                               ${CMAKE_SOURCE_DIR}/tools/qt4-types-gen.py
                                ${_SPEC_XML} ${depends_xml_files})
     add_custom_target(${_TARGET_NAME} DEPENDS ${_OUTFILE_IMPL})


Fixed regression

Fixed regression

--- cmake_modules/ZorbaModule.cmake
+++ cmake_modules/ZorbaModule.cmake
@@ -932,7 +932,10 @@
   #A more recent version of CMake contains a $<SEMICOLON> special token, but this version of cmake
   #is unsupported by some of our target platforms and it doesn't seem to work when used with variadic
   #functions
-  ADD_TEST ("${NAME}" "${TARGET_LOCATION}" ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5} ${ARGV6} ${ARGV7} ${ARGV8} ${ARGV9} ${ARGV10} ${ARGV11} ${ARGV12} ${ARGV13} ${ARGV14} ${ARGV15})
+  ADD_TEST ("${NAME}" "${TARGET_LOCATION}" ${ARGV2}  ${ARGV3}  ${ARGV4}  ${ARGV5}  ${ARGV6}  ${ARGV7}  ${ARGV8}  ${ARGV9}
+                                           ${ARGV10} ${ARGV11} ${ARGV12} ${ARGV13} ${ARGV14} ${ARGV15} ${ARGV16} ${ARGV17}
+                                           ${ARGV18} ${ARGV19} ${ARGV20} ${ARGV21} ${ARGV22} ${ARGV23} ${ARGV24} ${ARGV25}
+                                           ${ARGV26} ${ARGV27} ${ARGV28} ${ARGV29} ${ARGV30} ${ARGV31} ${ARGV32} ${ARGV33})
   SET_TESTS_PROPERTIES ("${NAME}" PROPERTIES TIMEOUT "${NORMAL_TIMEOUT_VALUE}")
   GET_PROPERTY (TEST_EXTRAPROPS GLOBAL PROPERTY "EXTRAPROPS-${NAME}")
   IF (TEST_EXTRAPROPS)


Fix installation of EP_eigen3 aux project

--- cmakemodules/script_eigen.cmake
+++ cmakemodules/script_eigen.cmake
@@ -30,7 +30,7 @@
 	add_dependencies(Eigen EP_eigen3)
 	export(
 		TARGETS Eigen
-		FILE "${MRPT_BINARY_DIR}/EP_eigen3-config.cmake"
+		FILE "${MRPT_BINARY_DIR}/ep_eigen3-config.cmake"
 	)
 	install(TARGETS Eigen EXPORT Eigen-targets)
 	if (WIN32)
@@ -42,8 +42,8 @@
 		EXPORT Eigen-targets
 		DESTINATION ${dstDir}
 	)
-	# Dummy EP_eigen3-config.cmake file
-	install(FILES ${MRPT_SOURCE_DIR}/parse-files/EP_eigen3-config.cmake DESTINATION ${dstDir})
+	# Dummy ep_eigen3-config.cmake file
+	install(FILES ${MRPT_SOURCE_DIR}/parse-files/ep_eigen3-config.cmake DESTINATION ${dstDir})

 	target_include_directories(Eigen
 		SYSTEM  # omit warnings for these hdrs


Update the download page: promote online package archives

Remove Debian Squeeze support.

--- doc/www-data.in/download.cmake
+++ doc/www-data.in/download.cmake
@@ -34,83 +34,6 @@
 by compilation parameters and environment, it is recommended
 that production systems use the builds provided on this site.

-### RedHat, FreeBSD, Mac OS X
-
-

-
-
-
-  RedHat
-
-

-
-        RedHat .rpm
-
-
-
-        32-bit
-
-
-
-        64-bit
-
-

-
-

-
-        RedHat .rpm, with debug info
-
-
-        32-bit
-
-
-
-        64-bit
-
-

-
-
-  Other Linux distributions
-
-

-
-        Binary tarball (.tar.gz)
-
-
-        32-bit
-
-
-
-        64-bit
-
-

-
-  FreeBSD
-
-
-
-

-
-        Binary tarball (.tar.gz)
-
-
-        32-bit
-
-
-
-
-

-  Mac OS X
-

-    brew install http://tarantool.org/dist/tarantool.rb
-

-
-

-
 ### Debian GNU/Linux and Ubuntu

 We maintain an always up-to-date Debian GNU/Linux and Ubuntu package
@@ -118,7 +41,7 @@
 href="http://tarantool.org/dist/debian">http://tarantool.org/dist/debian and http://tarantool.org/dist/ubuntu respectively.

-At the moment the repository contains builds for Debian "Sid", "Squeeze",
+At the moment the repository contains builds for Debian "Sid", "Jessie",
 "Wheezy" and Ubuntu "Precise". It can be added to your apt sources list with:

     wget http://tarantool.org/dist/public.key
@@ -152,6 +75,84 @@
     enabled=1
     gpgcheck=0

+### Standalone packages for RedHat, FreeBSD, Mac OS X
+
+

+
+
+
+  RedHat
+
+

+
+        RedHat .rpm
+
+
+
+        32-bit
+
+
+
+        64-bit
+
+

+
+

+
+        RedHat .rpm, with debug info
+
+
+        32-bit
+
+
+
+        64-bit
+
+

+
+
+  Other Linux distributions
+
+

+
+        Binary tarball (.tar.gz)
+
+
+        32-bit
+
+
+
+        64-bit
+
+

+
+  FreeBSD
+
+
+
+

+
+        Binary tarball (.tar.gz)
+
+
+        32-bit
+
+
+
+
+

+  Mac OS X
+

+    brew install http://tarantool.org/dist/tarantool.rb
+

+
+

+
+
 # Development branch

 In the same manner as for [the stable
@@ -164,7 +165,7 @@

 - Perl driver, [DR:Tarantool](http://search.cpan.org/~unera/DR-Tarantool-0.37/lib/DR/Tarantool.pm)
 - Java driver, [Maven repository](http://dgreenru.github.com/tarantool-java)
-- Ruby driver, [http://github.com/tarantool/tarantool-ruby](https://github.com/tarantool/tarantool-ruby)
+- Ruby driver, [http://github.com/mailru/tarantool-ruby](https://github.com/tarantool/tarantool-ruby)
 - Python driver, [http://pypi.python.org/pypi/tarantool](http://pypi.python.org/pypi/tarantool)
 - PHP driver, [https://github.com/tarantool/tarantool-php](https://github.com/tarantool/tarantool-php)
 - node.js driver,
@@ -289,7 +290,7 @@
 http://tarantool.org/dist/debian,
 http://tarantool.org/dist/ubuntu.

-Репозитории содержат пакеты для Debian "Sid", "Squeeze",
+Репозитории содержат пакеты для Debian "Sid", "Jessy",
 "Wheezy" и Ubuntu "Precise". Для установки можно воспользоваться следующим
 скриптом:

@@ -321,7 +322,7 @@
 ### Доступ из языков программирования

 - Perl driver [DR:Tarantool](http://search.cpan.org/~unera/DR-Tarantool-0.37/lib/DR/Tarantool.pm)
-- [Ruby driver](https://github.com/tarantool/tarantool-ruby)
+- [Ruby driver](https://github.com/mailru/tarantool-ruby)
 - Python driver, [hosted at pypi.python.org](http://pypi.python.org/pypi/tarantool)
 - PHP driver [https://github.com/tarantool/tarantool-php](https://github.com/tarantool/tarantool-php)
 - Java driver, [Maven repository](http://dgreenru.github.com/tarantool-java)


Eigen is mandatory, so the USE_EIGEN variable is unnecessary

--- distro/superbuild/cmake/externals.cmake
+++ distro/superbuild/cmake/externals.cmake
@@ -10,7 +10,6 @@
 option(USE_LIBBOT "Build with libbot." OFF)
 option(USE_DRAKE "Build with drake." OFF)
 option(USE_STANDALONE_LCMGL "Build with standalone bot-lcmgl." OFF)
-set(USE_EIGEN ${USE_PCL})

 option(USE_SYSTEM_EIGEN "Use system version of eigen.  If off, eigen will be built." OFF)
 option(USE_SYSTEM_LCM "Use system version of lcm.  If off, lcm will be built." OFF)
@@ -69,7 +68,7 @@
 ###############################################################################
 # eigen

-if (USE_EIGEN AND NOT USE_SYSTEM_EIGEN)
+if (NOT USE_SYSTEM_EIGEN)

 ExternalProject_Add(
   eigen


Some minor cleaning up [ci skip].

Some minor cleaning up [ci skip].

--- cmake/common.cmake
+++ cmake/common.cmake
@@ -226,8 +226,7 @@

 MACRO(UPDATE_LANGUAGE_FILES TARGET_NAME)
     # Update the translation (.ts) files (if they exist) and generate the
-    # language (.qm) files which will later on be embedded in the project
-    # itself
+    # language (.qm) files, which will later on be embedded in the project
     # Note: this requires SOURCES, HEADERS_MOC and UIS to be defined for the
     #       current CMake project, even if that means that these variables are
     #       to be empty (the case with some plugins for example). Indeed, since
@@ -378,8 +377,8 @@
         SET(RESOURCES)
     ENDIF()

-    # Update the translation (.ts) files and generate the language (.qm) files
-    # which will later on be embedded in the plugin itself
+    # Update the translation (.ts) files and generate the language (.qm) files,
+    # which will later on be embedded in the plugin

     IF(NOT "${RESOURCES}" STREQUAL "")
         UPDATE_LANGUAGE_FILES(${PLUGIN_NAME})
@@ -550,8 +549,8 @@
         ENDFOREACH()
     ENDIF()

-    # Package the plugin itself, but only if we are not on OS X since it will
-    # have already been copied
+    # Package the plugin, but only if we are not on OS X since it will  have
+    # already been copied

     IF(NOT APPLE)
         INSTALL(FILES ${PLUGIN_BUILD_DIR}/${PLUGIN_FILENAME}
@@ -759,8 +758,8 @@
         ENDFOREACH()
     ENDIF()

-    # Package the plugin itself, but only if we are not on OS X since it will
-    # have already been copied
+    # Package the plugin, but only if we are not on OS X since it will have
+    # already been copied

     IF(NOT APPLE)
         INSTALL(FILES ${PLUGIN_BINARY_DIR}/${PLUGIN_FILENAME}
@@ -799,7 +798,7 @@

 MACRO(WINDOWS_DEPLOY_QT_LIBRARIES)
     FOREACH(LIBRARY ${ARGN})
-        # Deploy the Qt library itself
+        # Deploy the Qt library

         INSTALL(FILES ${QT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY}${CMAKE_SHARED_LIBRARY_SUFFIX}
                 DESTINATION bin)
@@ -810,7 +809,7 @@

 MACRO(WINDOWS_DEPLOY_QT_PLUGIN PLUGIN_CATEGORY)
     FOREACH(PLUGIN_NAME ${ARGN})
-        # Deploy the Qt plugin itself
+        # Deploy the Qt plugin

         INSTALL(FILES ${QT_PLUGINS_DIR}/${PLUGIN_CATEGORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${PLUGIN_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
                 DESTINATION plugins/${PLUGIN_CATEGORY})
@@ -836,7 +835,7 @@

 MACRO(LINUX_DEPLOY_QT_PLUGIN PLUGIN_CATEGORY)
     FOREACH(PLUGIN_NAME ${ARGN})
-        # Deploy the Qt plugin itself
+        # Deploy the Qt plugin

         INSTALL(FILES ${QT_PLUGINS_DIR}/${PLUGIN_CATEGORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${PLUGIN_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
                 DESTINATION plugins/${PLUGIN_CATEGORY})
@@ -915,7 +914,7 @@
 #===============================================================================

 MACRO(OS_X_DEPLOY_QT_FILE ORIG_DIRNAME DEST_DIRNAME FILENAME)
-    # Copy the Qt file itself
+    # Copy the Qt file

     SET(ORIG_FILENAME ${ORIG_DIRNAME}/${FILENAME})

@@ -936,7 +935,7 @@

 MACRO(OS_X_DEPLOY_QT_LIBRARIES)
     FOREACH(LIBRARY_NAME ${ARGN})
-        # Deploy the Qt library itself
+        # Deploy the Qt library

         SET(QT_FRAMEWORK_DIR ${LIBRARY_NAME}.framework/Versions/${QT_VERSION_MAJOR})

@@ -950,7 +949,7 @@

 MACRO(OS_X_DEPLOY_QT_PLUGIN PLUGIN_CATEGORY)
     FOREACH(PLUGIN_NAME ${ARGN})
-        # Deploy the Qt plugin itself
+        # Deploy the Qt plugin

         OS_X_DEPLOY_QT_FILE(${QT_PLUGINS_DIR}/${PLUGIN_CATEGORY}
                             ${PROJECT_BUILD_DIR}/${CMAKE_PROJECT_NAME}.app/Contents/PlugIns/${PLUGIN_CATEGORY}
@@ -961,7 +960,7 @@
 #===============================================================================

 MACRO(OS_X_DEPLOY_LIBRARY DIRNAME LIBRARY_NAME)
-    # Copy the library itself
+    # Copy the library

     SET(LIBRARY_FILENAME ${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
     SET(LIBRARY_FILEPATH ${PROJECT_BUILD_DIR}/${CMAKE_PROJECT_NAME}.app/Contents/Frameworks/${LIBRARY_FILENAME})


Fix some CMake ISA typos

Fix some CMake ISA typos

--- cmake/ospray.cmake
+++ cmake/ospray.cmake
@@ -99,8 +99,8 @@
       SET(OSPRAY_ISPC_CPU "core-avx2")
     ENDIF()

-    IF (NOT (OSPRAY_ISA_AVX2 OR OSPRAY_ISA_AVX2 OR OSPRAY_ISA_AVX2))
-      MESSAGE(ERROR "No ISAs selected. Select at least one of SSE, AVX, AVX2")
+    IF (NOT (OSPRAY_ISA_SSE OR OSPRAY_ISA_AVX OR OSPRAY_ISA_AVX2))
+      MESSAGE(FATAL_ERROR "No ISAs selected. Select at least one of SSE, AVX, AVX2")
     ENDIF()
   ENDIF()


Disable vtkRenderingExternal module for OpenGL2 backend

vtkRenderingExternal depends on vtkGenericOpenGLRenderWindow which is not
available for the OpenGL2 backend yet.

Change-Id: I2f141f7ef7e28d27ebd73762228eeb12d356d987

--- Rendering/External/module.cmake
+++ Rendering/External/module.cmake
@@ -1,3 +1,15 @@
+# This module cannot be built when the rendering backend is OpenGL2
+if (Module_vtkRenderingExternal AND
+    ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2"))
+  message (SEND_ERROR "
+  vtkRenderingExternal cannot be built
+  when the rendering backend is OpenGL2.
+  Please disable vtkRenderingExternal or
+  change VTK_RENDERING_BACKEND to OpenGL.
+  ")
+  return()
+endif()
+
 vtk_module(vtkRenderingExternal
   DEPENDS
     vtkRenderingCore


add vad_add_var function to append/add variables within a vad_*** script (which will belong to the respective package)

Change-Id: I951579b0200e4a6b183e67bd97fa4e970145d2a3

--- VigraAddDep.cmake
+++ VigraAddDep.cmake
@@ -263,6 +263,14 @@
   set(VAD_NEW_VARS_${_VAD_NAME} ${_DIFFVARS} CACHE INTERNAL "")
 endmacro()

+function(vad_add_var _VARNAME _VARVAL)
+  if (NOT _VAD_NAME)
+    message(FATAL_ERROR "vad_add_var requires _VAD_NAME to be set!")
+  endif()
+  set(${_VARNAME} ${_VARVAL} CACHE INTERNAL "")
+  set(VAD_NEW_VARS_${_VAD_NAME} "${VAD_NEW_VARS_${_VAD_NAME}};${_VARNAME}" CACHE INTERNAL "")
+endfunction()
+
 # In addition to calling the builtin find_package(), this function
 # will take care of exporting as global variables the variables defined by the builtin find_package(), and to make
 # the imported targets defined by the builtin find_package() global.


Pre-emptive name changing.

Pre-emptive name changing.

--- VigraAddDep.cmake
+++ VigraAddDep.cmake
@@ -36,26 +36,26 @@
   message(STATUS "The root of external dependencies has not been been specified by the user, setting it to the default: ${VAD_EXTERNAL_ROOT}")
 endif()

-function(git_clone NAME)
+function(git_clone _VAD_NAME)
   find_package(Git REQUIRED VAD_IGNORE_DEP)

   # Check if a git repo has been determined for the dependency.
-  if(NOT VAD_${NAME}_GIT_REPO)
-    message(FATAL_ERROR "A git clone was requested for dependency ${NAME}, but no repository variable has been set.")
+  if(NOT VAD_${_VAD_NAME}_GIT_REPO)
+    message(FATAL_ERROR "A git clone was requested for dependency ${_VAD_NAME}, but no repository variable has been set.")
   endif()

   # Don't do anything if the repo has been cloned already.
-  if(EXISTS "${VAD_EXTERNAL_ROOT}/${NAME}")
-    message(STATUS "The path '${VAD_EXTERNAL_ROOT}/${NAME}' already exists, skipping clone.")
+  if(EXISTS "${VAD_EXTERNAL_ROOT}/${_VAD_NAME}")
+    message(STATUS "The path '${VAD_EXTERNAL_ROOT}/${_VAD_NAME}' already exists, skipping clone.")
     return()
   endif()

-  message(STATUS "Git cloning repo '${VAD_${NAME}_GIT_REPO}' into '${VAD_EXTERNAL_ROOT}/${NAME}'.")
+  message(STATUS "Git cloning repo '${VAD_${_VAD_NAME}_GIT_REPO}' into '${VAD_EXTERNAL_ROOT}/${_VAD_NAME}'.")

   # Build the command line options for the clone command.
-  list(APPEND GIT_COMMAND_ARGS "clone" "${VAD_${NAME}_GIT_REPO}" "${NAME}")
-  if(VAD_${NAME}_GIT_CLONE_OPTS)
-    list(INSERT GIT_COMMAND_ARGS 1 ${VAD_${NAME}_GIT_CLONE_OPTS})
+  list(APPEND GIT_COMMAND_ARGS "clone" "${VAD_${_VAD_NAME}_GIT_REPO}" "${_VAD_NAME}")
+  if(VAD_${_VAD_NAME}_GIT_CLONE_OPTS)
+    list(INSERT GIT_COMMAND_ARGS 1 ${VAD_${_VAD_NAME}_GIT_CLONE_OPTS})
   endif()

   # Run the clone command.
@@ -65,38 +65,38 @@
     ERROR_VARIABLE OUT
     OUTPUT_VARIABLE OUT)
   if(RES)
-    message(FATAL_ERROR "The clone command for '${NAME}' failed. The command arguments were: ${GIT_COMMAND_ARGS}\n\nThe output is:\n====\n${OUT}\n====")
-  endif()
-
-  message(STATUS "'${NAME}' was successfully cloned into '${VAD_EXTERNAL_ROOT}/${NAME}'")
+    message(FATAL_ERROR "The clone command for '${_VAD_NAME}' failed. The command arguments were: ${GIT_COMMAND_ARGS}\n\nThe output is:\n====\n${OUT}\n====")
+  endif()
+
+  message(STATUS "'${_VAD_NAME}' was successfully cloned into '${VAD_EXTERNAL_ROOT}/${_VAD_NAME}'")
 endfunction()

 # Override the builtin add_library() function so that the new library is appended to a global list
 # if it is a non-global imported target. It will then be turned into a global imported target by find_package().
 # We will also record the library location in a generator expression.
-function(add_library NAME)
+function(add_library _VAD_NAME)
   # Check if the target is an imported non-global one. In that case, add it to the list of non-global imported
   # targets.
   list(FIND ARGN "IMPORTED" _IDX_IMP)
   list(FIND ARGN "GLOBAL" _IDX_GLOB)
   if(NOT _IDX_IMP EQUAL -1 AND _IDX_GLOB EQUAL -1)
     if(VAD_VERBOSE)
-      message(STATUS "Adding target '${NAME}' to the list of non-global imported targets.")
+      message(STATUS "Adding target '${_VAD_NAME}' to the list of non-global imported targets.")
     endif()
     get_property(_LIB_LIST GLOBAL PROPERTY _VAD_IMPORTED_NOGLOBAL_LIST)
-    list(APPEND _LIB_LIST "${NAME}")
+    list(APPEND _LIB_LIST "${_VAD_NAME}")
     set_property(GLOBAL PROPERTY _VAD_IMPORTED_NOGLOBAL_LIST ${_LIB_LIST})
   endif()

   # Call the original add_library() function.
-  _add_library(${NAME} ${ARGN})
+  _add_library(${_VAD_NAME} ${ARGN})

   # If the target is not INTERFACE or ALIAS, we will record its location.
   list(FIND ARGN "INTERFACE" _IDX_IFACE)
   list(FIND ARGN "ALIAS" _IDX_ALIAS)
   if(_IDX_IFACE EQUAL -1 AND _IDX_ALIAS EQUAL -1)
     set(_LIBRARY_DIR_LIST "${_VAD_LIBRARY_DIR_LIST}")
-    list(APPEND _LIBRARY_DIR_LIST "$<TARGET_FILE_DIR:${NAME}>")
+    list(APPEND _LIBRARY_DIR_LIST "$<TARGET_FILE_DIR:${_VAD_NAME}>")
     list(REMOVE_DUPLICATES _LIBRARY_DIR_LIST)
     set(_VAD_LIBRARY_DIR_LIST "${_LIBRARY_DIR_LIST}" CACHE INTERNAL "")
   endif()
@@ -105,16 +105,16 @@
 # An utility function to turn an imported target into a GLOBAL imported target.
 # Imported targets have special visibility rules: they are not visible outside the subdir/subproject
 # from which they were defined.
-function(vad_make_imported_target_global NAME)
+function(vad_make_imported_target_global _VAD_NAME)
   # Check the target actually exists.
-  if(NOT TARGET "${NAME}")
-    message(FATAL_ERROR "'vad_make_imported_target_global()' was called with argument '${NAME}', but a target with that name does not exist.")
+  if(NOT TARGET "${_VAD_NAME}")
+    message(FATAL_ERROR "'vad_make_imported_target_global()' was called with argument '${_VAD_NAME}', but a target with that name does not exist.")
   endif()

   # Check if the target is imported. If it not, we just exit.
-  get_target_property(IMP_PROP "${NAME}" IMPORTED)
+  get_target_property(IMP_PROP "${_VAD_NAME}" IMPORTED)
   if(NOT IMP_PROP)
-    message(FATAL_ERROR "Target '${NAME}' is not IMPORTED, no need to make it global.")
+    message(FATAL_ERROR "Target '${_VAD_NAME}' is not IMPORTED, no need to make it global.")
   endif()

   # The strategy here is as follows:
@@ -124,16 +124,16 @@
   # It is necessary to go through the double indirection because of certain CMake rules regarding the allowed target
   # names.
   if(VAD_VERBOSE)
-    message(STATUS "Turning IMPORTED target '${NAME}' into a GLOBAL target.")
-  endif()
-  get_target_property(TARGET_TYPE ${NAME} TYPE)
+    message(STATUS "Turning IMPORTED target '${_VAD_NAME}' into a GLOBAL target.")
+  endif()
+  get_target_property(TARGET_TYPE ${_VAD_NAME} TYPE)
   if(VAD_VERBOSE)
     message(STATUS "Target type is: ${TARGET_TYPE}")
   endif()
   if(TARGET_TYPE MATCHES "INTERFACE_LIBRARY")
-    add_library(_VAD_${NAME}_STUB INTERFACE IMPORTED GLOBAL)
-  else()
-    add_library(_VAD_${NAME}_STUB UNKNOWN IMPORTED GLOBAL)
+    add_library(_VAD_${_VAD_NAME}_STUB INTERFACE IMPORTED GLOBAL)
+  else()
+    add_library(_VAD_${_VAD_NAME}_STUB UNKNOWN IMPORTED GLOBAL)
   endif()
   foreach(TPROP ${VAD_TARGET_PROPERTIES})
       if(TARGET_TYPE MATCHES "INTERFACE_LIBRARY")
@@ -142,35 +142,35 @@
           continue()
         endif()
       endif()
-      get_target_property(PROP ${NAME} "${TPROP}")
+      get_target_property(PROP ${_VAD_NAME} "${TPROP}")
       if(PROP)
           if(VAD_VERBOSE)
-            message(STATUS "Copying property '${TPROP}' of IMPORTED target '${NAME}': '${PROP}'")
+            message(STATUS "Copying property '${TPROP}' of IMPORTED target '${_VAD_NAME}': '${PROP}'")
           endif()
-          set_property(TARGET _VAD_${NAME}_STUB PROPERTY "${TPROP}" "${PROP}")
+          set_property(TARGET _VAD_${_VAD_NAME}_STUB PROPERTY "${TPROP}" "${PROP}")
       endif()
   endforeach()

   # Create the final aliases. We need to remove any double colon from the original name as they are not allowed
   # in the names of targets in this context.
-  string(REPLACE "::" "" NAME_NO_COLONS "${NAME}")
+  string(REPLACE "::" "" NAME_NO_COLONS "${_VAD_NAME}")
   add_library(_VAD_${NAME_NO_COLONS}_STUB_INTERFACE INTERFACE)
-  target_link_libraries(_VAD_${NAME_NO_COLONS}_STUB_INTERFACE INTERFACE _VAD_${NAME}_STUB)
-  add_library("${NAME}" ALIAS _VAD_${NAME_NO_COLONS}_STUB_INTERFACE)
+  target_link_libraries(_VAD_${NAME_NO_COLONS}_STUB_INTERFACE INTERFACE _VAD_${_VAD_NAME}_STUB)
+  add_library("${_VAD_NAME}" ALIAS _VAD_${NAME_NO_COLONS}_STUB_INTERFACE)

   # We need to remove the library dir for the original target from the global list:
   # the target is now just an alias with no TARGET_FILE_DIR property. Its actual
   # TARGET_FILE_DIR property has been recorded in the STUB targets, which export
   # this information in the global list.
   set(_LIBRARY_DIR_LIST "${_VAD_LIBRARY_DIR_LIST}")
-  list(REMOVE_ITEM _LIBRARY_DIR_LIST "$<TARGET_FILE_DIR:${NAME}>")
+  list(REMOVE_ITEM _LIBRARY_DIR_LIST "$<TARGET_FILE_DIR:${_VAD_NAME}>")
   set(_VAD_LIBRARY_DIR_LIST "${_LIBRARY_DIR_LIST}")
 endfunction()

 # Override the builtin find_package() function to just call vigra_add_dep(). The purpose of this override is to make
 # sure that any dep added via find_package() goes through the VAD machinery.
-function(find_package NAME)
-  vigra_add_dep(${NAME} SYSTEM ${ARGN})
+function(find_package _VAD_NAME)
+  vigra_add_dep(${_VAD_NAME} SYSTEM ${ARGN})
 endfunction()

 function(make_imported_targets_global)
@@ -244,12 +244,12 @@
 endfunction()

 # The default vad_system() function.
-function(vad_system_default NAME)
-  message(STATUS "Invoking the default implementation of vad_system() for dependency ${NAME}.")
-  find_package_plus(${NAME} ${ARGN})
+function(vad_system_default _VAD_NAME)
+  message(STATUS "Invoking the default implementation of vad_system() for dependency ${_VAD_NAME}.")
+  find_package_plus(${_VAD_NAME} ${ARGN})
   # Check the FOUND flag.
-  if(NOT ${NAME}_FOUND)
-    set(VAD_${NAME}_SYSTEM_NOT_FOUND TRUE CACHE INTERNAL "")
+  if(NOT ${_VAD_NAME}_FOUND)
+    set(VAD_${_VAD_NAME}_SYSTEM_NOT_FOUND TRUE CACHE INTERNAL "")
   endif()
 endfunction()

@@ -259,23 +259,23 @@
   function(vad_system)
     vad_system_default(${ARGN})
   endfunction()
-  function(vad_live NAME)
-    message(STATUS "Invoking the default implementation of vad_live() for dependency ${NAME}.")
-    git_clone(${NAME})
-    add_subdirectory("${VAD_EXTERNAL_ROOT}/${NAME}" "${VAD_EXTERNAL_ROOT}/${NAME}/build_external_dep")
+  function(vad_live _VAD_NAME)
+    message(STATUS "Invoking the default implementation of vad_live() for dependency ${_VAD_NAME}.")
+    git_clone(${_VAD_NAME})
+    add_subdirectory("${VAD_EXTERNAL_ROOT}/${_VAD_NAME}" "${VAD_EXTERNAL_ROOT}/${_VAD_NAME}/build_external_dep")
   endfunction()
 endfunction()

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

@@ -283,12 +283,12 @@
   set(options SYSTEM LIVE VAD_IGNORE_DEP)
   set(oneValueArgs GIT_REPO GIT_BRANCH GIT_COMMIT)
   set(multiValueArgs GIT_CLONE_OPTS)
-  cmake_parse_arguments(ARG_VAD_${NAME} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  if(NOT ARG_VAD_${NAME}_VAD_IGNORE_DEP)
-    message(STATUS "Declaring '${NAME}' as a dependency for '${PROJECT_NAME}'")
+  cmake_parse_arguments(ARG_VAD_${_VAD_NAME} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(NOT ARG_VAD_${_VAD_NAME}_VAD_IGNORE_DEP)
+    message(STATUS "Declaring '${_VAD_NAME}' as a dependency for '${PROJECT_NAME}'")
     get_property(_VAD_${PROJECT_NAME}_DEP_LIST GLOBAL PROPERTY VAD_${PROJECT_NAME}_DEP_LIST)
-    list(APPEND _VAD_${PROJECT_NAME}_DEP_LIST "${NAME}")
+    list(APPEND _VAD_${PROJECT_NAME}_DEP_LIST "${_VAD_NAME}")
     list(REMOVE_DUPLICATES _VAD_${PROJECT_NAME}_DEP_LIST)
     message(STATUS "Full dep list for '${PROJECT_NAME}': ${_VAD_${PROJECT_NAME}_DEP_LIST}")
     set_property(GLOBAL PROPERTY VAD_${PROJECT_NAME}_DEP_LIST "${_VAD_${PROJECT_NAME}_DEP_LIST}")
@@ -296,27 +296,27 @@

   # Validate options.
   # SYSTEM and LIVE cannot be present at the same time.
-  if(ARG_VAD_${NAME}_SYSTEM AND ARG_VAD_${NAME}_LIVE)
-    message(FATAL_ERROR "Dependency '${NAME}' was added both as a SYSTEM dependency and as a LIVE dependency: only one choice can be active.")
+  if(ARG_VAD_${_VAD_NAME}_SYSTEM AND ARG_VAD_${_VAD_NAME}_LIVE)
+    message(FATAL_ERROR "Dependency '${_VAD_NAME}' was added both as a SYSTEM dependency and as a LIVE dependency: only one choice can be active.")
   endif()

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

-  if(NOT ARG_VAD_${NAME}_SYSTEM AND NOT ARG_VAD_${NAME}_LIVE)
+  if(NOT ARG_VAD_${_VAD_NAME}_SYSTEM AND NOT ARG_VAD_${_VAD_NAME}_LIVE)
     # If neither SYSTEM nor LIVE were specified, assume SYSTEM.
-    message(STATUS "Dependency '${NAME}' not specified as a SYSTEM or LIVE dependency, assuming SYSTEM.")
-    set(ARG_VAD_${NAME}_SYSTEM YES)
-  elseif(ARG_VAD_${NAME}_SYSTEM)
+    message(STATUS "Dependency '${_VAD_NAME}' not specified as a SYSTEM or LIVE dependency, assuming SYSTEM.")
+    set(ARG_VAD_${_VAD_NAME}_SYSTEM YES)
+  elseif(ARG_VAD_${_VAD_NAME}_SYSTEM)
     # SYSTEM dependency required.
-    message(STATUS "Dependency '${NAME}' specified as a SYSTEM dependency.")
+    message(STATUS "Dependency '${_VAD_NAME}' specified as a SYSTEM dependency.")
   else()
     # LIVE dependency required.
-    message(STATUS "Dependency '${NAME}' specified as a LIVE dependency.")
+    message(STATUS "Dependency '${_VAD_NAME}' specified as a LIVE dependency.")
   endif()

   # if(VAD_GIT_BRANCH AND VAD_GIT_COMMIT)
@@ -324,107 +324,107 @@
   # endif()

   # First thing, we try to read the dep properties from the VAD file, if provided.
-  find_file(VAD_${NAME}_FILE VAD_${NAME}.cmake ${CMAKE_MODULE_PATH})
-  if(VAD_${NAME}_FILE)
-    message(STATUS "VAD file 'VAD_${NAME}.cmake' was found at '${VAD_${NAME}_FILE}'. The VAD file will now be parsed.")
-    include(${VAD_${NAME}_FILE})
+  find_file(VAD_${_VAD_NAME}_FILE VAD_${_VAD_NAME}.cmake ${CMAKE_MODULE_PATH})
+  if(VAD_${_VAD_NAME}_FILE)
+    message(STATUS "VAD file 'VAD_${_VAD_NAME}.cmake' was found at '${VAD_${_VAD_NAME}_FILE}'. The VAD file will now be parsed.")
+    include(${VAD_${_VAD_NAME}_FILE})
     if(GIT_REPO)
-      if(ARG_VAD_${NAME}_LIVE)
-        message(STATUS "VAD file for dependency ${NAME} specifies git repo: ${GIT_REPO}")
-      endif()
-      set(VAD_${NAME}_GIT_REPO_FILE ${GIT_REPO})
+      if(ARG_VAD_${_VAD_NAME}_LIVE)
+        message(STATUS "VAD file for dependency ${_VAD_NAME} specifies git repo: ${GIT_REPO}")
+      endif()
+      set(VAD_${_VAD_NAME}_GIT_REPO_FILE ${GIT_REPO})
       unset(GIT_REPO)
     endif()
     if(GIT_CLONE_OPTS)
-      if(ARG_VAD_${NAME}_LIVE)
-        message(STATUS "VAD file for dependency ${NAME} specifies git clone options: ${GIT_CLONE_OPTS}")
-      endif()
-      set(VAD_${NAME}_GIT_CLONE_OPTS_FILE ${GIT_CLONE_OPTS})
+      if(ARG_VAD_${_VAD_NAME}_LIVE)
+        message(STATUS "VAD file for dependency ${_VAD_NAME} specifies git clone options: ${GIT_CLONE_OPTS}")
+      endif()
+      set(VAD_${_VAD_NAME}_GIT_CLONE_OPTS_FILE ${GIT_CLONE_OPTS})
       unset(GIT_CLONE_OPTS)
     endif()
     # TODO: branch/commit.
     if(GIT_BRANCH)
-      message(STATUS "Git branch for dependency ${NAME} read from VAD file: ${GIT_BRANCH}")
+      message(STATUS "Git branch for dependency ${_VAD_NAME} read from VAD file: ${GIT_BRANCH}")
       set(VAD_GIT_BRANCH_CUR ${GIT_BRANCH})
       unset(GIT_BRANCH)
     endif()
     if(GIT_COMMIT)
-      message(STATUS "Git commit for dependency ${NAME} read from VAD file: ${GIT_COMMIT}")
+      message(STATUS "Git commit for dependency ${_VAD_NAME} read from VAD file: ${GIT_COMMIT}")
       set(VAD_GIT_COMMIT_CUR ${GIT_COMMIT})
       unset(GIT_COMMIT)
     endif()
   else()
-    message(STATUS "No VAD file 'VAD_${NAME}.cmake' was found.")
+    message(STATUS "No VAD file 'VAD_${_VAD_NAME}.cmake' was found.")
   endif()
   # Unset the variable from cache.
-  unset(VAD_${NAME}_FILE CACHE)
+  unset(VAD_${_VAD_NAME}_FILE CACHE)

   # TODO: same for branch and commit.
-  if(VAD_${NAME}_GIT_REPO)
+  if(VAD_${_VAD_NAME}_GIT_REPO)
     # Git repo was passed from command line or this is not the first run.
-    if(ARG_VAD_${NAME}_LIVE)
-      message(STATUS "Final git repo address for dependency ${NAME} is from cache: ${VAD_${NAME}_GIT_REPO}")
-    endif()
-  else()
-    if(ARG_VAD_${NAME}_GIT_REPO)
+    if(ARG_VAD_${_VAD_NAME}_LIVE)
+      message(STATUS "Final git repo address for dependency ${_VAD_NAME} is from cache: ${VAD_${_VAD_NAME}_GIT_REPO}")
+    endif()
+  else()
+    if(ARG_VAD_${_VAD_NAME}_GIT_REPO)
       # Git repo passed as function argument, overrides setting from file.
-      if(ARG_VAD_${NAME}_LIVE)
-        message(STATUS "Final git repo address for dependency ${NAME} is from function argument: ${ARG_VAD_${NAME}_GIT_REPO}")
-      endif()
-      set(VAD_${NAME}_GIT_REPO ${ARG_VAD_${NAME}_GIT_REPO} CACHE INTERNAL "")
-    elseif(VAD_${NAME}_GIT_REPO_FILE)
+      if(ARG_VAD_${_VAD_NAME}_LIVE)
+        message(STATUS "Final git repo address for dependency ${_VAD_NAME} is from function argument: ${ARG_VAD_${_VAD_NAME}_GIT_REPO}")
+      endif()
+      set(VAD_${_VAD_NAME}_GIT_REPO ${ARG_VAD_${_VAD_NAME}_GIT_REPO} CACHE INTERNAL "")
+    elseif(VAD_${_VAD_NAME}_GIT_REPO_FILE)
       # Git repository coming from the file.
-      if(ARG_VAD_${NAME}_LIVE)
-        message(STATUS "Final git repo address for dependency ${NAME} is from file: ${VAD_${NAME}_GIT_REPO_FILE}")
-      endif()
-      set(VAD_${NAME}_GIT_REPO ${VAD_${NAME}_GIT_REPO_FILE} CACHE INTERNAL "")
-    endif()
-  endif()
-
-  if(VAD_${NAME}_GIT_CLONE_OPTS)
+      if(ARG_VAD_${_VAD_NAME}_LIVE)
+        message(STATUS "Final git repo address for dependency ${_VAD_NAME} is from file: ${VAD_${_VAD_NAME}_GIT_REPO_FILE}")
+      endif()
+      set(VAD_${_VAD_NAME}_GIT_REPO ${VAD_${_VAD_NAME}_GIT_REPO_FILE} CACHE INTERNAL "")
+    endif()
+  endif()
+
+  if(VAD_${_VAD_NAME}_GIT_CLONE_OPTS)
     # Git clone options were passed from command line or this is not the first run.
-    if(ARG_VAD_${NAME}_LIVE)
-      message(STATUS "Final git clone options for dependency ${NAME} are from cache: ${VAD_${NAME}_GIT_CLONE_OPTS}")
-    endif()
-  else()
-    if(ARG_VAD_${NAME}_GIT_CLONE_OPTS)
+    if(ARG_VAD_${_VAD_NAME}_LIVE)
+      message(STATUS "Final git clone options for dependency ${_VAD_NAME} are from cache: ${VAD_${_VAD_NAME}_GIT_CLONE_OPTS}")
+    endif()
+  else()
+    if(ARG_VAD_${_VAD_NAME}_GIT_CLONE_OPTS)
       # Git clone options passed as function argument, overrides setting from file.
-      if(ARG_VAD_${NAME}_LIVE)
-        message(STATUS "Final git clone options for dependency ${NAME} are from function argument: ${ARG_VAD_${NAME}_GIT_CLONE_OPTS}")
-      endif()
-      set(VAD_${NAME}_GIT_CLONE_OPTS ${ARG_VAD_${NAME}_GIT_CLONE_OPTS} CACHE INTERNAL "")
-    elseif(VAD_${NAME}_GIT_CLONE_OPTS_FILE)
+      if(ARG_VAD_${_VAD_NAME}_LIVE)
+        message(STATUS "Final git clone options for dependency ${_VAD_NAME} are from function argument: ${ARG_VAD_${_VAD_NAME}_GIT_CLONE_OPTS}")
+      endif()
+      set(VAD_${_VAD_NAME}_GIT_CLONE_OPTS ${ARG_VAD_${_VAD_NAME}_GIT_CLONE_OPTS} CACHE INTERNAL "")
+    elseif(VAD_${_VAD_NAME}_GIT_CLONE_OPTS_FILE)
       # Git clone options coming from the file.
-      if(ARG_VAD_${NAME}_LIVE)
-        message(STATUS "Final git clone options for dependency ${NAME} are from file: ${VAD_${NAME}_GIT_CLONE_OPTS_FILE}")
-      endif()
-      set(VAD_${NAME}_GIT_CLONE_OPTS ${VAD_${NAME}_GIT_CLONE_OPTS_FILE} CACHE INTERNAL "")
-    endif()
-  endif()
-
-  if(ARG_VAD_${NAME}_SYSTEM)
-    vad_system(${NAME} ${ARG_VAD_${NAME}_UNPARSED_ARGUMENTS})
-    if(VAD_${NAME}_SYSTEM_NOT_FOUND)
-      message(STATUS "Dependency ${NAME} was not found system-wide, vigra_add_dep() will exit without marking the dependency as satisfied.")
-      unset(VAD_${NAME}_SYSTEM_NOT_FOUND CACHE)
+      if(ARG_VAD_${_VAD_NAME}_LIVE)
+        message(STATUS "Final git clone options for dependency ${_VAD_NAME} are from file: ${VAD_${_VAD_NAME}_GIT_CLONE_OPTS_FILE}")
+      endif()
+      set(VAD_${_VAD_NAME}_GIT_CLONE_OPTS ${VAD_${_VAD_NAME}_GIT_CLONE_OPTS_FILE} CACHE INTERNAL "")
+    endif()
+  endif()
+
+  if(ARG_VAD_${_VAD_NAME}_SYSTEM)
+    vad_system(${_VAD_NAME} ${ARG_VAD_${_VAD_NAME}_UNPARSED_ARGUMENTS})
+    if(VAD_${_VAD_NAME}_SYSTEM_NOT_FOUND)
+      message(STATUS "Dependency ${_VAD_NAME} was not found system-wide, vigra_add_dep() will exit without marking the dependency as satisfied.")
+      unset(VAD_${_VAD_NAME}_SYSTEM_NOT_FOUND CACHE)
       vad_reset_hooks()
       return()
     endif()
-  elseif(ARG_VAD_${NAME}_LIVE)
+  elseif(ARG_VAD_${_VAD_NAME}_LIVE)
     # Create the external deps directory if it does not exist already.
     if(NOT EXISTS "${VAD_EXTERNAL_ROOT}")
       message(STATUS "Directory '${VAD_EXTERNAL_ROOT}' does not exist, creating it.")
       file(MAKE_DIRECTORY "${VAD_EXTERNAL_ROOT}")
     endif()
-    vad_live(${NAME})
+    vad_live(${_VAD_NAME})
   endif()

   # Mark the dep as satisfied.
-  message(STATUS "Marking dependency ${NAME} as satisfied.")
+  message(STATUS "Marking dependency ${_VAD_NAME} as satisfied.")
   # NOTE: the flag be set as a "global" variable, that is available from everywhere, but not in the cache - otherwise
   # subsequent cmake runs will break. Emulate global variables via global properties:
   # http://stackoverflow.com/questions/19345930/cmake-lost-in-the-concept-of-global-variables-and-parent-scope-or-add-subdirec
-  set_property(GLOBAL PROPERTY VAD_DEP_${NAME}_SATISFIED YES)
+  set_property(GLOBAL PROPERTY VAD_DEP_${_VAD_NAME}_SATISFIED YES)

   # Reset the hooks at the end as well for cleanup purposes.
   vad_reset_hooks()


fix typo for cmake function add_library_tested

--- cmake/AddLibraryTested.cmake
+++ cmake/AddLibraryTested.cmake
@@ -5,4 +5,4 @@
   # and remember it for the list of libraries
   list(APPEND ALILIBSTESTED ${NAME})
   set(ALILIBSTESTED ${ALILIBSTESTED} CACHE INTERNAL "ALILIBSTESTED")
-endfunction(add_alice_library)
+endfunction(add_library_tested)


linux macro changed

linux macro changed

--- cmake/ECMQt4To5Porting.cmake
+++ cmake/ECMQt4To5Porting.cmake
@@ -151,7 +151,9 @@
 )
 set(QT_QTGUI_LIBRARY ${QT_QTGUI_LIBRARIES})

-set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+IF(WIN32)
+    set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+ENDIF()

 set(_qt_modules
   Core


ASAN: append thread libs as needed for gcc with ASAN

This adds the thread link with --as-needed when ASAN option is enabled
on gcc builds.

The if ENABLE_ASAN block was also moved below the GCC block so it gets
appended to both clang and gcc build in the same order.

--- cmake/ElektraCompiling.cmake
+++ cmake/ElektraCompiling.cmake
@@ -65,23 +65,6 @@
 	endif()
 endif()

-if (ENABLE_ASAN)
-	set (EXTRA_FLAGS "${EXTRA_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
-	set (ASAN_LIBRARY "-lasan") #this is needed for GIR to put asan in front
-	if (CMAKE_COMPILER_IS_GNUCXX)
-		set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
-		# this is currently a workaround so gtests compile with ASAN
-		find_package(Threads)
-		set (COMMON_FLAGS "${COMMON_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
-	endif ()
-	set (DISABLE_LSAN "LSAN_OPTIONS=detect_leaks=0") #this is needed so ASAN is not used during GIR compilation
-	message (STATUS "To use ASAN:\n"
-		 "   ASAN_OPTIONS=symbolize=1 ASAN_SYMBOLIZER_PATH=$(shell which llvm-symbolizer) ./bin \n"
-		 "   It could also happen that you need to preload ASAN library: \n"
-		 "   e.g. LD_PRELOAD=/usr/lib/clang/3.8.0/lib/linux/libclang_rt.asan-x86_64.so ./bin \n"
-	)
-endif ()
-
 if (CMAKE_COMPILER_IS_GNUCXX)
 	execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
 	if (WIN32)
@@ -117,6 +100,22 @@
 	set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
 endif ()

+if (ENABLE_ASAN)
+	set (EXTRA_FLAGS "${EXTRA_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+	set (ASAN_LIBRARY "-lasan") #this is needed for GIR to put asan in front
+	if (CMAKE_COMPILER_IS_GNUCXX)
+		set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
+		# this is needed because of wrong pthread detection https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69443
+		find_package(Threads)
+		set (THREAD_LIBS_AS_NEEDED "${COMMON_FLAGS} -Wl,--as-needed ${CMAKE_THREAD_LIBS_INIT}")
+	endif ()
+	set (DISABLE_LSAN "LSAN_OPTIONS=detect_leaks=0") #this is needed so ASAN is not used during GIR compilation
+	message (STATUS "To use ASAN:\n"
+		 "   ASAN_OPTIONS=symbolize=1 ASAN_SYMBOLIZER_PATH=$(shell which llvm-symbolizer) ./bin \n"
+		 "   It could also happen that you need to preload ASAN library: \n"
+		 "   e.g. LD_PRELOAD=/usr/lib/clang/3.8.0/lib/linux/libclang_rt.asan-x86_64.so ./bin \n"
+	)
+endif ()

 #
 # Common flags can be used by both C and C++
@@ -152,8 +151,8 @@
 #
 # Merge all flags
 #
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_STD} ${EXTRA_FLAGS} ${COMMON_FLAGS} -Wsign-compare -Wfloat-equal -Wformat-security")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STD} ${EXTRA_FLAGS} ${CXX_EXTRA_FLAGS} ${COMMON_FLAGS}")
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_STD} ${EXTRA_FLAGS} ${COMMON_FLAGS} -Wsign-compare -Wfloat-equal -Wformat-security ${THREAD_LIBS_AS_NEEDED}")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STD} ${EXTRA_FLAGS} ${CXX_EXTRA_FLAGS} ${COMMON_FLAGS} ${THREAD_LIBS_AS_NEEDED}")

 message (STATUS "C flags are ${CMAKE_C_FLAGS}")
 message (STATUS "CXX flags are ${CMAKE_CXX_FLAGS}")


Disabled PCH support for gcc >= 6.0.0

Disabled PCH support for gcc >= 6.0.0

Command line generation routine uses "-isystem" to include headers outside of "<opencv>/modules" folder, but GCC 6 does not work when passed "-isystem /usr/include" option.

--- cmake/OpenCVPCHSupport.cmake
+++ cmake/OpenCVPCHSupport.cmake
@@ -19,7 +19,7 @@
         ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
         OUTPUT_VARIABLE gcc_compiler_version)
     #MESSAGE("GCC Version: ${gcc_compiler_version}")
-    IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
+    IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
         SET(PCHSupport_FOUND TRUE)
     ENDIF()


Fix warning level for comments

Fix warning level for comments

--- cmake/PlatformLinuxGCC.cmake
+++ cmake/PlatformLinuxGCC.cmake
@@ -57,6 +57,7 @@
       -Wno-error=conversion
       -Wno-error=switch
       -Wno-error=comment
+      -Wno-error=strict-aliasing

       -fPIC         # -> use position independent code
       -fvisibility=hidden # ->


more flag for coverage

more flag for coverage

--- cmake/compilation_flag.cmake
+++ cmake/compilation_flag.cmake
@@ -4,15 +4,17 @@
                             -Wno-unused-local-typedefs -Wno-unused-parameter")

 # -fsanitize=undefined fail on appveyor (16.04)
-set(CMAKE_CXX_FLAGS_DEBUG "-O1 -fsanitize=address -fsanitize=leak -fno-sanitize=alignment")
+set(CMAKE_CXX_FLAGS_DEBUG "-fsanitize=address -fsanitize=leak -fno-sanitize=alignment")
+
 # Disable '-fomit-frame-pointer' during profiling
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -fomit-frame-pointer")

 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     set(COMPILER_FLAGS_WARNING "${COMPILER_FLAGS_WARNING} -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wrestrict")

-    # Might add -mfpmath=sse -finline-limit=???
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -fno-inline -fno-inline-small-functions -fno-default-inline --coverage")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fdevirtualize-at-ltrans -floop-interchange -floop-strip-mine -floop-block -fgraphite-identity -funsafe-loop-optimizations -static-libstdc++")
+
     # # Bin utils issue with gcc 8 on 16.04
     # # -flto -fno-fat-lto-objects -Wno-odr
     # if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
@@ -22,6 +24,8 @@
     # Clang is only used for additionals warnings and usage of the sanitizers
     # (Not interested by llvm libc++ at the moment)
     set(COMPILER_FLAG_STANDARD "${COMPILER_FLAG_STANDARD} -stdlib=libstdc++")
+
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O1")
 endif()

 set(CMAKE_CXX_FLAGS "${COMPILER_FLAGS_STANDARD} ${COMPILER_FLAGS_WARNING}")


Revert "[CMake] Remove LINK_LIBRARIES option from _add_swift_executable_single"

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -2078,7 +2078,7 @@
   cmake_parse_arguments(SWIFTEXE_SINGLE
     "EXCLUDE_FROM_ALL"
     "SDK;ARCHITECTURE"
-    "DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_FAT_LIBRARIES;COMPILE_FLAGS"
+    "DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_LIBRARIES;LINK_FAT_LIBRARIES;COMPILE_FLAGS"
     ${ARGN})

   set(SWIFTEXE_SINGLE_SOURCES ${SWIFTEXE_SINGLE_UNPARSED_ARGUMENTS})
@@ -2196,7 +2196,7 @@
       BINARY_DIR ${SWIFT_RUNTIME_OUTPUT_INTDIR}
       LIBRARY_DIR ${SWIFT_LIBRARY_OUTPUT_INTDIR})

-  target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_FAT_LIBRARIES})
+  target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES} ${SWIFTEXE_SINGLE_LINK_FAT_LIBRARIES})
   swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_COMPONENT_DEPENDS})

   set_target_properties(${name}


[build] Don't attempt to build the runtime with coverage (#2958)

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -789,7 +789,7 @@
   set(link_flags ${SWIFTLIB_SINGLE_LINK_FLAGS})

   # Add variant-specific flags.
-  if(SWIFTLIB_SINGLE_IS_STDLIB)
+  if(SWIFTLIB_SINGLE_TARGET_LIBRARY)
     set(build_type "${SWIFT_STDLIB_BUILD_TYPE}")
     set(enable_assertions "${SWIFT_STDLIB_ASSERTIONS}")
   else()


Ignore .gitignore on install.

Ignore .gitignore on install.

--- install_java.cmake
+++ install_java.cmake
@@ -50,8 +50,8 @@
 vespa_install_script(config-model/src/main/perl/vespa-replicate-log-stream bin)
 vespa_install_script(config-model/src/main/sh/validate-application bin)

-install(DIRECTORY config-model/src/main/resources/schema DESTINATION share/vespa)
-install(DIRECTORY config-model/src/main/resources/schema DESTINATION share/vespa/schema/version/6.x)
+install(DIRECTORY config-model/src/main/resources/schema DESTINATION share/vespa PATTERN ".gitignore" EXCLUDE)
+install(DIRECTORY config-model/src/main/resources/schema DESTINATION share/vespa/schema/version/6.x PATTERN ".gitignore" EXCLUDE)

 install(FILES jdisc_core/src/main/perl/jdisc_logfmt.1 DESTINATION man/man1)


Reduce size of build name in Windows because path are too long

git-svn-id: 8b72b58fb31a931b6e9a2bd3bb08bc6614045fb1@3408 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- test/openVibeTests.cmake
+++ test/openVibeTests.cmake
@@ -20,7 +20,7 @@
 endmacro(getuname)

 IF(WIN32)
-	SET(distrib ${CMAKE_SYSTEM})
+	SET(distrib ""})
 	SET(distrib-release "")
 ELSE(WIN32)
 	find_program(LSB_RELEASE NAMES lsb_release)


Fix #51

Fix #51

As noted by @jbfitbit (Thanks for finding that piece of important information!), Apple dropped 32-bit support in 10.3.2.

--- ios.toolchain.cmake
+++ ios.toolchain.cmake
@@ -207,11 +207,11 @@

 set(PLATFORM_INT "${PLATFORM}" CACHE STRING "Type of platform for which the build targets.")

-# Handle the case where we are targeting iOS and a version above 10.0 (32-bit support dropped officially)
-if(PLATFORM_INT STREQUAL "OS" AND DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.0)
+# Handle the case where we are targeting iOS and a version above 10.3.2 (32-bit support dropped officially)
+if(PLATFORM_INT STREQUAL "OS" AND DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.3.2)
   set(PLATFORM_INT "OS64")
   message(STATUS "Targeting minimum SDK version ${DEPLOYMENT_TARGET}. Dropping 32-bit support.")
-elseif(PLATFORM_INT STREQUAL "SIMULATOR" AND DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.0)
+elseif(PLATFORM_INT STREQUAL "SIMULATOR" AND DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.3.2)
   set(PLATFORM_INT "SIMULATOR64")
   message(STATUS "Targeting minimum SDK version ${DEPLOYMENT_TARGET}. Dropping 32-bit support.")
 endif()


Remove the caching from the cmake attributes when using Xcode as generator to prevent unwanted behavior in local cmake implementations.

--- ios.toolchain.cmake
+++ ios.toolchain.cmake
@@ -341,7 +341,7 @@
 if(USED_CMAKE_GENERATOR MATCHES "Xcode")
   set(CMAKE_OSX_SYSROOT "${SDK_NAME}" CACHE INTERNAL "")
   if(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM)
-    set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "123456789A" CACHE INTERNAL "")
+    set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "123456789A")
   endif()
 endif()

@@ -461,7 +461,7 @@
   endif()
   # Provide flags for a combined FAT library build on newer CMake versions
   if(PLATFORM_INT MATCHES ".*COMBINED")
-    set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO" CACHE INTERNAL "" ${FORCE_CACHE})
+    set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO")
     set(CMAKE_IOS_INSTALL_COMBINED YES CACHE INTERNAL "" ${FORCE_CACHE})
     message(STATUS "Will combine built (static) artifacts into FAT lib...")
   endif()
@@ -563,27 +563,27 @@

 if(ENABLE_BITCODE_INT)
   set(BITCODE "-fembed-bitcode")
-  set(CMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE "bitcode" CACHE INTERNAL "")
-  set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES" CACHE INTERNAL "")
+  set(CMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE "bitcode")
+  set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
 else()
   set(BITCODE "")
-  set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO" CACHE INTERNAL "")
+  set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
 endif()

 if(ENABLE_ARC_INT)
   set(FOBJC_ARC "-fobjc-arc")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "YES" CACHE INTERNAL "")
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "YES")
 else()
   set(FOBJC_ARC "-fno-objc-arc")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "NO" CACHE INTERNAL "")
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "NO")
 endif()

 if(NOT ENABLE_VISIBILITY_INT)
   set(VISIBILITY "-fvisibility=hidden")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN "YES" CACHE INTERNAL "")
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN "YES")
 else()
   set(VISIBILITY "")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN "NO" CACHE INTERNAL "")
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN "NO")
 endif()

 if(NOT IOS_TOOLCHAIN_HAS_RUN)


Updated git hash to test build using Slicer nightly dashboard

--- SuperBuild/External_VMTK.cmake
+++ SuperBuild/External_VMTK.cmake
@@ -23,8 +23,10 @@

   ExternalProject_Add(${proj}
     ${${proj}_EP_ARGS}
-    GIT_REPOSITORY "${git_protocol}://github.com/vmtk/vmtk.git"
-    GIT_TAG "2cecfb427a45bbb5240de687929954c60ebab06f" # "more debugging test for mac os 10.13" (58c8829) commit broke Python wrapping, so we need to use the one before
+    #GIT_REPOSITORY "${git_protocol}://github.com/vmtk/vmtk.git"
+    #GIT_TAG "2cecfb427a45bbb5240de687929954c60ebab06f" # "more debugging test for mac os 10.13" (58c8829) commit broke Python wrapping, so we need to use the one before
+    GIT_REPOSITORY "${git_protocol}://github.com/rlizzo/vmtk"
+    GIT_TAG "slicer-fix"
     SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
     BINARY_DIR ${proj}-build
     CMAKE_CACHE_ARGS


Fixed PATH corruption on Windows for try_compile calls.

On Windows, try_compile calls failed mysteriously due to strange PATH
environment variables. This change fixed that.

--- CMake/ctkMacroSetPaths.cmake
+++ CMake/ctkMacroSetPaths.cmake
@@ -26,11 +26,11 @@
 MACRO(ctkMacroSetPaths PATH_LIST)
   FOREACH(p ${PATH_LIST})
     IF(WIN32)
-      SET(ENV{PATH} ${p};$ENV{PATH})
+      SET(ENV{PATH} "${p};$ENV{PATH}")
     ELSEIF(APPLE)
-      SET(ENV{DYLD_LIBRARY_PATH} ${p}:$ENV{DYLD_LIBRARY_PATH})
+      SET(ENV{DYLD_LIBRARY_PATH} "${p}:$ENV{DYLD_LIBRARY_PATH}")
     ELSE()
-      SET(ENV{LD_LIBRARY_PATH} ${p}:$ENV{LD_LIBRARY_PATH})
+      SET(ENV{LD_LIBRARY_PATH} "${p}:$ENV{LD_LIBRARY_PATH}")
     ENDIF()
   ENDFOREACH()
 ENDMACRO()


STYLE: Make internal-use CMake variables lowercase in KWStyle.cmake

This better follows CMake style conventions.

Change-Id: I40a4a71e4c0d11ab0c2e12ee8ef34734e9f439af

--- Utilities/KWStyle/KWStyle.cmake
+++ Utilities/KWStyle/KWStyle.cmake
@@ -15,24 +15,24 @@
     )

   # Define and configure configuration files
-  set(KWSTYLE_ITK_CONFIGURATION_FILE
+  set(kwstyle_itk_configuration_file
     ${ITK_SOURCE_DIR}/Utilities/KWStyle/ITK.kws.xml
     )
-  set(KWSTYLE_ITK_CODE_FILES_LIST_FILE
+  set(kwstyle_itk_code_files_list_file
     ${ITK_BINARY_DIR}/Utilities/KWStyle/ITKCodeFiles.txt
     )
   configure_file( # KWStyle requires that the files list be absolute paths
     ${ITK_SOURCE_DIR}/Utilities/KWStyle/ITKCodeFiles.txt.in
-    ${KWSTYLE_ITK_CODE_FILES_LIST_FILE}
+    ${kwstyle_itk_code_files_list_file}
     )
-  set(KWSTYLE_ITK_EXAMPLES_FILES_LIST_FILE
+  set(kwstyle_itk_examples_files_list_file
     ${ITK_BINARY_DIR}/Utilities/KWStyle/ITKExamplesFiles.txt
     )
   configure_file( # KWStyle requires that the files list be absolute paths
     ${ITK_SOURCE_DIR}/Utilities/KWStyle/ITKExamplesFiles.txt.in
-    ${KWSTYLE_ITK_EXAMPLES_FILES_LIST_FILE}
+    ${kwstyle_itk_examples_files_list_file}
     )
-  set(KWSTYLE_ITK_OVERWRITE_FILE
+  set(kwstyle_itk_overwrite_file
     ${ITK_SOURCE_DIR}/Utilities/KWStyle/ITKOverwrite.txt
     )

@@ -54,61 +54,61 @@
   mark_as_advanced(KWSTYLE_USE_GCC_FORMAT)
   mark_as_advanced(KWSTYLE_USE_MSVC_FORMAT)

-  set(KWSTYLE_EDITOR_FORMAT "")
+  set(kwstyle_editor_format "")
   if(KWSTYLE_USE_VIM_FORMAT)
-    list(APPEND KWSTYLE_EDITOR_FORMAT -vim)
+    list(APPEND kwstyle_editor_format -vim)
   endif()
   if(KWSTYLE_USE_GCC_FORMAT)
-    list(APPEND KWSTYLE_EDITOR_FORMAT -gcc)
+    list(APPEND kwstyle_editor_format -gcc)
   endif()
   if(KWSTYLE_USE_MSVC_FORMAT)
-    list(APPEND KWSTYLE_EDITOR_FORMAT -msvc)
+    list(APPEND kwstyle_editor_format -msvc)
   endif()

   list(LENGTH
-    KWSTYLE_EDITOR_FORMAT
-    KWSTYLE_EDITOR_FORMAT_LENGTH
+    kwstyle_editor_format
+    kwstyle_editor_format_length
     )
-  if(KWSTYLE_EDITOR_FORMAT_LENGTH GREATER 1)
+  if(kwstyle_editor_format_length GREATER 1)
     message(FATAL_ERROR "At most, only one of KWSTYLE_USE_*_FORMAT can be set to TRUE.")
   endif()

   # Add build target and CTest test
-  set(KWSTYLE_COMMON_ARGUMENTS
-    -xml ${KWSTYLE_ITK_CONFIGURATION_FILE}
+  set(kwstyle_common_arguments
+    -xml ${kwstyle_itk_configuration_file}
     -v
-    -o ${KWSTYLE_ITK_OVERWRITE_FILE}
+    -o ${kwstyle_itk_overwrite_file}
     )
   add_custom_target(StyleCheckCode
     COMMAND ${KWSTYLE_EXECUTABLE}
-      ${KWSTYLE_COMMON_ARGUMENTS}
-      -D ${KWSTYLE_ITK_CODE_FILES_LIST_FILE}
-      ${KWSTYLE_EDITOR_FORMAT}
+      ${kwstyle_common_arguments}
+      -D ${kwstyle_itk_code_files_list_file}
+      ${kwstyle_editor_format}
     COMMENT "Coding Style Checker"
-    WORKING_DIRECTORY ${ITK_SOURCE_DIR} # the paths in KWSTYLE_CONFIGURATION_FILE are relative
+    WORKING_DIRECTORY ${ITK_SOURCE_DIR} # the paths in kwstyle_itk_configuration_file are relative
     )
   add_custom_target(StyleCheckExamples
     COMMAND ${KWSTYLE_EXECUTABLE}
-      ${KWSTYLE_COMMON_ARGUMENTS}
-      -D ${KWSTYLE_ITK_EXAMPLES_FILES_LIST_FILE}
-      ${KWSTYLE_EDITOR_FORMAT}
+      ${kwstyle_common_arguments}
+      -D ${kwstyle_itk_examples_files_list_file}
+      ${kwstyle_editor_format}
     COMMENT "Examples Style Checker"
-    WORKING_DIRECTORY ${ITK_SOURCE_DIR} # the paths in KWSTYLE_CONFIGURATION_FILE are relative
+    WORKING_DIRECTORY ${ITK_SOURCE_DIR} # the paths in kwstyle_itk_configuration_file are relative
     )
   if(BUILD_TESTING)
     set(itk-module KWStyle)
     # for uniformity and brevity, test will always output GCC-style
     itk_add_test(NAME KWStyleCodeTest
       COMMAND ${KWSTYLE_EXECUTABLE}
-        ${KWSTYLE_COMMON_ARGUMENTS}
-        -D ${KWSTYLE_ITK_CODE_FILES_LIST_FILE}
+        ${kwstyle_common_arguments}
+        -D ${kwstyle_itk_code_files_list_file}
         -gcc
       WORKING_DIRECTORY ${ITK_SOURCE_DIR}
       )
     itk_add_test(NAME KWStyleExamplesTest
       COMMAND ${KWSTYLE_EXECUTABLE}
-        ${KWSTYLE_COMMON_ARGUMENTS}
-        -D ${KWSTYLE_ITK_EXAMPLES_FILES_LIST_FILE}
+        ${kwstyle_common_arguments}
+        -D ${kwstyle_itk_examples_files_list_file}
         -gcc
       WORKING_DIRECTORY ${ITK_SOURCE_DIR}
       )


Build static executables on unix.

Build static executables on unix.

--- src/inserts/generate.cmake
+++ src/inserts/generate.cmake
@@ -7,7 +7,9 @@

 # CPPAN_BUILD_SHARED_LIBS has influence on config vars
 if (EXECUTABLE)
-    if (NINJA)
+    # on ninja shared libs do not work (reason is lost)
+    # on unix the issue is with wrong RPATH, so executables can not load their dependent .so libs
+    if (NINJA OR UNIX)
         # TODO: try to work 0->1 <- why? maybe left as is?
         set(CPPAN_BUILD_SHARED_LIBS 0)
     endif()


fix typo bug on wx_VER

fix typo bug on wx_VER

--- projects/wx.cmake
+++ projects/wx.cmake
@@ -27,7 +27,7 @@
   endif()
   if(MSVC)
     set(XP_CONFIGURE -DWX_VERSION:STRING=${wx_VER})
-    xpCmakeBuild(wx${wx_VER} wx${WX_VER}_wxcmake${wx_VER} "${XP_CONFIGURE}")
+    xpCmakeBuild(wx${wx_VER} wx${wx_VER}_wxcmake${wx_VER} "${XP_CONFIGURE}")
     set(config msvc)
     list(APPEND wx${wx_VER}targets wx${wx_VER}_${config})
   else()


Add license to installer

Add license to installer

--- cmake/CeinmsPack.cmake
+++ cmake/CeinmsPack.cmake
@@ -9,7 +9,7 @@
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Calibrated EMG-Informed NeuroMusculoSkeletal modeling")
 set(CPACK_PACKAGE_VENDOR "The CEINMS team")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
-#set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/Copyright.txt")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
 set(CPACK_PACKAGE_VERSION_MAJOR ${CEINMS_MAJOR_VERSION})
 set(CPACK_PACKAGE_VERSION_MINOR ${CEINMS_MINOR_VERSION})
 set(CPACK_PACKAGE_VERSION_PATCH ${CEINMS_PATCH_VERSION})


Update cmake

Update cmake

--- cmake/FindLuaJIT.cmake
+++ cmake/FindLuaJIT.cmake
@@ -7,6 +7,8 @@
 set(LUAJIT_SEARCH_PATHS
     /usr/local
     /usr
+    c:/projects/LuaJIT-2.0.5
+    c:/projects/LuaJIT-2.0.5/src
     c:/usr/local/lib
     c:/usr/local
     c:/usr/lib


propagate attached target type property

propagate attached target type property

--- cmake/LLVMIRUtil.cmake
+++ cmake/LLVMIRUtil.cmake
@@ -65,6 +65,7 @@
   # if the property does not exist the related variable is not defined
   get_property(IN_FILES TARGET ${DEPENDS_TRGT} PROPERTY SOURCES)
   get_property(LINKER_LANGUAGE TARGET ${DEPENDS_TRGT} PROPERTY LINKER_LANGUAGE)
+  get_property(EXTERNAL_TYPE TARGET ${DEPENDS_TRGT} PROPERTY TYPE)

   debug(
     "@llvmir_attach_bc_target ${DEPENDS_TRGT} linker lang: ${LINKER_LANGUAGE}")
@@ -137,6 +138,7 @@
   add_custom_target(${TRGT} DEPENDS ${FULL_OUT_LLVMIR_FILES})

   set_property(TARGET ${TRGT} PROPERTY LLVMIR_TYPE ${LLVMIR_BINARY_TYPE})
+  set_property(TARGET ${TRGT} PROPERTY LLVMIR_EXTERNAL_TYPE ${EXTERNAL_TYPE})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_DIR ${WORK_DIR})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_FILES ${OUT_LLVMIR_FILES})
   set_property(TARGET ${TRGT} PROPERTY LINKER_LANGUAGE ${LINKER_LANGUAGE})
@@ -176,10 +178,12 @@
   set(OUT_LLVMIR_FILES "")
   set(FULL_OUT_LLVMIR_FILES "")

+  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)
+  get_property(LLVMIR_EXTERNAL_TYPE TARGET ${DEPENDS_TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE)
   get_property(IN_LLVMIR_DIR TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_DIR)
   get_property(IN_LLVMIR_FILES TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_FILES)
   get_property(LINKER_LANGUAGE TARGET ${DEPENDS_TRGT} PROPERTY LINKER_LANGUAGE)
-  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)

   if(NOT "${IN_LLVMIR_TYPE}" STREQUAL "${LLVMIR_BINARY_TYPE}")
     message(FATAL_ERROR "Cannot attach ${TRGT} to target of type: \
@@ -219,6 +223,8 @@
   add_custom_target(${TRGT} DEPENDS ${FULL_OUT_LLVMIR_FILES})

   set_property(TARGET ${TRGT} PROPERTY LLVMIR_TYPE ${LLVMIR_BINARY_TYPE})
+  set_property(TARGET ${TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE ${LLVMIR_EXTERNAL_TYPE})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_DIR ${WORK_DIR})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_FILES ${OUT_LLVMIR_FILES})
   set_property(TARGET ${TRGT} PROPERTY LINKER_LANGUAGE ${LINKER_LANGUAGE})
@@ -258,10 +264,12 @@
   set(OUT_LLVMIR_FILES "")
   set(FULL_OUT_LLVMIR_FILES "")

+  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)
+  get_property(LLVMIR_EXTERNAL_TYPE TARGET ${DEPENDS_TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE)
   get_property(IN_LLVMIR_DIR TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_DIR)
   get_property(IN_LLVMIR_FILES TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_FILES)
   get_property(LINKER_LANGUAGE TARGET ${DEPENDS_TRGT} PROPERTY LINKER_LANGUAGE)
-  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)

   if(NOT "${IN_LLVMIR_TYPE}" STREQUAL "${LLVMIR_BINARY_TYPE}")
     message(FATAL_ERROR "Cannot attach ${TRGT} to a ${IN_LLVMIR_TYPE} target.")
@@ -295,6 +303,8 @@
   add_custom_target(${TRGT} DEPENDS ${FULL_OUT_LLVMIR_FILES})

   set_property(TARGET ${TRGT} PROPERTY LLVMIR_TYPE ${LLVMIR_TEXT_TYPE})
+  set_property(TARGET ${TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE ${LLVMIR_EXTERNAL_TYPE})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_DIR ${WORK_DIR})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_FILES ${OUT_LLVMIR_FILES})
   set_property(TARGET ${TRGT} PROPERTY LINKER_LANGUAGE ${LINKER_LANGUAGE})
@@ -334,10 +344,12 @@
   set(OUT_LLVMIR_FILES "")
   set(FULL_OUT_LLVMIR_FILES "")

+  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)
+  get_property(LLVMIR_EXTERNAL_TYPE TARGET ${DEPENDS_TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE)
   get_property(IN_LLVMIR_DIR TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_DIR)
   get_property(IN_LLVMIR_FILES TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_FILES)
   get_property(LINKER_LANGUAGE TARGET ${DEPENDS_TRGT} PROPERTY LINKER_LANGUAGE)
-  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)

   if(NOT "${IN_LLVMIR_TYPE}" STREQUAL "${LLVMIR_TEXT_TYPE}")
     message(FATAL_ERROR "Cannot attach ${TRGT} to a ${IN_LLVMIR_TYPE} target.")
@@ -371,6 +383,8 @@
   add_custom_target(${TRGT} DEPENDS ${FULL_OUT_LLVMIR_FILES})

   set_property(TARGET ${TRGT} PROPERTY LLVMIR_TYPE ${LLVMIR_BINARY_TYPE})
+  set_property(TARGET ${TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE ${LLVMIR_EXTERNAL_TYPE})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_DIR ${WORK_DIR})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_FILES ${OUT_LLVMIR_FILES})
   set_property(TARGET ${TRGT} PROPERTY LINKER_LANGUAGE ${LINKER_LANGUAGE})
@@ -410,10 +424,12 @@
   set(OUT_LLVMIR_FILES "")
   set(FULL_OUT_LLVMIR_FILES "")

+  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)
+  get_property(LLVMIR_EXTERNAL_TYPE TARGET ${DEPENDS_TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE)
   get_property(INFILES TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_FILES)
   get_property(IN_LLVMIR_DIR TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_DIR)
   get_property(LINKER_LANGUAGE TARGET ${DEPENDS_TRGT} PROPERTY LINKER_LANGUAGE)
-  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)

   if(NOT "${IN_LLVMIR_TYPE}" STREQUAL "${LLVMIR_BINARY_TYPE}")
     message(FATAL_ERROR "Cannot attach ${TRGT} to a ${IN_LLVMIR_TYPE} target.")
@@ -438,6 +454,8 @@
   add_custom_target(${TRGT} DEPENDS ${FULL_OUT_LLVMIR_FILES})

   set_property(TARGET ${TRGT} PROPERTY LLVMIR_TYPE ${LLVMIR_BINARY_TYPE})
+  set_property(TARGET ${TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE ${LLVMIR_EXTERNAL_TYPE})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_DIR ${WORK_DIR})
   set_property(TARGET ${TRGT} PROPERTY LLVMIR_FILES ${OUT_LLVMIR_FILES})
   set_property(TARGET ${TRGT} PROPERTY LINKER_LANGUAGE ${LINKER_LANGUAGE})
@@ -493,10 +511,12 @@
   ## preamble
   llvmir_check_target_properties(${DEPENDS_TRGT})

+  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)
+  get_property(LLVMIR_EXTERNAL_TYPE TARGET ${DEPENDS_TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE)
   get_property(INFILES TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_FILES)
   get_property(IN_LLVMIR_DIR TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_DIR)
   get_property(LINKER_LANGUAGE TARGET ${DEPENDS_TRGT} PROPERTY LINKER_LANGUAGE)
-  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)

   if(NOT "${IN_LLVMIR_TYPE}" STREQUAL "${LLVMIR_BINARY_TYPE}")
     message(FATAL_ERROR "Cannot attach ${TRGT} to a ${IN_LLVMIR_TYPE} target.")
@@ -556,10 +576,12 @@
   ## preamble
   llvmir_check_target_properties(${DEPENDS_TRGT})

+  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)
+  get_property(LLVMIR_EXTERNAL_TYPE TARGET ${DEPENDS_TRGT}
+    PROPERTY LLVMIR_EXTERNAL_TYPE)
   get_property(INFILES TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_FILES)
   get_property(IN_LLVMIR_DIR TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_DIR)
   get_property(LINKER_LANGUAGE TARGET ${DEPENDS_TRGT} PROPERTY LINKER_LANGUAGE)
-  get_property(IN_LLVMIR_TYPE TARGET ${DEPENDS_TRGT} PROPERTY LLVMIR_TYPE)

   if(NOT "${IN_LLVMIR_TYPE}" STREQUAL "${LLVMIR_BINARY_TYPE}")
     message(FATAL_ERROR "Cannot attach ${TRGT} to a ${IN_LLVMIR_TYPE} target.")


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

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

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


COMP: Update DTIProcess, BRAINSFit and ResampleDTIlogEuclidean versions for compilation against ITKv4.4

--- CMake/FindExternalTools.cmake
+++ CMake/FindExternalTools.cmake
@@ -324,7 +324,7 @@
   SVN_REPOSITORY "http://www.nitrc.org/svn/dtiprocess/branches/Slicer4Extension" # /dtiprocess"
   SVN_USERNAME slicerbot
   SVN_PASSWORD slicer
-  SVN_REVISION -r 144 # 01/30/2013 version modified by Adrien for windows compilation # 137 # 01/16/2013 # 113 # 12/20/2012 updated for ITKv4.4.0
+  SVN_REVISION -r 149 # 01/31/2013 # 144 # 01/30/2013 version modified by Adrien for windows compilation # 137 # 01/16/2013 # 113 # 12/20/2012 updated for ITKv4.4.0
   )
 set( CMAKE_ExtraARGS
   -DBUILD_TESTING:BOOL=OFF
@@ -384,7 +384,7 @@
 # ===== BRAINSFit =============================================================
 set( SourceCodeArgs
   GIT_REPOSITORY "${git_protocol}://github.com/BRAINSia/BRAINSStandAlone.git"
-  GIT_TAG "dd7ad3926a01fbdd098ea858fb95012ca16fb236" # 12/18/2012
+  GIT_TAG "f74d63d753eee09ef14a1ae8e3f3d8f1f465afa9" # 01-30-2013 fix bug with ITK4.4 # "dd7ad3926a01fbdd098ea858fb95012ca16fb236" # 12/18/2012
 # "ff94032edafbc46a95f51db4bce894f0120b5992" : Slicer4 version # /devel/linux/Slicer4_linux64/Slicer/SuperBuild/External_BRAINSTools.cmake -> compiles but segfault
 # "31dcba577ee1bac5c4680fc9d7c830d6074020a9" : 12/13/2012
 # "98a46a2b08da882d46f04cbf0d539c2b73348049" # version from http://www.nitrc.org/svn/dtiprep/trunk/SuperBuild/External_BRAINSTools.cmake -> compiles but run error "undefined symbol: ModuleEntryPoint"
@@ -473,8 +473,8 @@

 # ===== ResampleDTIlogEuclidean =====================================================
 set( SourceCodeArgs
-  GIT_REPOSITORY "${git_protocol}://github.com/booboo69500/ResampleDTIlogEuclidean.git" # Francois Budin's repositery
-  GIT_TAG "e78a9ea00d73a11cc52b3c457e32f1302a3403d4" # 12/20/2012
+  GIT_REPOSITORY "${git_protocol}://github.com/NIRALUser/ResampleDTIlogEuclidean.git"
+  GIT_TAG "b97310969a105f81ee20d80e5c860f6ad4dd3911" # 01/31/2013 fix comp with ITK4.4# "e78a9ea00d73a11cc52b3c457e32f1302a3403d4" # 12/20/2012
 #  URL "http://www.insight-journal.org/download/sourcecode/742/11/SourceCode11_ResampleDTIInsightJournal2.tar.gz"
 # http://github.com/midas-journal/midas-journal-742/tree/master/ResampleDTIInsightJournal
   )


BUG: Fix external module BUILD_SHARED_LIBS status

This commit makes sure that external modules libraries are using
the same configuration as ITK libraries concerning the cmake
option BUILD_SHARED_LIBS.

Change-Id: I0c5cd0bef37199ab84acd1409bfa40a7f2079cf2

--- CMake/ITKModuleExternal.cmake
+++ CMake/ITKModuleExternal.cmake
@@ -52,6 +52,7 @@
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ITK_REQUIRED_LINK_FLAGS}")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ITK_REQUIRED_LINK_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${ITK_REQUIRED_LINK_FLAGS}")
+option(BUILD_SHARED_LIBS "Build ITK with shared libraries." ${ITK_BUILD_SHARED})

 # Add the ITK_MODULES_DIR to the CMAKE_MODULE_PATH and then use the binary
 # directory for the project to write out new ones to.


list instead of string to handles libraries

--- CMakeModules/FindRadium.cmake
+++ CMakeModules/FindRadium.cmake
@@ -61,9 +61,10 @@
     ENDIF()

     SET ( Radium_FOUND TRUE )
+    SET( RADIUM_LIBRARIES )
     IF ( RA_CORE_LIB AND RA_ENGINE_LIB AND RA_GUIBASE_LIB)
-        SET (RADIUM_LIBRARIES "${RA_CORE_LIB} ${RA_ENGINE_LIB} ${RA_GUIBASE_LIB}")
-        SET ( Radium_Libs_FOUND TRUE)
+       LIST(APPEND RADIUM_LIBRARIES "${RA_CORE_LIB}" "${RA_ENGINE_LIB}" "${RA_GUIBASE_LIB}")
+       SET ( Radium_Libs_FOUND TRUE)
     ENDIF ( RA_CORE_LIB AND RA_ENGINE_LIB AND RA_GUIBASE_LIB)
 ENDIF( RADIUM_ROOT_DIR)


fixed use cyclus bug

fixed use cyclus bug

--- CMake/UseCyclus.cmake
+++ CMake/UseCyclus.cmake
@@ -181,12 +181,12 @@
       "${CCTOUT}"
       CACHE INTERNAL "Agent test source" FORCE
       )
-    ADD_LIBRARY(${lib_root}Tests ${${lib_root}TestSource})
+    ADD_LIBRARY(${lib_root}Tests ${${lib_root}_Test_CC})
     TARGET_LINK_LIBRARIES(${lib_root}Tests dl cycluscore ${CYCLUS_GTEST_LIBRARIES})
     SET_TARGET_PROPERTIES(${lib_root}Tests PROPERTIES LINKER_LANGUAGE C)
     SET(
-      "${lib_root}_TEST_LIB"
-      "${lib_root}Tests"
+      "${lib_root}_TEST_LIB"
+      "${lib_root}Tests"
       CACHE INTERNAL "Agent test library alias." FORCE
       )


adjust config.cmake based on glow changes

--- libzeug-config.cmake
+++ libzeug-config.cmake
@@ -1,26 +1,34 @@
 # LIBZEUG_FOUND
 # LIBZEUG_INCLUDE_DIR
+
 # LIBZEUG_SIGNAL_LIBRARY
 # LIBZEUG_SIGNAL_LIBRARY_DEBUG
 # LIBZEUG_SIGNAL_LIBRARIES
+
 # LIBZEUG_STAGE_LIBRARY
 # LIBZEUG_STAGE_LIBRARY_DEBUG
 # LIBZEUG_STAGE_LIBRARIES
+
 # LIBZEUG_TREE_LIBRARY
 # LIBZEUG_TREE_LIBRARY_DEBUG
 # LIBZEUG_TREE_LIBRARIES
+
 # LIBZEUG_TREEIMPORT_LIBRARY
 # LIBZEUG_TREEIMPORT_LIBRARY_DEBUG
 # LIBZEUG_TREEIMPORT_LIBRARIES
+
 # LIBZEUG_PROPERTY_LIBRARY
 # LIBZEUG_PROPERTY_LIBRARY_DEBUG
 # LIBZEUG_PROPERTY_LIBRARIES
+
 # LIBZEUG_PROPERTYGUI_LIBRARY
 # LIBZEUG_PROPERTYGUI_LIBRARY_DEBUG
 # LIBZEUG_PROPERTYGUI_LIBRARIES
+
 # LIBZEUG_IO_LIBRARY
 # LIBZEUG_IO_LIBRARY_DEBUG
 # LIBZEUG_IO_LIBRARIES
+
 # LIBZEUG_THREADING_LIBRARY
 # LIBZEUG_THREADING_LIBRARY_DEBUG
 # LIBZEUG_THREADING_LIBRARIES
@@ -36,6 +44,11 @@
 	DOC "The directory where signalzeug/Signal.h resides")

 set(LIB_PATHS
+	${LIBZEUG_DIR}/build
+	${LIBZEUG_DIR}/build/Release
+	${LIBZEUG_DIR}/build/Debug
+	${LIBZEUG_DIR}/build-release
+	${LIBZEUG_DIR}/build-debug
 	$ENV{LIBZEUG_DIR}/lib
 	${LIBZEUG_DIR}/lib
 	/usr/lib
@@ -78,11 +91,6 @@
 find(io ${LIB_PATHS})
 find(threading ${LIB_PATHS})

-IF(LIBZEUG_INCLUDE_DIR AND LIBZEUG_SIGNAL_LIBRARY)
-    SET(LIBZEUG_FOUND 1 CACHE STRING "Set to 1 if LIBZEUG is found, 0 otherwise")
-ELSE()
-    SET(LIBZEUG_FOUND 0 CACHE STRING "Set to 1 if LIBZEUG is found, 0 otherwise")
-    MESSAGE(WARNING "Note: an envvar like LIBZEUG_DIR assists this script to locate LIBZEUG.")
-ENDIF()
+find_package_handle_standard_args(LIBZEUG DEFAULT_MSG LIBZEUG_THREADING_LIBRARIES LIBZEUG_INCLUDE_DIR)
+mark_as_advanced(LIBZEUG_FOUND)

-MARK_AS_ADVANCED(LIBZEUG_FOUND)


linux: Add --build-id linker option (#5823)

--- cmake/flags.cmake
+++ cmake/flags.cmake
@@ -97,6 +97,7 @@

       set(osquery_linux_common_link_options
         -Wl,-z,relro,-z,now
+        -Wl,--build-id
       )

       set(linux_cxx_link_options


Fix cmake path finding for amd libs. There is no WIN64 defined in the environment.

--- cmake/OpenCVDetectOpenCL.cmake
+++ cmake/OpenCVDetectOpenCL.cmake
@@ -44,7 +44,7 @@
   set(OPENCL_INCLUDE_DIRS ${OPENCL_INCLUDE_DIR})
   set(OPENCL_LIBRARIES    ${OPENCL_LIBRARY})

-  if(WIN64)
+  if(WIN32 AND X86_64)
     set(CLAMD_POSSIBLE_LIB_SUFFIXES lib64/import)
   elseif(WIN32)
     set(CLAMD_POSSIBLE_LIB_SUFFIXES lib32/import)


(only) include internals when phonon_add_executable macro is not present

this increases compatibility between phonon <4.7 and >=4.7. for <4.7 the
internals will not be included (as they are already present), and for
>=4.7 they will be included.

note that this also prevents general double-inclusion, which is why it uses
the macro check over a version check. for phonon5 we should find a better
solution though.

--- cmake/modules/FindPhonon.cmake
+++ cmake/modules/FindPhonon.cmake
@@ -1,6 +1,6 @@
 # Find Phonon

-# Copyright (c) 2010, Harald Sitter <sitter@kde.org>
+# Copyright (c) 2010-2013, Harald Sitter <sitter@kde.org>
 # Copyright (c) 2011, Alexander Neundorf <neundorf@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
@@ -10,7 +10,11 @@

 if(PHONON_BUILDSYSTEM_DIR)
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR})
-    include(${PHONON_BUILDSYSTEM_DIR}/FindPhononInternal.cmake )
+    # Prevent double-include of internals, and make sure they are included
+    # In Phonon <4.7 the internals were auto-included, in >=4.7 they are not.
+    if(NOT COMMAND phonon_add_executable)
+        include(${PHONON_BUILDSYSTEM_DIR}/FindPhononInternal.cmake )
+    endif()
 endif()

 include(FindPackageHandleStandardArgs)


-no need to use "REQUIRED" for pkg-config, since the result is checked
later on anyway via find_package_handle_standard_args()

Alex

--- cmake/modules/FindPolkit.cmake
+++ cmake/modules/FindPolkit.cmake
@@ -21,8 +21,8 @@
    # use pkg-config to get the directories and then use these values
    # in the FIND_PATH() and FIND_LIBRARY() calls
    find_package(PkgConfig)
-   pkg_check_modules(PC_POLKIT REQUIRED polkit-gobject-1)
-   pkg_check_modules(PC_POLKIT_AGENT REQUIRED polkit-agent-1)
+   pkg_check_modules(PC_POLKIT polkit-gobject-1)
+   pkg_check_modules(PC_POLKIT_AGENT polkit-agent-1)
    set(POLKIT_DEFINITIONS ${PC_POLKIT_CFLAGS_OTHER})
 endif (NOT WIN32)


CMake 3.6 is minimum for Qt

CMake 3.6 is minimum for Qt

--- cmake/projects/Qt/hunter.cmake
+++ cmake/projects/Qt/hunter.cmake
@@ -236,6 +236,21 @@
   endif()
 endif()

+if(CMAKE_VERSION VERSION_LESS 3.6)
+  # QtCMakeExtra modules (https://github.com/hunter-packages/QtCMakeExtra) installed
+  # near the Qt CMake modules and loaded by `file(GLOB)`:
+  # * https://github.com/qt/qtbase/blob/441ad9b938d453ccf5bff8867e7d3e6e432f9eba/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in#L352
+  #
+  # Before CMake 3.6 file(GLOB) order is not predictable and QtCMakeExtra will not work
+  # because they are expected to load last.
+  #
+  # file(GLOB) sorted since CMake 3.6:
+  # * https://gitlab.kitware.com/cmake/cmake/commit/edcccde7d65944b3744c4567bd1d452211829702
+  hunter_report_broken_package(
+      "CMake 3.6+ expected for Qt package (current version is ${CMAKE_VERSION}."
+  )
+endif()
+
 include("${CMAKE_CURRENT_LIST_DIR}/qtbase/hunter.cmake")

 hunter_add_package(QtCMakeExtra)


Squashed '3rdparty/github/cmake-utils/' changes from 372b25c..c662ce9

c662ce9 cmake/MyPackagePrintSetup.cmake: add CMAKE_MAKE_PROGRAM

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

--- cmake/MyPackagePrintSetup.cmake
+++ cmake/MyPackagePrintSetup.cmake
@@ -12,6 +12,7 @@
   MESSAGE(STATUS "         CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
   MESSAGE(STATUS "               CMAKE_CFG_INTDIR: ${CMAKE_CFG_INTDIR}")
   MESSAGE(STATUS "               CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+  MESSAGE(STATUS "             CMAKE_MAKE_PROGRAM: ${CMAKE_MAKE_PROGRAM}")
   MESSAGE(STATUS "               CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
   MESSAGE(STATUS "            CMAKE_C_COMPILER_ID: ${CMAKE_C_COMPILER_ID}")
   MESSAGE(STATUS "                  CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")


update

update

--- modules/zlib.cmake
+++ modules/zlib.cmake
@@ -8,13 +8,13 @@

   # Module assembler files
   if(CMAKE_COMPILER_IS_GNUCC)
-    set(ASSEMBLER_FILES "contrib/amd64/amd64-match.S")
     add_definitions(-DASMV)
+    set(ASSEMBLER_FILES "zlib/contrib/amd64/amd64-match.S")
     set_source_files_properties(${ASSEMBLER_FILES} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
   elseif(MSVC)
     ENABLE_LANGUAGE(ASM_MASM)
+    add_definitions(-DASMV -DASMINF)
     set(ASSEMBLER_FILES "zlib/contrib/masmx64/gvmat64.asm" "zlib/contrib/masmx64/inffasx64.asm")
-    add_definitions(-DASMV -DASMINF)
   endif()

   # Module library


Updated CMake library dependencies.

Updated CMake library dependencies.

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

--- cmake/modules/LLVMLibDeps.cmake
+++ cmake/modules/LLVMLibDeps.cmake
@@ -1,28 +1,28 @@
-set(MSVC_LIB_DEPS_LLVMARMAsmParser LLVMARMInfo LLVMMC LLVMMCParser LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMARMAsmPrinter LLVMMC LLVMSupport LLVMSystem)
+set(MSVC_LIB_DEPS_LLVMARMAsmParser LLVMARMInfo LLVMMC LLVMMCParser LLVMSupport LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMARMAsmPrinter LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMARMCodeGen LLVMARMAsmPrinter LLVMARMInfo LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMARMDisassembler LLVMARMCodeGen LLVMARMInfo LLVMMC LLVMSupport LLVMSystem)
+set(MSVC_LIB_DEPS_LLVMARMDisassembler LLVMARMCodeGen LLVMARMInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMARMInfo LLVMMC LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMAlphaAsmPrinter LLVMAlphaInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMAlphaCodeGen LLVMAlphaInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMAlphaAsmPrinter LLVMAlphaInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMAlphaCodeGen LLVMAlphaInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMAlphaInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMArchive LLVMBitReader LLVMCore LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMAsmParser LLVMCore LLVMSupport LLVMSystem)
+set(MSVC_LIB_DEPS_LLVMAsmParser LLVMCore LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMAsmPrinter LLVMAnalysis LLVMCodeGen LLVMCore LLVMMC LLVMMCParser LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMBitReader LLVMCore LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMBitWriter LLVMCore LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMBlackfinAsmPrinter LLVMAsmPrinter LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMBitReader LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMBitWriter LLVMCore LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMBlackfinAsmPrinter LLVMAsmPrinter LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMBlackfinCodeGen LLVMAsmPrinter LLVMBlackfinInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMBlackfinInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMCBackend LLVMAnalysis LLVMCBackendInfo LLVMCodeGen LLVMCore LLVMMC LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils LLVMipa)
 set(MSVC_LIB_DEPS_LLVMCBackendInfo LLVMMC LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMCellSPUAsmPrinter LLVMAsmPrinter LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMCellSPUAsmPrinter LLVMAsmPrinter LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMCellSPUCodeGen LLVMAsmPrinter LLVMCellSPUInfo LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMCellSPUInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMCodeGen LLVMAnalysis LLVMCore LLVMMC LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
 set(MSVC_LIB_DEPS_LLVMCore LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMCppBackend LLVMCore LLVMCppBackendInfo LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMCppBackend LLVMCore LLVMCppBackendInfo LLVMSupport LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMCppBackendInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMExecutionEngine LLVMCore LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMInstCombine LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
@@ -30,45 +30,45 @@
 set(MSVC_LIB_DEPS_LLVMInterpreter LLVMCodeGen LLVMCore LLVMExecutionEngine LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMJIT LLVMCodeGen LLVMCore LLVMExecutionEngine LLVMMC LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMLinker LLVMArchive LLVMBitReader LLVMCore LLVMSupport LLVMSystem LLVMTransformUtils)
-set(MSVC_LIB_DEPS_LLVMMBlazeAsmParser LLVMMBlazeCodeGen LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMMBlazeAsmPrinter LLVMMC LLVMSupport LLVMSystem)
+set(MSVC_LIB_DEPS_LLVMMBlazeAsmParser LLVMMBlazeCodeGen LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMSupport LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMMBlazeAsmPrinter LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMMBlazeCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMBlazeAsmPrinter LLVMMBlazeInfo LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMBlazeDisassembler LLVMMBlazeCodeGen LLVMMBlazeInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMMBlazeInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMMC LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMMCDisassembler LLVMARMAsmParser LLVMARMCodeGen LLVMARMDisassembler LLVMARMInfo LLVMAlphaAsmPrinter LLVMAlphaCodeGen LLVMAlphaInfo LLVMBlackfinAsmPrinter LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCBackend LLVMCBackendInfo LLVMCellSPUAsmPrinter LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCppBackend LLVMCppBackendInfo LLVMMBlazeAsmParser LLVMMBlazeCodeGen LLVMMBlazeDisassembler LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMMSP430CodeGen LLVMMSP430Info LLVMMipsAsmPrinter LLVMMipsCodeGen LLVMMipsInfo LLVMPTXAsmPrinter LLVMPTXCodeGen LLVMPTXInfo LLVMPowerPCAsmPrinter LLVMPowerPCCodeGen LLVMPowerPCInfo LLVMSparcAsmPrinter LLVMSparcCodeGen LLVMSparcInfo LLVMSupport LLVMSystem LLVMSystemZAsmPrinter LLVMSystemZCodeGen LLVMSystemZInfo LLVMX86AsmParser LLVMX86CodeGen LLVMX86Disassembler LLVMX86Info LLVMXCoreAsmPrinter LLVMXCoreCodeGen LLVMXCoreInfo)
-set(MSVC_LIB_DEPS_LLVMMCParser LLVMMC LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMMSP430AsmPrinter LLVMMC LLVMSupport LLVMSystem)
+set(MSVC_LIB_DEPS_LLVMMCDisassembler LLVMARMAsmParser LLVMARMCodeGen LLVMARMDisassembler LLVMARMInfo LLVMAlphaCodeGen LLVMAlphaInfo LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCBackend LLVMCBackendInfo LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCppBackend LLVMCppBackendInfo LLVMMBlazeAsmParser LLVMMBlazeCodeGen LLVMMBlazeDisassembler LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMMSP430CodeGen LLVMMSP430Info LLVMMipsCodeGen LLVMMipsInfo LLVMPTXCodeGen LLVMPTXInfo LLVMPowerPCCodeGen LLVMPowerPCInfo LLVMSparcCodeGen LLVMSparcInfo LLVMSupport LLVMSystem LLVMSystemZCodeGen LLVMSystemZInfo LLVMX86AsmParser LLVMX86CodeGen LLVMX86Disassembler LLVMX86Info LLVMXCoreCodeGen LLVMXCoreInfo)
+set(MSVC_LIB_DEPS_LLVMMCParser LLVMMC LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMMSP430AsmPrinter LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMMSP430CodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMSP430AsmPrinter LLVMMSP430Info LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMSP430Info LLVMMC LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMMipsAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMipsCodeGen LLVMMipsInfo LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMMipsCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMMipsInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMMipsAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMipsCodeGen LLVMMipsInfo LLVMSupport LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMMipsCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMMipsInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMipsInfo LLVMMC LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMPTXAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPTXCodeGen LLVMPTXInfo LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMPTXCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMPTXInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMPTXAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMPTXInfo LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMPTXCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPTXInfo LLVMSelectionDAG LLVMSupport LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPTXInfo LLVMMC LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMPowerPCAsmPrinter LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCInfo LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMPowerPCCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMPowerPCAsmPrinter LLVMMC LLVMSupport)
+set(MSVC_LIB_DEPS_LLVMPowerPCCodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCAsmPrinter LLVMPowerPCInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPowerPCInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMScalarOpts LLVMAnalysis LLVMCore LLVMInstCombine LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils)
 set(MSVC_LIB_DEPS_LLVMSelectionDAG LLVMAnalysis LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMSparcAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMSparcCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMSparcAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSparcInfo LLVMSupport LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMSparcCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSparcInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMSystem )
-set(MSVC_LIB_DEPS_LLVMSystemZAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMSystemZInfo LLVMTarget)
-set(MSVC_LIB_DEPS_LLVMSystemZCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMSystemZInfo LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMSystemZAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystemZInfo LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMSystemZCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystemZInfo LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSystemZInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMTarget LLVMCore LLVMMC LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMTransformUtils LLVMAnalysis LLVMCore LLVMSupport LLVMSystem LLVMTarget LLVMipa)
-set(MSVC_LIB_DEPS_LLVMX86AsmParser LLVMMC LLVMMCParser LLVMSupport LLVMSystem LLVMTarget LLVMX86Info)
-set(MSVC_LIB_DEPS_LLVMX86AsmPrinter LLVMMC LLVMSupport LLVMSystem)
+set(MSVC_LIB_DEPS_LLVMX86AsmParser LLVMMC LLVMMCParser LLVMSupport LLVMTarget LLVMX86Info)
+set(MSVC_LIB_DEPS_LLVMX86AsmPrinter LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMX86CodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget LLVMX86AsmPrinter LLVMX86Info)
 set(MSVC_LIB_DEPS_LLVMX86Disassembler LLVMMC LLVMSupport LLVMX86Info)
 set(MSVC_LIB_DEPS_LLVMX86Info LLVMMC LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMXCoreAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMSystem LLVMTarget LLVMXCoreInfo)
-set(MSVC_LIB_DEPS_LLVMXCoreCodeGen LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget LLVMXCoreInfo)
+set(MSVC_LIB_DEPS_LLVMXCoreAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSupport LLVMTarget LLVMXCoreInfo)
+set(MSVC_LIB_DEPS_LLVMXCoreCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget LLVMXCoreInfo)
 set(MSVC_LIB_DEPS_LLVMXCoreInfo LLVMMC LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMipa LLVMAnalysis LLVMCore LLVMSupport LLVMSystem)
 set(MSVC_LIB_DEPS_LLVMipo LLVMAnalysis LLVMCore LLVMScalarOpts LLVMSupport LLVMSystem LLVMTarget LLVMTransformUtils LLVMipa)