Finally, found a way to use the first form of TRY_COMPILE to test Ada
compilation.

svn path=/trunk/; revision=7419

--- cmake/modules/CMakeTestAdaCompiler.cmake
+++ cmake/modules/CMakeTestAdaCompiler.cmake
@@ -15,36 +15,25 @@
   "
   )

-#  FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt
-#  "
-#set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
-#project(test Ada)
-#add_executable(testadacompiler testadacompiler.adb)
-#  "
-#  )
+  FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt
+  "
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+project(test Ada)
+add_executable(testadacompiler testadacompiler.adb)
+  "
+  )

-  execute_process(
-  COMMAND ${GNAT_EXECUTABLE_BUILDER} testadacompiler.adb
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
-  RESULT_VARIABLE CMAKE_Ada_COMPILER_WORKS
+# To avoid try_compile recurse error, use any binary directory other than
+# ${CMAKE_BINARY_DIR}.  The choice of
+# bindir = ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp is
+# especially advantageous since it makes an in-source build which
+# means that no special variables need to be set to find files.
+  try_compile(CMAKE_Ada_COMPILER_WORKS
+  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
+  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
+  projectName
   OUTPUT_VARIABLE OUTPUT
-  ERROR_VARIABLE OUTPUT
   )
-  if(NOT CMAKE_Ada_COMPILER_WORKS)
-    set(CMAKE_Ada_COMPILER_WORKS ON)
-  else(NOT CMAKE_Ada_COMPILER_WORKS)
-    set(CMAKE_Ada_COMPILER_WORKS OFF)
-  endif(NOT CMAKE_Ada_COMPILER_WORKS)
-
-# Other languages avoid infinite try_compile recursion, but I don't know
-# how to do that for Ada.  Anyhow, use the above execute_process alternative
-# instead for now.
-#  try_compile(CMAKE_Ada_COMPILER_WORKS
-#  ${CMAKE_BINARY_DIR}
-#  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
-#  projectName
-#  OUTPUT_VARIABLE OUTPUT
-#  )
   SET(ADA_TEST_WAS_RUN 1)
 ENDIF(NOT CMAKE_Ada_COMPILER_WORKS)


- remove the debug_test_* targets from "all"   (otherwise they are compiled when you simply run    make in test/ or when enforcing "test" to be part of "all") - add linking libraries to the debug_test_* targets

--- cmake/EigenTesting.cmake
+++ cmake/EigenTesting.cmake
@@ -45,7 +45,7 @@
   set(filename ${testname}.cpp)
   add_executable(${targetname} ${filename})
   add_dependencies(btest ${targetname})
-  add_executable(${debug_targetname} ${filename})
+  add_executable(${debug_targetname} EXCLUDE_FROM_ALL ${filename})

   if(NOT EIGEN_NO_ASSERTION_CHECKING)

@@ -92,6 +92,7 @@
     string(LENGTH "${ARGV2_stripped}" ARGV2_stripped_length)
     if(${ARGV2_stripped_length} GREATER 0)
       target_link_libraries(${targetname} ${ARGV2})
+      target_link_libraries(${debug_targetname} ${ARGV2})
     endif(${ARGV2_stripped_length} GREATER 0)
   endif(${ARGC} GREATER 2)


change default folder kdb-tool/exec

change default folder kdb-tool/exec

--- cmake/ElektraCache.cmake
+++ cmake/ElektraCache.cmake
@@ -260,7 +260,7 @@
     )

 set (TARGET_TOOL_EXEC_FOLDER
-		"lib/kdb-tool"
+		"lib/kdb-tool/exec"
 		CACHE STRING
 		"This folder (below prefix) will be used to install additional kdb-tools"
     )


Update FindCudaArch.cmake

Update FindCudaArch.cmake

--- cmake/FindCudaArch.cmake
+++ cmake/FindCudaArch.cmake
@@ -53,7 +53,7 @@
   ENDIF()

   IF(NOT CUDA_GPU_DETECT_OUTPUT)
-    message(STATUS "Automatic GPU detection failed. Building for all known architectures.")
+    message(STATUS "Automatic GPU detection failed. Building for all known architectures except 5.0.")
     SET(${OUT_VARIABLE} ${KNOWN_GPU_ARCHITECTURES} PARENT_SCOPE)
   ELSE()
     SET(${OUT_VARIABLE} ${CUDA_GPU_DETECT_OUTPUT} PARENT_SCOPE)


Added support for libclang > 3.3

Added support for libclang > 3.3

--- cmake/FindLibClang.cmake
+++ cmake/FindLibClang.cmake
@@ -5,11 +5,13 @@
 find_path(CLANG_INCLUDE clang-c/Index.h
           HINTS
           ${CLANG_ROOT}/include
-          # /usr/lib/llvm-3.4/include
+          /usr/lib/llvm-3.5/include
+          /usr/lib/llvm-3.4/include
           /usr/lib/llvm-3.3/include
           /usr/lib/llvm-3.2/include
           /usr/lib/llvm-3.1/include
-          # /opt/local/libexec/llvm-3.4/include
+          /opt/local/libexec/llvm-3.5/include
+          /opt/local/libexec/llvm-3.4/include
           /opt/local/libexec/llvm-3.3/include
           /opt/local/libexec/llvm-3.2/include
           /opt/local/libexec/llvm-3.1/include
@@ -21,11 +23,13 @@
 find_path(CLANG_COMPILATION_INCLUDE clang-c/CXCompilationDatabase.h
       HINTS
       ${CLANG_ROOT}/include
-      # /opt/local/libexec/llvm-3.4/include
+      /opt/local/libexec/llvm-3.5/include
+      /opt/local/libexec/llvm-3.4/include
       /opt/local/libexec/llvm-3.3/include
       /opt/local/libexec/llvm-3.2/include
       /opt/local/libexec/llvm-3.1/include
-      # /usr/lib/llvm-3.4/include
+      /usr/lib/llvm-3.5/include
+      /usr/lib/llvm-3.4/include
       /usr/lib/llvm-3.3/include
       /usr/lib/llvm-3.2/include
       /usr/lib/llvm-3.1/include


add CTest targets for sanity tests

add CTest targets for sanity tests

--- cmake/OpenCVModule.cmake
+++ cmake/OpenCVModule.cmake
@@ -761,6 +761,14 @@

       ocv_add_precompiled_headers(${the_target})

+      if(CMAKE_VERSION VERSION_GREATER "2.8" AND OPENCV_TEST_DATA_PATH)
+        add_test(NAME ${the_target} COMMAND ${the_target} --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity)
+
+        set_tests_properties(${the_target} PROPERTIES
+          LABELS "Sanity"
+          ENVIRONMENT "OPENCV_TEST_DATA_PATH=${OPENCV_TEST_DATA_PATH}")
+      endif()
+
     else(OCV_DEPENDENCIES_FOUND)
       # TODO: warn about unsatisfied dependencies
     endif(OCV_DEPENDENCIES_FOUND)
@@ -818,6 +826,7 @@
         add_test(NAME ${the_target} COMMAND ${the_target})

         set_tests_properties(${the_target} PROPERTIES
+          LABELS "Accuracy"
           ENVIRONMENT "OPENCV_TEST_DATA_PATH=${OPENCV_TEST_DATA_PATH}")
       endif()


[cmake] WITH_OPENMP = OFF by default

[cmake] WITH_OPENMP = OFF by default

--- cmake/SiconosSetup.cmake
+++ cmake/SiconosSetup.cmake
@@ -205,7 +205,7 @@
 endif()

 # =========== OpenMP ==========
-OPTION (WITH_OPENMP "Use OpenMP" ON)
+OPTION (WITH_OPENMP "Use OpenMP" OFF)
 IF(WITH_OPENMP)
   FIND_PACKAGE(OpenMP)
   IF(OPENMP_FOUND)


build: use option() for enable/disable plugin options

This causes cmake-gui to provide toggles to enable/disable the plugin.

--- cmake/SquashPlugin.cmake
+++ cmake/SquashPlugin.cmake
@@ -13,15 +13,16 @@
   unset (multiValueArgs)

   string (TOUPPER "${SQUASH_PLUGIN_NAME}" PLUGIN_NAME_UC)
-  set (ENABLE_PLUGIN "")
-  string (REGEX REPLACE "[\\-]" "_" ENABLE_PLUGIN "ENABLE_${PLUGIN_NAME_UC}")
+  string (REGEX REPLACE "[^a-zA-Z0-9]" "_" PLUGIN_NAME_UC "${PLUGIN_NAME_UC}")

-  if (${SQUASH_PLUGIN_DEFAULT_DISABLED})
-    if (NOT ${ENABLE_PLUGIN} STREQUAL "yes")
+  if (SQUASH_PLUGIN_DEFAULT_DISABLED)
+    option("ENABLE_${PLUGIN_NAME_UC}" "Enable ${SQUASH_PLUGIN_NAME} plugin")
+    if (NOT ${ENABLE_${PLUGIN_NAME_UC}})
       return ()
     endif ()
   else ()
-    if (${ENABLE_PLUGIN} STREQUAL "no")
+    option("DISABLE_${PLUGIN_NAME_UC}" "Disable ${SQUASH_PLUGIN_NAME} plugin")
+    if (${DISABLE_${PLUGIN_NAME_UC}})
       return ()
     endif ()
   endif ()


fix CMake error

fix CMake error

```
CMake Error at cmake/alpakaCommon.cmake:498 (if):
  if given arguments:

    "(" "STREQUAL" "Debug" ")" "OR" "(" "STREQUAL" "RelWithDebInfo" ")"

  Unknown arguments specified
Call Stack (most recent call first):
  CMakeLists.txt:75 (include)

-- Configuring incomplete, errors occurred!
```

--- cmake/alpakaCommon.cmake
+++ cmake/alpakaCommon.cmake
@@ -501,7 +501,7 @@

                 set(CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER})

-                if((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
+                if((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
                     list(APPEND CUDA_NVCC_FLAGS -g)
                     if(MSVC)
                         message(WARNING "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} does not support -G with CUDA! "
@@ -633,7 +633,7 @@
                 list(APPEND HIP_NVCC_FLAGS -ccbin ${CMAKE_CXX_COMPILER})
                 list(APPEND HIP_NVCC_FLAGS -Xcompiler -g)

-                if((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
+                if((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
                     list(APPEND HIP_NVCC_FLAGS -G)
                 endif()
                 # propage host flags


Compile flags, fix.

Compile flags, fix.

--- cmake/BuildOptionsFTL.cmake
+++ cmake/BuildOptionsFTL.cmake
@@ -1,5 +1,6 @@
 ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
 SET(CMAKE_EXE_LINKER_FLAGS "-ldl ${CMAKE_EXE_LINKER_FLAGS}")
+SET(CMAKE_SHARED_LINKER_FLAGS "-ldl ${CMAKE_SHARED_LINKER_FLAGS}")

 IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 	ADD_DEFINITIONS(-D_POSIX_PTHREAD_SEMANTICS)


Find Lua: Reformat CMake code

Find Lua: Reformat CMake code

--- cmake/Modules/FindLua.cmake
+++ cmake/Modules/FindLua.cmake
@@ -1,4 +1,5 @@
-#.rst:
+# ~~~
+# .rst:
 # FindLua
 # -------
 #
@@ -32,8 +33,10 @@
 #
 # This is because, the lua location is not standardized and may exist in
 # locations other than lua/
-
-#=============================================================================
+# ~~~
+
+# ~~~
+# =============================================================================
 # Copyright 2007-2009 Kitware, Inc.
 # Copyright 2013 Rolf Eike Beer <eike@sf-mail.de>
 #
@@ -43,168 +46,184 @@
 # This software is distributed WITHOUT ANY WARRANTY; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the License for more information.
-#=============================================================================
+# =============================================================================
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
-
-unset(_lua_include_subdirs)
-unset(_lua_library_names)
+# ~~~
+
+unset (_lua_include_subdirs)
+unset (_lua_library_names)

 # this is a function only to have all the variables inside go away automatically
-function(set_lua_version_vars)
-    set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
-
-    if (Lua_FIND_VERSION_EXACT)
-        if (Lua_FIND_VERSION_COUNT GREATER 1)
-            set(lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
-        endif ()
-    elseif (Lua_FIND_VERSION)
-        # once there is a different major version supported this should become a loop
-        if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
-            if (Lua_FIND_VERSION_COUNT EQUAL 1)
-                set(lua_append_versions ${LUA_VERSIONS5})
-            else ()
-                foreach (subver IN LISTS LUA_VERSIONS5)
-                    if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
-                        list(APPEND lua_append_versions ${subver})
-                    endif ()
-                endforeach ()
-            endif ()
-        endif ()
-    else ()
-        # once there is a different major version supported this should become a loop
-        set(lua_append_versions ${LUA_VERSIONS5})
-    endif ()
-
-    foreach (ver IN LISTS lua_append_versions)
-        string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
-        list(APPEND _lua_include_subdirs
-             include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-        )
-        list(APPEND _lua_library_names
-             lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-        )
-    endforeach ()
-
-    set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
-    set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
-endfunction(set_lua_version_vars)
-
-set_lua_version_vars()
+function (set_lua_version_vars)
+	set (LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+
+	if (Lua_FIND_VERSION_EXACT)
+		if (Lua_FIND_VERSION_COUNT GREATER 1)
+			set (lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
+		endif ()
+	elseif (Lua_FIND_VERSION)
+
+		if (NOT Lua_FIND_VERSION_MAJOR GREATER 5) # once there is a different major version supported this should become a loop
+			if (Lua_FIND_VERSION_COUNT EQUAL 1)
+				set (lua_append_versions ${LUA_VERSIONS5})
+			else ()
+				foreach (subver IN LISTS LUA_VERSIONS5)
+					if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
+						list (APPEND lua_append_versions ${subver})
+					endif ()
+				endforeach ()
+			endif ()
+		endif ()
+	else ()
+		set (lua_append_versions ${LUA_VERSIONS5}) # once there is a different major version supported this should become a loop
+	endif ()
+
+	foreach (ver IN LISTS lua_append_versions)
+		string (REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
+		list (APPEND _lua_include_subdirs
+			     include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
+			     include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
+			     include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2})
+		list (APPEND _lua_library_names
+			     lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
+			     lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
+			     lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2})
+	endforeach ()
+
+	set (_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
+	set (_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
+endfunction (set_lua_version_vars)
+
+set_lua_version_vars ()

 function (verify_lua_executable_version)
-    set (LUA_EXECUTABLE_VERSION_MATCHED FALSE PARENT_SCOPE)
-
-    find_program (LUA_EXECUTABLE
-        NAMES
-        "lua-${_LUA_VERSION_MAJOR}.${_LUA_VERSION_MINOR}"
-        "lua${_LUA_VERSION_MAJOR}.${_LUA_VERSION_MINOR}"
-        "lua${_LUA_VERSION_MAJOR}${_LUA_VERSION_MINOR}"
-        "lua"
-        PATH
-    )
-
-    execute_process (COMMAND ${LUA_EXECUTABLE} "-v"
-        OUTPUT_VARIABLE LUABIN_VERSION_STRING
-        ERROR_VARIABLE LUABIN_VERSION_STRING
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_STRIP_TRAILING_WHITESPACE
-    )
-
-    if (LUA_EXECUTABLE AND (NOT LUABIN_VERSION_STRING STREQUAL ""))
-        # Compare only MAJOR.MINOR
-        string (SUBSTRING ${LUABIN_VERSION_STRING} "4" "3" LUABIN_VERSION_STRING)
-        string (COMPARE EQUAL ${LUABIN_VERSION_STRING} "${_LUA_VERSION_MAJOR}.${_LUA_VERSION_MINOR}" VERSION_MATCHES)
-
-        if (NOT VERSION_MATCHES)
-            message (WARNING "Lua executable does not match lua library version")
-            message ("Lua library: ${_LUA_VERSION_MAJOR}.${_LUA_VERSION_MINOR}")
-            message ("Lua executable: ${LUABIN_VERSION_STRING}")
-        else ()
-            set (LUA_EXECUTABLE_VERSION_MATCHED TRUE PARENT_SCOPE)
-        endif(NOT VERSION_MATCHES)
-    else ()
-        message (WARNING "Lua executable not found")
-    endif(LUA_EXECUTABLE AND (NOT LUABIN_VERSION_STRING STREQUAL ""))
+	set (LUA_EXECUTABLE_VERSION_MATCHED FALSE PARENT_SCOPE)
+
+	find_program (LUA_EXECUTABLE
+		      NAMES "lua-${_LUA_VERSION_MAJOR}.${_LUA_VERSION_MINOR}"
+			    "lua${_LUA_VERSION_MAJOR}.${_LUA_VERSION_MINOR}"
+			    "lua${_LUA_VERSION_MAJOR}${_LUA_VERSION_MINOR}"
+			    "lua"
+			    PATH)
+
+	execute_process (COMMAND ${LUA_EXECUTABLE} "-v"
+			 OUTPUT_VARIABLE LUABIN_VERSION_STRING
+			 ERROR_VARIABLE LUABIN_VERSION_STRING
+			 OUTPUT_STRIP_TRAILING_WHITESPACE
+			 ERROR_STRIP_TRAILING_WHITESPACE)
+
+	if (LUA_EXECUTABLE AND (NOT LUABIN_VERSION_STRING STREQUAL ""))
+
+		# Compare only MAJOR.MINOR
+		string (SUBSTRING ${LUABIN_VERSION_STRING} "4" "3" LUABIN_VERSION_STRING)
+		string (COMPARE EQUAL ${LUABIN_VERSION_STRING} "${_LUA_VERSION_MAJOR}.${_LUA_VERSION_MINOR}" VERSION_MATCHES)
+
+		if (NOT VERSION_MATCHES)
+			message (WARNING "Lua executable does not match lua library version")
+			message ("Lua library: ${_LUA_VERSION_MAJOR}.${_LUA_VERSION_MINOR}")
+			message ("Lua executable: ${LUABIN_VERSION_STRING}")
+		else ()
+			set (LUA_EXECUTABLE_VERSION_MATCHED TRUE PARENT_SCOPE)
+		endif (NOT VERSION_MATCHES)
+	else ()
+		message (WARNING "Lua executable not found")
+	endif (LUA_EXECUTABLE AND (NOT LUABIN_VERSION_STRING STREQUAL ""))
 endfunction (verify_lua_executable_version)

-find_path(LUA_INCLUDE_DIR lua.h
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES ${_lua_include_subdirs} include/lua include
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-)
-unset(_lua_include_subdirs)
-
-find_library(LUA_LIBRARY
-  NAMES ${_lua_library_names} lua
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-unset(_lua_library_names)
+find_path (LUA_INCLUDE_DIR
+	   lua.h
+	   HINTS ENV
+		 LUA_DIR
+	   PATH_SUFFIXES ${_lua_include_subdirs}
+			 include/lua
+			 include
+	   PATHS ~/Library/Frameworks
+		 /Library/Frameworks
+		 /sw # Fink
+		 /opt/local # DarwinPorts
+		 /opt/csw # Blastwave
+		 /opt)
+unset (_lua_include_subdirs)
+
+find_library (LUA_LIBRARY
+	      NAMES ${_lua_library_names}
+		    lua
+	      HINTS ENV
+		    LUA_DIR
+	      PATH_SUFFIXES lib
+	      PATHS ~/Library/Frameworks
+		    /Library/Frameworks
+		    /sw
+		    /opt/local
+		    /opt/csw
+		    /opt)
+unset (_lua_library_names)

 if (LUA_LIBRARY)
-    # include the math library for Unix
-    if (UNIX AND NOT APPLE AND NOT BEOS)
-        find_library(LUA_MATH_LIBRARY m)
-        set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
-    # For Windows and Mac, don't need to explicitly include the math library
-    else ()
-        set(LUA_LIBRARIES "${LUA_LIBRARY}")
-    endif ()
+
+	if (UNIX AND NOT APPLE AND NOT BEOS) # include the math library for Unix
+		find_library (LUA_MATH_LIBRARY m)
+		set (LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
+
+	else () # For Windows and Mac, don't need to explicitly include the math library
+		set (LUA_LIBRARIES "${LUA_LIBRARY}")
+	endif ()
 endif ()

 if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-    # At least 5.[012] have different ways to express the version
-    # so all of them need to be tested. Lua 5.2 defines LUA_VERSION
-    # and LUA_RELEASE as joined by the C preprocessor, so avoid those.
-    file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_strings
-         REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
-
-    string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
-    if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
-        set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
-    else ()
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
-            string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        endif ()
-        string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
-    endif ()
-    set(_LUA_VERSION_MAJOR "${LUA_VERSION_MAJOR}")
-    set(_LUA_VERSION_MINOR "${LUA_VERSION_MINOR}")
-    unset(lua_version_strings)
-endif()
-
-verify_lua_executable_version() # LUA_VERSION_STRING available from here
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
-                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-                                  VERSION_VAR LUA_VERSION_STRING)
-
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)
+
+	# At least 5.[012] have different ways to express the version
+	# so all of them need to be tested. Lua 5.2 defines LUA_VERSION
+	# and LUA_RELEASE as joined by the C preprocessor, so avoid those.
+	file (STRINGS "${LUA_INCLUDE_DIR}/lua.h"
+		      lua_version_strings
+	      REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
+
+	string (REGEX
+		REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*"
+			"\\1"
+			LUA_VERSION_MAJOR
+			";${lua_version_strings};")
+	if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
+		string (REGEX
+			REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*"
+				"\\1"
+				LUA_VERSION_MINOR
+				";${lua_version_strings};")
+		string (REGEX
+			REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*"
+				"\\1"
+				LUA_VERSION_PATCH
+				";${lua_version_strings};")
+		set (LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
+	else ()
+		string (REGEX
+			REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*"
+				"\\1"
+				LUA_VERSION_STRING
+				";${lua_version_strings};")
+		if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
+			string (REGEX
+				REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*"
+					"\\1"
+					LUA_VERSION_STRING
+					";${lua_version_strings};")
+		endif ()
+		string (REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
+		string (REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
+		string (REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
+	endif ()
+	set (_LUA_VERSION_MAJOR "${LUA_VERSION_MAJOR}")
+	set (_LUA_VERSION_MINOR "${LUA_VERSION_MINOR}")
+	unset (lua_version_strings)
+endif ()
+
+verify_lua_executable_version () # LUA_VERSION_STRING available from here
+
+include (FindPackageHandleStandardArgs)
+
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if all listed variables are TRUE
+find_package_handle_standard_args (Lua REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR VERSION_VAR LUA_VERSION_STRING)
+
+mark_as_advanced (LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)


Added support for Visual C++ 2010 in PackageFilename.cmake

--- cmake/PackageFilename.cmake
+++ cmake/PackageFilename.cmake
@@ -57,10 +57,12 @@
         string(REGEX REPLACE "([0-9]+\\.[0-9]+).*" "\\1" GCC_VERSION "${GCC_VERSION_OUTPUT}")
         set(PACKAGE_COMPILER_NAME ${PACKAGE_COMPILER_NAME}${GCC_VERSION})
     endif()
-elseif(MSVC80)
+elseif(MSVC_VERSION EQUAL 1400)
     set(PACKAGE_COMPILER_NAME "vc2005")
-elseif(MSVC90)
+elseif(MSVC_VERSION EQUAL 1500)
     set(PACKAGE_COMPILER_NAME "vc2008")
+elseif(MSVC_VERSION EQUAL 1600)
+    set(PACKAGE_COMPILER_NAME "vc2010")
 elseif(APPLE)
     set(PACKAGE_COMPILER_NAME "universal")
 else()


cmake: Look for revision specific overlays also in <app>/boards/

This is a follow-up to commit 77ecd6837d5040734b7d87c9cbfefc67bf736c55.

Add missing check that looks for a revision specific overlay located
in the `<app>/boards/` directory similar to how overlays and Kconfig
fragments are handled.

Signed-off-by: Andrzej Głąbek <6788b8d556a8a447102338fc996c42180ecff44e@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <a7c5b1d5a1f41fce6edfa3f7c2392ae0c59deafe@nordicsemi.no>

--- cmake/app/boilerplate.cmake
+++ cmake/app/boilerplate.cmake
@@ -480,17 +480,16 @@
 To change CONF_FILE, use the CONF_FILE variable.")
 unset(CONF_FILE CACHE)

+zephyr_file(CONF_FILES ${APPLICATION_SOURCE_DIR}/boards DTS APP_BOARD_DTS)
+
 if(DTC_OVERLAY_FILE)
   # DTC_OVERLAY_FILE has either been specified on the cmake CLI or is already
   # in the CMakeCache.txt. This has precedence over the environment
   # variable DTC_OVERLAY_FILE
 elseif(DEFINED ENV{DTC_OVERLAY_FILE})
   set(DTC_OVERLAY_FILE $ENV{DTC_OVERLAY_FILE})
-elseif(EXISTS          ${APPLICATION_SOURCE_DIR}/boards/${BOARD}.overlay)
-  set(DTC_OVERLAY_FILE ${APPLICATION_SOURCE_DIR}/boards/${BOARD}.overlay)
-elseif((DEFINED BOARD_REVISION) AND
-       EXISTS          ${APPLICATION_SOURCE_DIR}/${BOARD}_${BOARD_REVISION_STRING}.overlay)
-  set(DTC_OVERLAY_FILE ${APPLICATION_SOURCE_DIR}/${BOARD}_${BOARD_REVISION_STRING}.overlay)
+elseif(APP_BOARD_DTS)
+  set(DTC_OVERLAY_FILE ${APP_BOARD_DTS})
 elseif(EXISTS          ${APPLICATION_SOURCE_DIR}/${BOARD}.overlay)
   set(DTC_OVERLAY_FILE ${APPLICATION_SOURCE_DIR}/${BOARD}.overlay)
 elseif(EXISTS          ${APPLICATION_SOURCE_DIR}/app.overlay)


remove autogenerate files

remove autogenerate files

--- cmake/cmake_uninstall.cmake
+++ cmake/cmake_uninstall.cmake
@@ -1,32 +0,0 @@
-# http://www.vtk.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
-
-IF(NOT EXISTS "C:/Documents and Settings/user/Mes documents/GitHub/monitoring/install_manifest.txt")
-    MESSAGE(FATAL_ERROR "Cannot find install manifest: \"C:/Documents and Settings/user/Mes documents/GitHub/monitoring/install_manifest.txt\"")
-ENDIF(NOT EXISTS "C:/Documents and Settings/user/Mes documents/GitHub/monitoring/install_manifest.txt")
-
-FILE(READ "C:/Documents and Settings/user/Mes documents/GitHub/monitoring/install_manifest.txt" files)
-STRING(REGEX REPLACE "\n" ";" files "${files}")
-FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
-  IF(EXISTS "$ENV{DESTDIR}${file}")
-    EXEC_PROGRAM(
-      "C:/Program Files/CMake 2.8/bin/cmake.exe" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    IF(NOT "${rm_retval}" STREQUAL 0)
-      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
-    ENDIF(NOT "${rm_retval}" STREQUAL 0)
-  ELSEIF(IS_SYMLINK "$ENV{DESTDIR}${file}")
-    EXEC_PROGRAM(
-      "C:/Program Files/CMake 2.8/bin/cmake.exe" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    IF(NOT "${rm_retval}" STREQUAL 0)
-      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
-    ENDIF(NOT "${rm_retval}" STREQUAL 0)
-  ELSE(EXISTS "$ENV{DESTDIR}${file}")
-    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
-  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
-ENDFOREACH(file)


fixed compiler options for 2.0 and 2.1 CUDA architecture

--- cmake/compilerOptions.cmake
+++ cmake/compilerOptions.cmake
@@ -78,9 +78,9 @@
         list(APPEND CUDA_NVCC_FLAGS -O2;)
         list(APPEND CUDA_NVCC_FLAGS --ptxas-options=-v;)
         #list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_11,code=sm_11)
-        list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_13,code=sm_13)
-        #list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_20)
-        #list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_21)
+        #list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_13,code=sm_13)
+        list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_20)
+        list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_21)
         #list(APPEND CUDA_NVCC_FLAGS --ptxas-options=-dlcm=cg)
     else ()
         if (NOT MSVC)
@@ -91,9 +91,9 @@
         list(APPEND CUDA_NVCC_FLAGS -O0;)
         #list(APPEND CUDA_NVCC_FLAGS --ptxas-options=-v')
         #list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_11,code=sm_11)
-        list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_13,code=sm_13)
-        #list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_20)
-        #list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_21)
+        #list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_13,code=sm_13)
+        list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_20)
+        list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_21)
     endif ()
 endif (CUDA_FOUND)


Mark the reason of using a personal repo temporarily

--- cmake/external/gflags.cmake
+++ cmake/external/gflags.cmake
@@ -28,6 +28,13 @@
 ExternalProject_Add(
     extern_gflags
     ${EXTERNAL_PROJECT_LOG_ARGS}
+    # TODO(yiwang): The annoying warnings mentioned in
+    # https://github.com/PaddlePaddle/Paddle/issues/3277 are caused by
+    # gflags.  I fired a PR https://github.com/gflags/gflags/pull/230
+    # to fix it.  Before it gets accepted by the gflags team, we use
+    # my personal fork, which contains above fix, temporarily.  Let's
+    # change this back to the official Github repo once my PR is
+    # merged.
     GIT_REPOSITORY  "https://github.com/wangkuiyi/gflags.git"
     PREFIX          ${GFLAGS_SOURCES_DIR}
     UPDATE_COMMAND  ""


Detect automatically if gcov or llvm-cov should be used

--- cmake/kl/CodeCoverage.cmake
+++ cmake/kl/CodeCoverage.cmake
@@ -172,8 +172,27 @@
         set(report_type HTML)
     endif()

-    if(arg_LLVM)
-        set(gcov_executable "--gcov-executable=\"llvm-cov\" gcov")
+    if(NOT arg_LLVM)
+        # Try gcov first, then llvm-cov
+        find_program(GCOV_EXECUTABLE gcov)
+        mark_as_advanced(GCOV_EXECUTABLE)
+        if(NOT GCOV_EXECUTABLE)
+            find_program(LLVM_COV_EXECUTABLE llvm-cov)
+            mark_as_advanced(LLVM_COV_EXECUTABLE)
+            if(NOT LLVM_COV_EXECUTABLE)
+                message(FATAL_ERROR "Neither gcov nor llvm-cov were found!")
+            endif()
+            set(gcov_executable "--gcov-executable=\"${LLVM_COV_EXECUTABLE}\" gcov")
+        else()
+            set(gcov_executable "--gcov-executable=\"${GCOV_EXECUTABLE}\"")
+        endif()
+    else()
+        find_program(LLVM_COV_EXECUTABLE llvm-cov)
+        mark_as_advanced(LLVM_COV_EXECUTABLE)
+        if(NOT LLVM_COV_EXECUTABLE)
+            message(FATAL_ERROR "llvm-cov not found!")
+        endif()
+        set(gcov_executable "--gcov-executable=\"${LLVM_COV_EXECUTABLE}\" gcov")
     endif()

     if(arg_IGNORE_COMMAND_ERRORS)


Update cmake/modules/FindKTp.cmake

Update cmake/modules/FindKTp.cmake

--- cmake/modules/FindKTp.cmake
+++ cmake/modules/FindKTp.cmake
@@ -3,6 +3,7 @@
 # KTP_INCLUDE_DIR
 # KTP_LIBRARIES
 # KTP_MODELS_LIBRARIES
+# KTP_WIDGETS_LIBRARIES

 # Copyright (c) 2011, Dario Freddi <drf@kde.org>
 #
@@ -26,6 +27,7 @@

 find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
 find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
+find_library(KTP_WIDGETS_LIBRARIES NAMES ktpwidgetsprivate )

 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG


Enable the warning in a separate step.

Enable the warning in a separate step.

--- build_settings.cmake
+++ build_settings.cmake
@@ -17,7 +17,7 @@
 set(AUTORUN_UNIT_TESTS FALSE CACHE BOOL "If TRUE, tests will be run immediately after linking the test executable")

 # Warnings
-set(WARN_OPTS "-Wsuggest-override -Winline -Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wcomment -Wformat -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings")
+set(WARN_OPTS "-Winline -Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wcomment -Wformat -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings")

 # C and C++ compiler flags
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 ${WARN_OPTS} -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -DBOOST_DISABLE_ASSERTS -march=westmere -mtune=intel ${EXTRA_C_FLAGS}")


more simplification

more simplification

--- backend/modules/FindTcmalloc.cmake
+++ backend/modules/FindTcmalloc.cmake
@@ -13,9 +13,7 @@
   set(Tcmalloc_NAMES tcmalloc_minimal tcmalloc)
 endif ()

-find_library(Tcmalloc_LIBRARY NO_DEFAULT_PATH
-  NAMES ${Tcmalloc_NAMES}
-)
+find_library(Tcmalloc_LIBRARY NAMES ${Tcmalloc_NAMES})

 if (Tcmalloc_INCLUDE_DIR AND Tcmalloc_LIBRARY)
   set(Tcmalloc_FOUND TRUE)


LABELS where missing from pytests

LABELS where missing from pytests

--- scripts/AddPyTest.cmake
+++ scripts/AddPyTest.cmake
@@ -96,6 +96,10 @@
         endif()
     endforeach()

+    list(APPEND pytests_LABELS pytest python)
+    list(REMOVE_DUPLICATES pytests_LABELS)
+    set_tests_properties(${all_tests} PROPERTIES LABELS "${pytests_LABELS}")
+
 endfunction()

 function(setup_pytest python_path pytest_path)


Avoid strip names for Abseil

Avoid strip names for Abseil

--- build_tools/cmake/iree_copts.cmake
+++ build_tools/cmake/iree_copts.cmake
@@ -12,7 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+#-------------------------------------------------------------------------------
+# Abseil configuration
+#-------------------------------------------------------------------------------
+
 include(AbseilConfigureCopts)
+
+# By default Abseil strips string literals on mobile platforms, which means
+# we cannot run IREE binaries via command-line with proper options. Turn off
+# the stripping.
+# TODO: we might still want to strip when compiling IREE into Android Java apps.
+if(CMAKE_CROSSCOMPILING AND "${CMAKE_SYSTEM_NAME}" MATCHES "Android")
+  add_definitions(-DABSL_FLAGS_STRIP_NAMES=0)
+endif()

 #-------------------------------------------------------------------------------
 # C++ used within IREE


Add NETCDF_DIR

Add NETCDF_DIR

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

--- deal.II/cmake/modules/FindNETCDF.cmake
+++ deal.II/cmake/modules/FindNETCDF.cmake
@@ -18,13 +18,22 @@

 INCLUDE(FindPackageHandleStandardArgs)

-FIND_PATH(NETCDF_INCLUDE_DIR netcdf.hh)
+SET_IF_EMPTY(NETCDF_DIR "$ENV{NETCDF_DIR}")
+
+FIND_PATH(NETCDF_INCLUDE_DIR netcdf.hh
+  HINTS
+    ${NETCDF_DIR}
+  PATH_SUFFIXES
+    netcdf include
+  )

 #
 # TODO: netcdf might externally depend on hdf5. Check and fix this.
 #

 FIND_LIBRARY(NETCDF_LIBRARY NAMES netcdf_c++ netcdf_cpp
+  HINTS
+    ${NETCDF_DIR}
   PATH_SUFFIXES
     lib${LIB_SUFFIX} lib64 lib
   )
@@ -38,6 +47,11 @@
   MARK_AS_ADVANCED(
     NETCDF_LIBRARY
     NETCDF_INCLUDE_DIR
+    NETCDF_DIR
   )
+ELSE()
+  SET(NETCDF_DIR "" CACHE STRING
+    "An optional hint to a NETCDF installation"
+    )
 ENDIF()


DOC: update cmake doc for OTB module

DOC: update cmake doc for OTB module

--- Modules/Applications/AppDomainTransform/otb-module.cmake
+++ Modules/Applications/AppDomainTransform/otb-module.cmake
@@ -1,4 +1,4 @@
-set(DOCUMENTATION "TODO")
+set(DOCUMENTATION "Application to perform Wavelet and Fourier transform. This application is not streamed")

 otb_module(OTBAppDomainTransform
 DEPENDS


cmake: allow calling get component property in early expansion

--- tools/cmake/scripts/component_get_requirements.cmake
+++ tools/cmake/scripts/component_get_requirements.cmake
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.5)
 include("${BUILD_PROPERTIES_FILE}")
 include("${COMPONENT_PROPERTIES_FILE}")

@@ -16,6 +17,38 @@
 function(__component_get_property var component_target property)
     set(_property __component_${component_target}_${property})
     set(${var} ${${_property}} PARENT_SCOPE)
+endfunction()
+
+#
+# Given a component name or alias, get the corresponding component target.
+#
+function(__component_get_target var name_or_alias)
+    idf_build_get_property(component_targets __COMPONENT_TARGETS)
+
+    # Assume first that the paramters is an alias.
+    string(REPLACE "::" "_" name_or_alias "${name_or_alias}")
+    set(component_target ___${name_or_alias})
+
+    if(component_target IN_LIST component_targets)
+        set(${var} ${component_target} PARENT_SCOPE)
+        set(target ${component_target})
+    else() # assumption is wrong, try to look for it manually
+        unset(target)
+        foreach(component_target ${component_targets})
+            __component_get_property(_component_name ${component_target} COMPONENT_NAME)
+            if(name_or_alias STREQUAL _component_name)
+                set(target ${component_target})
+                break()
+            endif()
+        endforeach()
+        set(${var} ${target} PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(idf_component_get_property var component property)
+    __component_get_target(component_target ${component})
+    __component_get_property(_var ${component_target} ${property})
+    set(${var} ${_var} PARENT_SCOPE)
 endfunction()

 macro(require_idf_targets)
@@ -104,15 +137,15 @@

     if(__component_kconfig)
         get_filename_component(__component_kconfig "${__component_kconfig}" ABSOLUTE)
-        set(__contents
-"${__contents}\n__component_set_property(${__component_target} KCONFIG \"${__component_kconfig}\""
+        set(__contents
+"${__contents}\n__component_set_property(${__component_target} KCONFIG \"${__component_kconfig}\")"
             )
     endif()

     if(__component_kconfig_projbuild)
         get_filename_component(__component_kconfig "${__component_kconfig}" ABSOLUTE)
-        set(__contents
-"${__contents}\n__component_set_property(${__component_target} KCONFIG_PROJBUILD \"${__component_kconfig_projbuild}\""
+        set(__contents
+"${__contents}\n__component_set_property(${__component_target} KCONFIG_PROJBUILD \"${__component_kconfig_projbuild}\")"
             )
     endif()


[CMake] [NFC] Remove out of date and redundant version requirement

Since we set the minimum required version elsewhere to be higher this actually has meaningful good impact.

git-svn-id: 4c4cc70b1ef44ba2b7963015e681894188cea27e@308376 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/LLDBStandalone.cmake
+++ cmake/modules/LLDBStandalone.cmake
@@ -2,7 +2,6 @@
 # standalone project, using LLVM as an external library:
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   project(lldb)
-  cmake_minimum_required(VERSION 2.8.12.2)

   if (POLICY CMP0022)
     cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required


Added option to compile for CUDA architecture 3.5.

--- cmake/oskar_compiler_options.cmake
+++ cmake/oskar_compiler_options.cmake
@@ -161,7 +161,7 @@
         message("-- INFO: The target CUDA architecture can be changed by using the option:")
         message("-- INFO:   -DCUDA_ARCH=<arch>")
         message("-- INFO: where <arch> is one of:")
-        message("-- INFO:   1.3, 2.0, 2.1, 3.0, or ALL.")
+        message("-- INFO:   1.3, 2.0, 2.1, 3.0, 3.5, or ALL.")
         list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_20)
     elseif (CUDA_ARCH MATCHES 1.1)
         message("-- INFO: Building CUDA device code for architecture 1.1")
@@ -178,6 +178,9 @@
     elseif (CUDA_ARCH MATCHES 3.0)
         message("-- INFO: Building CUDA device code for architecture 3.0")
         list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_30,code=sm_30)
+    elseif (CUDA_ARCH MATCHES 3.5)
+        message("-- INFO: Building CUDA device code for architecture 3.5")
+        list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_35,code=sm_35)
     elseif (CUDA_ARCH MATCHES ALL|[Aa]ll)
         message("-- INFO: Building CUDA device code all supported architectures")
         list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_11,code=sm_11)
@@ -185,6 +188,7 @@
         list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_20)
         list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_20,code=sm_21)
         list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_30,code=sm_30)
+        list(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_35,code=sm_35)
     else()
         message(FATAL_ERROR "-- CUDA_ARCH ${CUDA_ARCH} not recognised!")
     endif()


Update URL to v1.2.1-p1 release; revert SHA1 to 8d8179d71a12bafae3d90b6a5a7fc09cb2e69474

--- cmake/projects/cereal/hunter.cmake
+++ cmake/projects/cereal/hunter.cmake
@@ -18,10 +18,10 @@
     VERSION
     "1.2.1-p1"
     URL
-    "https://github.com/headupinclouds/cereal/archive/v1.2.1.tar.gz"
+    "https://github.com/headupinclouds/cereal/archive/v1.2.1-p1.tar.gz"
     SHA1
-    3b1188758515ed645e9ca073f7077828bdffa41d
-)
+    8d8179d71a12bafae3d90b6a5a7fc09cb2e69474
+    )

 # List of versions here...
 hunter_add_version(


toolchain: host toolchain does not support newlib

The host toolchain does not support newlib.

Signed-off-by: Anas Nashif <0d9952ec84ac43c159f6b7e7ed99a9080c00dd6e@intel.com>

--- cmake/toolchain/host/generic.cmake
+++ cmake/toolchain/host/generic.cmake
@@ -1 +1,2 @@
 set(COMPILER host-gcc)
+set(TOOLCHAIN_HAS_NEWLIB OFF CACHE BOOL "True if toolchain supports newlib")


cmake: fix version search

cmake: fix version search

Currently the cmake file uses both WAFFLE_INCLUDE_DIR and
WAFFLE_INCLUDE_DIRS, but only the DIRS version is actually defined.
cmake doesn't complain about the undefined variable, instead it treats
it as a blank string. This leads to the version never being checked.

This patch replaces DIR with DIRS, which corrects the problem.

Fixes #27: https://github.com/waffle-gl/waffle/issues/27
Signed-off-by: Dylan Baker <c26a678a04c601e0311b0d6006e67eee6ed19a8e@intel.com>
Reviewed-by: Jordan Justen <a79006884ba9cf5f4f7fcbb92a15b208780d8c97@intel.com>
Reviewed-by: Chad Versace <a557f7f75bf28dc19ac99107f5cc7cd6b3fbdb1a@intel.com>

--- cmake/Modules/FindWaffle.cmake
+++ cmake/Modules/FindWaffle.cmake
@@ -48,8 +48,8 @@
     NAMES "waffle-${WAFFLE_FIND_VERSION_MAJOR}"
 )

-if(WAFFLE_INCLUDE_DIR AND EXISTS "${WAFFLE_INCLUDE_DIR}/waffle_version.h")
-    file(STRINGS "${WAFFLE_INCLUDE_DIR}/waffle_version.h" WAFFLE_VERSION_H)
+if(WAFFLE_INCLUDE_DIRS AND EXISTS "${WAFFLE_INCLUDE_DIRS}/waffle_version.h")
+    file(STRINGS "${WAFFLE_INCLUDE_DIRS}/waffle_version.h" WAFFLE_VERSION_H)
     string(REGEX REPLACE "^.*WAFFLE_MAJOR_VERSION ([0-9]+).*$" "\\1" WAFFLE_MAJOR_VERSION "${WAFFLE_VERSION_H}")
     string(REGEX REPLACE "^.*WAFFLE_MINOR_VERSION ([0-9]+).*$" "\\1" WAFFLE_MINOR_VERSION "${WAFFLE_VERSION_H}")
     string(REGEX REPLACE "^.*WAFFLE_PATCH_VERSION ([0-9]+).*$" "\\1" WAFFLE_PATCH_VERSION "${WAFFLE_VERSION_H}")
@@ -72,9 +72,7 @@
 # variables from the cache *and* local scope.
 #
 unset(WAFFLE_FIND_VERSION_MAJOR CACHE)
-unset(WAFFLE_INCLUDE_DIR CACHE)
 unset(WAFFLE_VERSION_H CACHE)

 unset(WAFFLE_FIND_VERSION_MAJOR)
-unset(WAFFLE_INCLUDE_DIR)
 unset(WAFFLE_VERSION_H)


cmake: lapack optimized code requires cblas.h

--- cmake/OpenCVFindLibsPerf.cmake
+++ cmake/OpenCVFindLibsPerf.cmake
@@ -6,14 +6,17 @@
 if(WITH_LAPACK)
   find_package(LAPACK)
   if(LAPACK_FOUND)
-      find_path(LAPACK_INCLUDE_DIR "lapacke.h")
-      if(LAPACK_INCLUDE_DIR)
+    find_path(LAPACKE_INCLUDE_DIR "lapacke.h")
+    if(LAPACKE_INCLUDE_DIR)
+      find_path(CBLAS_INCLUDE_DIR "cblas.h")
+      if(CBLAS_INCLUDE_DIR)
         set(HAVE_LAPACK 1)
-        ocv_include_directories(${LAPACK_INCLUDE_DIR})
+        ocv_include_directories(${LAPACKE_INCLUDE_DIR} ${CBLAS_INCLUDE_DIR})
         list(APPEND OPENCV_LINKER_LIBS ${LAPACK_LIBRARIES})
       endif()
-  endif(LAPACK_FOUND)
-endif(WITH_LAPACK)
+    endif()
+  endif()
+endif()

 # --- TBB ---
 if(WITH_TBB)


Improve find_library usage

Improve find_library usage

Let cmake determine which library directories to search in, and just provide hints for which subdirectories to search.

This allows msilbc be found when it is in a different location to where kopete will be installed.

svn path=/trunk/KDE/kdenetwork/kopete/; revision=1240173

--- cmake/modules/FindmsiLBC.cmake
+++ cmake/modules/FindmsiLBC.cmake
@@ -11,7 +11,7 @@
 	set ( MSILBC_FOUND true )
 else ( MSILBC_LIBRARY )

-	find_library ( MSILBC_LIBRARY NAMES msilbc PATHS ${LIB_INSTALL_DIR}/mediastreamer/plugins ${CMAKE_LIBRARY_PATH}/mediastreamer/plugins ${CMAKE_INSTALL_PREFIX}/lib/mediastreamer/plugins )
+	find_library ( MSILBC_LIBRARY NAMES msilbc PATH_SUFFIXES mediastreamer/plugins )

 	if ( MSILBC_LIBRARY )
 		set ( MSILBC_FOUND true )


cmake: set correct ROOT_ARCHITECTURE on PPC64LE, linuxppc64gcc

ROOT_ARCHITECTURE is linuxppc64gcc instead of ppc64le. linuxppc64gcc is
used on various CMake and Makefile files for a long time already.

Signed-off-by: David Abdurachmanov <3747debe97ca693bc6b62ba4169dd2a50fce172c@cern.ch>

--- cmake/modules/SetUpLinux.cmake
+++ cmake/modules/SetUpLinux.cmake
@@ -35,10 +35,10 @@
   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
   if(CMAKE_COMPILER_IS_GNUCXX)
     message(STATUS "Found GNU compiler collection")
-    set(ROOT_ARCHITECTURE ppc64le)
-  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-    message(STATUS "Found CLANG compiler")
-    set(ROOT_ARCHITECTURE ppc64le)
+    set(ROOT_ARCHITECTURE linuxppc64gcc)
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    message(STATUS "Found CLANG compiler")
+    set(ROOT_ARCHITECTURE linuxppc64gcc)
   else()
     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
   endif()


Cope with the change of CMAKE_COMPILER_ID from  Clang to AppleClang (Xcode 7?)

--- cmake/modules/SetUpMacOS.cmake
+++ cmake/modules/SetUpMacOS.cmake
@@ -94,7 +94,7 @@
      set(EXEEXT "")
      set(SOEXT "so")

-  elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
+  elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)

      message(STATUS "Found LLVM compiler collection")

@@ -128,7 +128,7 @@
      set(EXEEXT "")
      set(SOEXT "so")
   else()
-    MESSAGE(FATAL_ERROR "There is no setup for this compiler up to now. Don't know waht to do. Stop cmake at this point.")
+    MESSAGE(FATAL_ERROR "There is no setup for this compiler with ID=${CMAKE_CXX_COMPILER_ID} up to now. Don't know what to do. Stop cmake at this point.")
   endif()

   #---Set Linker flags----------------------------------------------------------------------


fixed: cmake error if OSG_SUPPORT_ROOT not set

--- Source/Contrib/ComputeBase/OSGContribComputeBase.Prepare.cmake
+++ Source/Contrib/ComputeBase/OSGContribComputeBase.Prepare.cmake
@@ -40,11 +40,15 @@
 #OSG_CONFIGURE_NVOCLUTILS()
 OSG_CONFIGURE_CUDACOMMON()
 #OSG_CONFIGURE_CUDAUTIL()
-OSG_CONFIGURE_CUDAPARTSDK(${OSG_SUPPORT_ROOT})

-MESSAGE("  with nvsdkcommon  : ${OSG_WITH_NVSDKCOMMON}")
-MESSAGE("  with cudacommon   : ${OSG_WITH_CUDACOMMON}" )
-MESSAGE("  with opencl utils : ${OSG_WITH_NVOCLUTILS}" )
+IF(OSG_SUPPORT_ROOT)
+  OSG_CONFIGURE_CUDAPARTSDK(${OSG_SUPPORT_ROOT})
+ENDIF()
+
+MESSAGE("  with nvsdkcommon  : ${OSG_WITH_NVSDKCOMMON}" )
+MESSAGE("  with cudacommon   : ${OSG_WITH_CUDACOMMON}"  )
+MESSAGE("  with opencl utils : ${OSG_WITH_NVOCLUTILS}"  )
+MESSAGE("  with partsdk      : ${OSG_WITH_CUDAPARTSDK}" )
 MESSAGE("")

 LIST(APPEND OSG_ADDITIONAL_CONFIGURE_LINES "#cmakedefine OSG_WITH_NVSDKCOMMON 1")


ENH: Update VariationalRegistration

ENH: Update VariationalRegistration

VariationalRegistration master branch is used instead of 'develop'
branch since all pull-requests have now been merged in upstream
repository [1] and pushed in ITK VariationalRegistration repository [2].

[1] https://github.com/VariationalRegistration/VariationalRegistration
[2] https://github.com/InsightSoftwareConsortium/ITKVariationalRegistration

Change-Id: Iaa3e21b8852cd5c7099acec4a5f0b016c65dd98d

--- Modules/Remote/VariationalRegistration.remote.cmake
+++ Modules/Remote/VariationalRegistration.remote.cmake
@@ -5,5 +5,5 @@
 itk_fetch_module(VariationalRegistration
   "A module to perform variational image registration. https://hdl.handle.net/10380/3460"
   GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKVariationalRegistration.git
-  GIT_TAG 68698e7558761846ae0a9b48c20f9f09f41698ca
+  GIT_TAG 5110f1b4304f450b46bbbaf0f3818a4bac65b154
   )


ManageSourceVersionControl: add pre_link between after_release_commit and rpm_changelog_prev

--- Modules/ManageSourceVersionControl.cmake
+++ Modules/ManageSourceVersionControl.cmake
@@ -32,9 +32,15 @@
 	    COMMENT "Pre-tagging check"
 	    )

-	ADD_CUSTOM_COMMAND(TARGET after_release_commit PRELINK
+	ADD_CUSTOM_COMMAND(TARGET after_release_commit PRE_LINK
 	    COMMAND make changelog_prev_update
 	    )
+
+	IF(TARGET rpm_changelog_prev_update)
+	    ADD_CUSTOM_COMMAND(TARGET after_release_commit PRE_LINK
+		COMMAND make rpm_changelog_prev_update
+		)
+	ENDIF(TARGET rpm_changelog_prev_update)
     ENDMACRO(MANAGE_SOURCE_VERSION_CONTROL_COMMON)

     MACRO(MANAGE_SOURCE_VERSION_CONTROL_GIT)


cmake: clear the svn libraries variable if not found.

--- CMakeModules/FindSvnClient.cmake
+++ CMakeModules/FindSvnClient.cmake
@@ -70,4 +70,7 @@

 	include(FindPackageHandleStandardArgs)
 	FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG LIBSVN_LIBRARIES LIBSVN_INCLUDE_DIR)
+        if(NOT LIBSVN_FOUND)
+		set(LIBSVN_LIBRARIES "")
+        endif(NOT LIBSVN_FOUND)
 endif(HAVE_APR_CONFIG OR MSVC)


Restore auto-detection of SVN libs on Windows

--- CMakeModules/FindSvnClient.cmake
+++ CMakeModules/FindSvnClient.cmake
@@ -22,7 +22,7 @@
     FIND_LIBRARY(${compLibName}
       NO_DEFAULT_PATH
       NAMES ${compLib}
-      HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX}
+      HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib
       PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
       PATHS
       /opt/local
@@ -55,7 +55,7 @@
 	find_path(LIBSVN_INCLUDE_DIR svn_client.h
       NO_DEFAULT_PATH
 	  HINTS
-	  $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX}
+	  $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include
 	  PATH_SUFFIXES include/subversion-1
 	  PATHS
       /opt/local


Bugfix: Actually turn support of if it is not found...

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

--- deal.II/contrib/cmake/macros/macro_configure_feature.cmake
+++ deal.II/contrib/cmake/macros/macro_configure_feature.cmake
@@ -241,7 +241,7 @@
             ENDIF()
           ELSE()
               IF(DEAL_II_FEATURE_AUTODETECTION)
-                SET_CACHED_OPTION(DEAL_II_WITH_${feature} ON)
+                SET_CACHED_OPTION(DEAL_II_WITH_${feature} OFF)
               ELSE()
                 IF(FEATURE_${feature}_CUSTOM_ERROR_MESSAGE)
                   RUN_COMMAND(


ctkMacroWrapPythonQt internally includes ctkMacroSetPaths

ctkMacroSetPaths is referenced using CTK_CMAKE_DIR.

In case the macro is used by a different project including CTK,
the path to the macro will be properly resolved since CTK_CMAKE_DIR
is set in CTKConfig.cmake

--- CMake/ctkMacroWrapPythonQt.cmake
+++ CMake/ctkMacroWrapPythonQt.cmake
@@ -62,6 +62,8 @@
   ENDIF()
   FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/ctkMacroWrapPythonQt_log.txt" "${msg}\n")
 ENDFUNCTION()
+
+INCLUDE(${CTK_CMAKE_DIR}/ctkMacroSetPaths.cmake)

 #
 # Convenient function allowing to invoke re.search(regex, string) using the given interpreter.


Remove a couple patterns from the Boost header exclude list.  Some headers in these directories are needed indirectly.

--HG--
branch : v1-7

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -141,14 +141,12 @@
 	  # headers (try to exclude things we don't need)
 	  install(DIRECTORY "${Boost_INCLUDE_DIR}/boost" DESTINATION "boost_${Boost_LIB_VERSION}"
 		PATTERN "accumulators" EXCLUDE
-		PATTERN "algorithm" EXCLUDE
 		PATTERN "archive" EXCLUDE
 		PATTERN "asio" EXCLUDE
 		PATTERN "assign" EXCLUDE
 		PATTERN "bimap" EXCLUDE
 		PATTERN "circular_buffer" EXCLUDE
 		PATTERN "compatibility" EXCLUDE
-		PATTERN "concept" EXCLUDE
 		PATTERN "concept_check" EXCLUDE
 		PATTERN "dynamic_bitset" EXCLUDE
 		PATTERN "filesystem" EXCLUDE


Update FindCHIBIOS.cmake

Update FindCHIBIOS.cmake

- correct include folders order and remove wrong one

--- CMake/Modules/FindCHIBIOS.cmake
+++ CMake/Modules/FindCHIBIOS.cmake
@@ -31,10 +31,9 @@
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/osal/rt)
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/oslib/include)
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/rt/include)
-list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/ports/ARMCMx/compilers/GCC)
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/${TARGET_SERIES})
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/ports/ARMCMx)
-list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/ports/compilers/GCC)
+list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/ports/ARMCMx/compilers/GCC)
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/abstractions/cmsis_os)
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/startup/ARMCMx/compilers/GCC)
 list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/ext/CMSIS/include)


Updated FindSuperLU.cmake to ensure that SuperLU only is reported as found if a version that is able to compile TBTK code is found.

--- CMake/Modules/FindSuperLU.cmake
+++ CMake/Modules/FindSuperLU.cmake
@@ -11,10 +11,58 @@
 	PATH_SUFFIXES lib lib32 lib64 SRC
 )

-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-	SuperLU FOUND_VAR SuperLU_FOUND
-	REQUIRED_VARS SUPER_LU_INCLUDES SUPER_LU_LIBRARIES
+SET(CMAKE_REQUIRED_INCLUDES slu_ddefs.h slu_zdefs.h)
+SET(CMAKE_REQUIRED_LIBRARIES superlu lapack blas)
+INCLUDE(CheckCXXSourceCompiles)
+CHECK_CXX_SOURCE_COMPILES(
+	"
+	#include <slu_ddefs.h>
+	#include <slu_zdefs.h>
+
+	int main(int argc, char **argv){
+		superlu_options_t options;
+		int *etree;
+		SuperMatrix matrixCP;
+		int panelSize;
+		int relax;
+		int lwork;
+		GlobalLU_t glu;
+		int info;
+
+		SuperMatrix *L;
+		SuperMatrix *U;
+		int *rowPermutations;
+		int *columnPermutations;
+		SuperLUStat_t *statistics;
+
+		zgstrf(
+                        &options,
+                        &matrixCP,
+                        relax,
+                        panelSize,
+                        etree,
+                        NULL,
+                        lwork,
+                        columnPermutations,
+                        rowPermutations,
+                        L,
+                        U,
+                        &glu,
+                        statistics,
+                        &info
+                );
+
+		return 0;
+	}"
+	SUPER_LU_COMPILED
 )

+IF(${SUPER_LU_COMPILED})
+	INCLUDE(FindPackageHandleStandardArgs)
+	FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+		SuperLU FOUND_VAR SuperLU_FOUND
+		REQUIRED_VARS SUPER_LU_INCLUDES SUPER_LU_LIBRARIES
+	)
+ENDIF(${SUPER_LU_COMPILED})
+
 #MARK_AS_ADVANCED(SUPER_LU_INCLDUES SUPER_LU_LIBRARIES)


Dependencies: update freetype to 2.6.5

Dependencies: update freetype to 2.6.5

--- CMake/Dependencies.cmake
+++ CMake/Dependencies.cmake
@@ -122,24 +122,24 @@

     message(STATUS "Building freetype")
     file(DOWNLOAD
-        http://download.savannah.gnu.org/releases/freetype/freetype-2.6.2.tar.gz
-        ./freetype-2.6.2.tar.gz)
-    execute_process(COMMAND cmake -E tar xf freetype-2.6.2.tar.gz)
+        http://download.savannah.gnu.org/releases/freetype/freetype-2.6.5.tar.gz
+        ./freetype-2.6.5.tar.gz)
+    execute_process(COMMAND cmake -E tar xf freetype-2.6.5.tar.gz)
     # patch toolchain for iOS
     execute_process(COMMAND cmake -E copy
         ${CMAKE_SOURCE_DIR}/CMake/toolchain/ios.toolchain.xcode.cmake
-        freetype-2.6.2/builds/cmake/iOS.cmake)
+        freetype-2.6.5/builds/cmake/iOS.cmake)
     execute_process(COMMAND cmake
         -DCMAKE_INSTALL_PREFIX=${OGREDEPS_PATH}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DWITH_BZip2=OFF # tries to use it on iOS otherwise
         # workaround for broken iOS toolchain in freetype
-        -DPROJECT_SOURCE_DIR=${CMAKE_BINARY_DIR}/freetype-2.6.2
+        -DPROJECT_SOURCE_DIR=${CMAKE_BINARY_DIR}/freetype-2.6.5
         ${CROSS}
         -G ${CMAKE_GENERATOR}
         ..
-        WORKING_DIRECTORY freetype-2.6.2/objs)
-    execute_process(COMMAND cmake --build freetype-2.6.2/objs --target install)
+        WORKING_DIRECTORY freetype-2.6.5/objs)
+    execute_process(COMMAND cmake --build freetype-2.6.5/objs --target install)
 endif()

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


Added support for deploying UCRT in MSVC 2015.

--- cmake/DeployQt.cmake
+++ cmake/DeployQt.cmake
@@ -43,6 +43,14 @@

     # windeployqt doesn't work correctly with the system runtime libraries,
     # so we fall back to one of CMake's own modules for copying them over
+
+    # Doing this with MSVC 2015 requires CMake 3.6+
+    if((MSVC_VERSION VERSION_EQUAL 1900 OR MSVC_VERSION VERSION_GREATER 1900)
+            AND CMAKE_VERSION VERSION_LESS "3.6")
+        message(WARNING "Deploying with MSVC 2015+ requires CMake 3.6+")
+    endif()
+
+    set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
     include(InstallRequiredSystemLibraries)
     foreach(lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
         get_filename_component(filename "${lib}" NAME)


VFS-8242 Fixed Fuse3 detection for CentOS

--- cmake/FindFUSE.cmake
+++ cmake/FindFUSE.cmake
@@ -86,7 +86,7 @@
 if(FUSE_REQUIRED_VERSION EQUAL 3)
 find_path(
     FUSE_INCLUDE_DIRS
-    NAMES fuse_log.h
+    NAMES fuse_common.h
     PATHS "${PC_FUSE_INCLUDE_DIRS}"
     DOC "Include directories for FUSE"
 )


Silence complaints from FindSDL2 cmake module

Added https://github.com/aminosbh/sdl2-cmake-modules/pull/6

--- cmake/FindSDL2.cmake
+++ cmake/FindSDL2.cmake
@@ -42,13 +42,15 @@

 ::

-  SDL2::Core
+  SDL2::Core (for compatibility with older versions)
+  SDL2::SDL2 (compatibility with CONFIG mode)
     The SDL2 library, if found.
-    Libraries should link to SDL2::Core
-
-  SDL2::Main
+    Libraries should link to SDL2::SDL2
+
+  SDL2::Main (for compatibility with older versions)
+  SDL2::SDL2main (compatibility with CONFIG mode)
     The SDL2main library, if found.
-    Applications should link to SDL2::Main instead of SDL2::Core
+    Applications should link to SDL2::SDL2main instead of SDL2::SDL2

@@ -310,16 +312,14 @@

 include(FindPackageHandleStandardArgs)

-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
-                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR
+set(SDL2_REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+if(SDL2MAIN_LIBRARY)
+  list(APPEND SDL2_REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR)
+endif()
+
+find_package_handle_standard_args(SDL2
+                                  REQUIRED_VARS ${SDL2_REQUIRED_VARS}
                                   VERSION_VAR SDL2_VERSION_STRING)
-
-if(SDL2MAIN_LIBRARY)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main
-                                    REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR
-                                    VERSION_VAR SDL2_VERSION_STRING)
-endif()
-

 mark_as_advanced(SDL2_PATH
                  SDL2_NO_DEFAULT_PATH
@@ -384,5 +384,9 @@
                    INTERFACE_LINK_LIBRARIES SDL2::MainInternal)
     endif()

-  endif()
-endif()
+    # compatibility targets
+    add_library(SDL2::SDL2 ALIAS SDL2::Core)
+    add_library(SDL2::SDL2main ALIAS SDL2::Main)
+
+  endif()
+endif()


fix p4c_add_test_label macro

fix p4c_add_test_label macro

--- cmake/P4CUtils.cmake
+++ cmake/P4CUtils.cmake
@@ -104,7 +104,7 @@

 macro(p4c_add_test_label tag newLabel testname)
   set (__testname ${tag}/${testname})
-  get_property(__labels TEST ${__testname})
+  get_property(__labels TEST ${__testname} PROPERTY LABELS)
   set_tests_properties(${__testname} PROPERTIES LABELS "${__labels};${newLabel}")
 endmacro(p4c_add_test_label)


cmake/emu: Add qemu SMP flags automatically

No need to do this in arch code, all qemu variants speak the same
command line and the kconfig values we need are easily available.

Signed-off-by: Andy Ross <c70f9a6bf6ee0cd69c8af4ce5e6b131945769315@intel.com>

--- cmake/emu/qemu.cmake
+++ cmake/emu/qemu.cmake
@@ -227,6 +227,10 @@
   set(QEMU_PIPE_COMMENT "\nTo exit from QEMU enter: 'CTRL+a, x'\n")
 endif()

+if(CONFIG_SMP)
+  list(APPEND QEMU_SMP_FLAGS -smp cpus=${CONFIG_MP_NUM_CPUS})
+endif()
+
 # Use flags passed in from the environment
 set(env_qemu $ENV{QEMU_EXTRA_FLAGS})
 separate_arguments(env_qemu)
@@ -254,6 +258,7 @@
     ${QEMU_FLAGS}
     ${QEMU_EXTRA_FLAGS}
     ${MORE_FLAGS_FOR_${target}}
+    ${QEMU_SMP_FLAGS}
     ${QEMU_KERNEL_OPTION}
     DEPENDS ${logical_target_for_zephyr_elf}
     WORKING_DIRECTORY ${APPLICATION_BINARY_DIR}


cmake: Fix example project update command

Since commit 9147917a (Refactor external project logic, 2016-07-22)
we accidentally used the computed download command as the update
command for examples.  Fix the variable reference.

--- cmake/examples.cmake
+++ cmake/examples.cmake
@@ -29,7 +29,7 @@
       SOURCE_DIR ${PROJECT_SOURCE_DIR}/drake/examples/${EXAMPLE}
       DOWNLOAD_COMMAND ${_ex_DOWNLOAD_COMMAND}
       DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}
-      UPDATE_COMMAND ${_ex_DOWNLOAD_COMMAND}
+      UPDATE_COMMAND ${_ex_UPDATE_COMMAND}
       CONFIGURE_COMMAND ""
       BUILD_COMMAND ""
       INSTALL_COMMAND "")


small fix in cmake

small fix in cmake

--- cmake/gismoUse.cmake
+++ cmake/gismoUse.cmake
@@ -118,19 +118,21 @@
 endmacro(aux_instance_directory)

 function(get_repo_info repository revision) #REPO_REVISION
-  if (EXISTS "${CMAKE_SOURCE_DIR}/.svn")
-    set(${repository} "svn" PARENT_SCOPE)
-    #find_program(Subversion_SVN_EXECUTABLE NAMES svn svn.bat)
-    find_package(Subversion)
-    set(${revision} ${Project_WC_REVISION} PARENT_SCOPE)
-    #elseif (EXISTS "${CMAKE_SOURCE_DIR}/.git/svn/refs")
-  elseif (EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    set(${repository} "git" PARENT_SCOPE)
-    find_program(git_executable NAMES git git.exe git.cmd)
-    execute_process(COMMAND ${git_executable} log -1 --pretty=format:%H
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} TIMEOUT 5
-      RESULT_VARIABLE git_res OUTPUT_VARIABLE git_rev)
-    set(${revision} ${git_rev} PARENT_SCOPE)
+  if (NOT DEFINED ${repository})
+    if (EXISTS "${CMAKE_SOURCE_DIR}/.svn")
+      set(${repository} "svn" PARENT_SCOPE)
+      #find_program(Subversion_SVN_EXECUTABLE NAMES svn svn.bat)
+      find_package(Subversion)
+      set(${revision} ${Project_WC_REVISION} PARENT_SCOPE)
+      #elseif (EXISTS "${CMAKE_SOURCE_DIR}/.git/svn/refs")
+    elseif (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+      set(${repository} "git" PARENT_SCOPE)
+      find_program(git_executable NAMES git git.exe git.cmd)
+      execute_process(COMMAND ${git_executable} log -1 --pretty=format:%H
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} TIMEOUT 5
+	RESULT_VARIABLE git_res OUTPUT_VARIABLE git_rev)
+      set(${revision} ${git_rev} PARENT_SCOPE)
+    endif()
   endif()
-  #set( ${repo_exe}
-endfunction()
+    #set( ${repo_exe}
+  endfunction()


switch dashboard

switch dashboard

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -13,8 +13,8 @@
 set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "my.cdash.org/")
 # set(CTEST_DROP_SITE "cdash-tripop.inrialpes.fr")
-#set(CTEST_DROP_LOCATION "/submit.php?project=Siconos-Dashboard")
-set(CTEST_DROP_LOCATION "/submit.php?project=Siconos+Sandbox")
+set(CTEST_DROP_LOCATION "/submit.php?project=Siconos-Dashboard")
+#set(CTEST_DROP_LOCATION "/submit.php?project=Siconos+Sandbox")
 set(CTEST_DROP_SITE_CDASH TRUE)
 if(BUILD_NAME)
   set(CTEST_BUILD_NAME Siconos-${BUILD_NAME})


modified Directories.cmake

modified Directories.cmake

--- Directories.cmake
+++ Directories.cmake
@@ -9,12 +9,8 @@
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/thirdparty/gtest-1.6.0/include)
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/thirdparty/ticpp)
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/thirdparty/FreeImage-3.15.0/Dist)
-    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/thirdparty/ann_1.1.2/include)
-    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/thirdparty/libccd/src)
-    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/thirdparty/fcl/include)

     LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/thirdparty/lib)
-#    LINK_DIRECTORIES(/usr/local/lib)
     LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/bin)
     LINK_DIRECTORIES(/Developer/SDKs/MacOSX10.6.sdk/usr/lib)


Cleanup

Cleanup

--- DoxygenRule.cmake
+++ DoxygenRule.cmake
@@ -100,11 +100,9 @@
 endif()
 add_dependencies(doxygen_html ${PROJECT_NAME}_doxygen_html)

-if(COVERAGE)
-  # CoverageReport generated in this case
-  add_custom_target(${PROJECT_NAME}_doxygen DEPENDS ${PROJECT_NAME}_doxygen_html tests)
-else()
-  add_custom_target(${PROJECT_NAME}_doxygen DEPENDS ${PROJECT_NAME}_doxygen_html)
+add_custom_target(${PROJECT_NAME}_doxygen DEPENDS ${PROJECT_NAME}_doxygen_html)
+if(COVERAGE) # CoverageReport generated by "tests" in this case
+  add_dependencies(${PROJECT_NAME}_doxygen tests)
 endif()

 if(NOT TARGET doxygen)


Added missing controllib

Added missing controllib

Signed-off-by: Mark Charlebois <f1891e7fc976ae1bd489627e2954fb730751d728@gmail.com>

--- cmake/configs/posix_eagle_legacy_driver_release.cmake
+++ cmake/configs/posix_eagle_legacy_driver_release.cmake
@@ -29,6 +29,7 @@
 	modules/simulator
 	modules/commander

+	lib/controllib
 	lib/mathlib
 	lib/mathlib/math/filter
 	lib/geo


Fix typo.

Fix typo.

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

--- deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
+++ deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
@@ -1,7 +1,7 @@
 ## ---------------------------------------------------------------------
 ## $Id$
 ##
-## Copyright (C) 2012 - 2013 by the deal.II authors
+## Copyright (C) 2012 - 2014 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -41,7 +41,7 @@
   # Generator specific values:
   IF(CMAKE_GENERATOR MATCHES "Ninja")
     #
-    # Ninja doesn't like a redifinition of the "help" target, so use "info"
+    # Ninja doesn't like a redefinition of the "help" target, so use "info"
     # in this case...
     #
     SET(_make_command "$ ninja")


FIX (#2323): enabled mitkTrackingDeviceSourceTest

--- Modules/IGT/Testing/files.cmake
+++ Modules/IGT/Testing/files.cmake
@@ -16,7 +16,7 @@
    mitkNDIProtocolTest.cpp
    mitkNDITrackingDeviceTest.cpp
    mitkTimeStampTest.cpp
-   #mitkTrackingDeviceSourceTest.cpp
+   mitkTrackingDeviceSourceTest.cpp
    mitkTrackingVolumeTest.cpp
    mitkTrackingDeviceTest.cpp
    mitkTrackingToolTest.cpp


Linux: Disabled using old Spdlog from OS

--- Dependencies/Spdlog/Spdlog.cmake
+++ Dependencies/Spdlog/Spdlog.cmake
@@ -1,5 +1,6 @@
 #Spdlog
 yage_setup_dependency(Spdlog
+        NOT_OS TRUE
         CONAN spdlog/1.0.0@bincrafters/stable
         VAR_NAME SPDLOG)


do not call DEAL_II_SETUP_TARGET if already called

--- cmake/macros/macro_deal2lkit_setup_target.cmake
+++ cmake/macros/macro_deal2lkit_setup_target.cmake
@@ -132,6 +132,10 @@
       )
   ENDIF()

-  DEAL_II_SETUP_TARGET(${_target} ${ARGN})
+  get_property(_linked_libraries TARGET ${_target}
+    PROPERTY LINK_LIBRARIES)
+  if(NOT "${_linked_libraries}" MATCHES "${DEAL_II_TARGET_${_build}}")
+    DEAL_II_SETUP_TARGET(${_target} ${ARGN})
+  endif()

 ENDMACRO()


Disable TBSS plugin. Not maintained and probably not used for ages.

--- Plugins/PluginList.cmake
+++ Plugins/PluginList.cmake
@@ -50,7 +50,6 @@
   org.mitk.gui.qt.diffusionimaging.preprocessing:OFF
   org.mitk.gui.qt.diffusionimaging.reconstruction:OFF
   org.mitk.gui.qt.diffusionimaging.registration:OFF
-  org.mitk.gui.qt.diffusionimaging.tbss:OFF
   org.mitk.gui.qt.diffusionimaging.tractography:OFF
   org.mitk.gui.qt.diffusionimaging.python:OFF
   org.mitk.gui.qt.dosevisualization:OFF


Fix for Wayland support for Linux build, native & cross-compiling mode.

--- CMake/Modules/FindWayland.cmake
+++ CMake/Modules/FindWayland.cmake
@@ -24,7 +24,10 @@
 #
 #  WAYLAND_FOUND
 #  WAYLAND_INCLUDE_DIRS
+#  WAYLAND_CORE_PROTOCOL_DIR
+#  WAYLAND_PROTOCOLS_DIR
 #  WAYLAND_CLIENT
+#  WAYLAND_SCANNER
 #  WAYLAND_CURSOR
 #  WAYLAND_EGL
 #  EGL
@@ -32,13 +35,16 @@
 #

 find_path (WAYLAND_INCLUDE_DIRS NAMES wayland-client.h DOC "Wayland include directory")
+find_path (WAYLAND_CORE_PROTOCOL_DIR NAMES wayland.xml PATHS /usr/share/wayland DOC "Wayland core protocol directory")
+find_path (WAYLAND_PROTOCOLS_DIR NAMES stable unstable PATHS /usr/share/wayland-protocols DOC "Wayland protocol directory")
 find_library (WAYLAND_CLIENT NAMES wayland-client DOC "Wayland client library")
+find_program (WAYLAND_SCANNER NAMES wayland-scanner DOC "Wayland scanner host tool")
 find_library (WAYLAND_CURSOR NAMES wayland-cursor DOC "Wayland compositor infrastructure - cursor library")
 find_library (WAYLAND_EGL NAMES wayland-egl DOC "Wayland EGL library")
 find_library (EGL NAMES EGL DOC "EGL library")
 find_library (XKB NAMES xkbcommon DOC "Xkb common library")

 include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (Wayland REQUIRED_VARS WAYLAND_CLIENT WAYLAND_CURSOR WAYLAND_EGL EGL XKB WAYLAND_INCLUDE_DIRS FAIL_MESSAGE "Could NOT find Wayland display server")
+find_package_handle_standard_args (Wayland REQUIRED_VARS WAYLAND_CLIENT WAYLAND_SCANNER WAYLAND_CURSOR WAYLAND_EGL EGL XKB WAYLAND_INCLUDE_DIRS WAYLAND_CORE_PROTOCOL_DIR WAYLAND_PROTOCOLS_DIR FAIL_MESSAGE "Could NOT find Wayland display server")

-mark_as_advanced (WAYLAND_INCLUDE_DIRS WAYLAND_CLIENT WAYLAND_CURSOR WAYLAND_EGL EGL XKB)
+mark_as_advanced (WAYLAND_INCLUDE_DIRS WAYLAND_CORE_PROTOCOL_DIR WAYLAND_PROTOCOLS_DIR WAYLAND_CLIENT WAYLAND_SCANNER WAYLAND_CURSOR WAYLAND_EGL EGL XKB)


Friendlier status message when MPI is found.

--- CMake/hoomd/HOOMDMPISetup.cmake
+++ CMake/hoomd/HOOMDMPISetup.cmake
@@ -44,7 +44,7 @@
            message(STATUS "Enabling MPI<->CUDA interoperability.")
            option(ENABLE_MPI_CUDA "Enable MPI<->CUDA interoperability" on)
         else(MPI_CUDA)
-           message(STATUS "MPI found, but without CUDA interoperability.")
+           message(STATUS "Enabling MPI.")
            option(ENABLE_MPI_CUDA "Enable MPI<->CUDA interoperability" off)
         endif(MPI_CUDA)
     endif (ENABLE_CUDA AND NOT DEFINED ENABLE_MPI_CUDA)


Enabling R by default if detected on the system

All tests are not passing with R enabled. The enum issue has been
resolved with SWIG 2.0.11.

Change-Id: I9a435fab1ebf0bcddf435ec35475278ba98ade85

--- CMake/sitkLanguageOptions.cmake
+++ CMake/sitkLanguageOptions.cmake
@@ -118,18 +118,12 @@
 )
 option ( WRAP_CSHARP "Wrap C#" ${WRAP_CSHARP_DEFAULT} )

-#
-# Below here are the 2nd tier languages they are not enabled automatically if detected
-#
-
 find_package(R QUIET)
 if ( ${R_FOUND} AND NOT WIN32 )
   set ( WRAP_R_DEFAULT ON )
 else( )
   set ( WRAP_R_DEFAULT OFF )
 endif( )
-# SWIG 2.0.9-10 has bugs in enum types
-set ( WRAP_R_DEFAULT OFF )

 list( APPEND SITK_LANGUAGES_VARS
@@ -143,3 +137,7 @@
 if( WIN32 )
   mark_as_advanced( WRAP_R )
 endif()
+
+#
+# Below here are the 2nd tier languages they are not enabled automatically if detected
+#


remove unnecessary code coverage folders

--- CMakeModules/CodeCoverage.cmake
+++ CMakeModules/CodeCoverage.cmake
@@ -108,10 +108,6 @@
         CMAKE_EXE_LINKER_FLAGS_COVERAGE
         CMAKE_SHARED_LINKER_FLAGS_COVERAGE)

-IF (NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "Coverage"))
-    MESSAGE(WARNING "Code coverage results with an optimized (non-Debug) build may be misleading")
-ENDIF () # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
-

 # Param _targetname     The name of new the custom make target
 # Param _testrunner     The name of the target which runs the tests.
@@ -142,7 +138,7 @@

             # Capturing lcov counters and generating report
             COMMAND ${LCOV_PATH} --directory . --capture --output-file ${_outputname}.info
-            COMMAND ${LCOV_PATH} --remove ${_outputname}.info 'tests/*' '/usr/*' --output-file ${_outputname}.info.cleaned
+            COMMAND ${LCOV_PATH} --remove ${_outputname}.info 'tests/*' '/usr/*' 'include/*' 'Test/*' --output-file ${_outputname}.info.cleaned
             COMMAND ${GENHTML_PATH} -o ${_outputname} ${_outputname}.info.cleaned
             COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info ${_outputname}.info.cleaned


Windows fix to FindLibevent.cmake

Windows fix to FindLibevent.cmake

--- CMakeModules/FindLibevent.cmake
+++ CMakeModules/FindLibevent.cmake
@@ -20,7 +20,7 @@
 find_library(LIBEVENT_LIB_EXTRA NAMES event_extra
     HINTS ${PC_LIBEVENT_LIBDIR} ${PC_LIBEVENT_LIBRARY_DIRS}
 )
-
+# On windows for some reason there are no distinct openssl and threading libs
 if (NOT WIN)
     find_Library(LIBEVENT_LIB_PTHREADS NAMES event_pthreads
         HINTS ${PC_LIBEVENT_LIBDIR} ${PC_LIBEVENT_LIBRARY_DIRS}
@@ -31,7 +31,10 @@
 endif()

 if (LIBEVENT_LIB AND LIBEVENT_LIB_CORE AND LIBEVENT_LIB_EXTRA)
-    set(LIBEVENT_LIBRARIES ${LIBEVENT_LIB} ${LIBEVENT_LIB_CORE} ${LIBEVENT_LIB_EXTRA} ${LIBEVENT_LIB_OPENSSL} ${LIBEVENT_LIB_PTHREADS})
+    set(LIBEVENT_LIBRARIES ${LIBEVENT_LIB} ${LIBEVENT_LIB_CORE} ${LIBEVENT_LIB_EXTRA})
+    if (NOT WIN)
+        list(APPEND LIBEVENT_LIBRARIES ${LIBEVENT_LIB_OPENSSL} ${LIBEVENT_LIB_PTHREADS})
+    endif()
     message(STATUS "libevent libs: ${LIBEVENT_LIBRARIES}")
 else()
     message(WARNING "libevent libs not found")


BUG: Use ITK_BUILD_DEFAULT_MODULES, rm FetchMGH

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -114,11 +114,9 @@
       -DITK_BUILD_ALL_MODULES:BOOL=ON
       -DITK_USE_REVIEW:BOOL=ON
       #-DITK_INSTALL_NO_DEVELOPMENT:BOOL=ON
-      -DITK_BUILD_ALL_MODULES:BOOL=ON
+      -DTK_BUILD_DEFAULT_MODULES:BOOL=ON
       -DKWSYS_USE_MD5:BOOL=ON # Required by SlicerExecutionModel
       -DITK_WRAPPING:BOOL=OFF #${BUILD_SHARED_LIBS} ## HACK:  QUICK CHANGE
-
-      -DFetch_MGHIO:BOOL=ON  # Allow building of the MGHIO classes

       ${${proj}_DCMTK_ARGS}
       ${${proj}_WRAP_ARGS}


Only conditionally add ITK tag dependency

Ninja was producing a warning about this unknown file dependency when
USE_ITK_DOXYGEN_TAGS was disabled.

Change-Id: I281cbd343d2fe4c5b20c969887184b4c6f4735d5

--- Utilities/Doxygen/Doxygen.cmake
+++ Utilities/Doxygen/Doxygen.cmake
@@ -50,9 +50,13 @@
     MAIN_DEPENDENCY ${PROJECT_BINARY_DIR}/Utilities/Doxygen/doxygen.config
     DEPENDS "${PROJECT_BINARY_DIR}/Documentation/Doxygen/Examples.dox"
     DEPENDS "${PROJECT_BINARY_DIR}/Documentation/Doxygen/FilterCoverage.dox"
-    DEPENDS "${PROJECT_BINARY_DIR}/Documentation/Doxygen/InsightDoxygen.tag"
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/Utilities/Doxygen
     )
+
+  if (USE_ITK_DOXYGEN_TAGS)
+    add_dependencies( Documentation
+    "${PROJECT_BINARY_DIR}/Documentation/Doxygen/InsightDoxygen.tag" )
+  endif ()

   message( STATUS
     "To generate Doxygen's documentation, you need to build the Documentation target"


COMP: Bump Wiki Examples revision to fix Doxygen warnings.

The file names with a leading space were removed, which will address warnings:

  Associating documentITK-build/Documentation/Doxygen/Examples.dox:365:
  warning: Example WikiExamples/Developer was already documented. Ignoring
  documentation found here.

Change-Id: I8dd78d5ea6b789f45a1b9d20274d2d51a7535c4a

--- Modules/Remote/WikiExamples.remote.cmake
+++ Modules/Remote/WikiExamples.remote.cmake
@@ -8,6 +8,6 @@
 itk_fetch_module(WikiExamples
   "A collection of examples that illustrate how to use ITK."
   GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/ITKWikiExamples.git
-  # December 05, 2014
-  GIT_TAG a9bcee9384a363a1f83ec535c29eded6a36743a1
+  # January 05, 2015
+  GIT_TAG 42c129a898641934a84339c9a0ab69c5295f7dbe
   )


更新openssl版本。（爆出一个高危漏洞）

更新openssl版本。（爆出一个高危漏洞）

--- 3rd_party/openssl/openssl.cmake
+++ 3rd_party/openssl/openssl.cmake
@@ -9,8 +9,8 @@

 set (3RD_PARTY_OPENSSL_PKG_DIR "${3RD_PARTY_OPENSSL_BASE_DIR}/pkg")

-set (3RD_PARTY_OPENSSL_DEFAULT_VERSION "1.1.1f")
-set (3RD_PARTY_OPENSSL_GITHUB_TAG "OpenSSL_1_1_1f")
+set (3RD_PARTY_OPENSSL_DEFAULT_VERSION "1.1.1g")
+set (3RD_PARTY_OPENSSL_GITHUB_TAG "OpenSSL_1_1_1g")
 set (3RD_PARTY_OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/prebuilt/${PROJECT_PREBUILT_PLATFORM_NAME}")
 # "no-hw"
 set (3RD_PARTY_OPENSSL_BUILD_OPTIONS "--prefix=${3RD_PARTY_OPENSSL_ROOT_DIR}" "--openssldir=${3RD_PARTY_OPENSSL_ROOT_DIR}/ssl"


fix spurious cmake error message

fix spurious cmake error message

--- CMakeModules/CompileFlags.cmake
+++ CMakeModules/CompileFlags.cmake
@@ -108,8 +108,11 @@

 # Debug by default

-
-set( VALID_CMAKE_BUILD_TYPES "Debug Release RelWithDebInfo" )
-if ( NOT "${VALID_CMAKE_BUILD_TYPES}" MATCHES ${CMAKE_BUILD_TYPE} )
-    set( CMAKE_BUILD_TYPE Debug )
+if ( NOT MSVC )
+    set( VALID_CMAKE_BUILD_TYPES "Debug Release RelWithDebInfo" )
+    if ( NOT CMAKE_BUILD_TYPE )
+        set( CMAKE_BUILD_TYPE Debug )
+    elseif ( NOT "${VALID_CMAKE_BUILD_TYPES}" MATCHES ${CMAKE_BUILD_TYPE} )
+        set( CMAKE_BUILD_TYPE Debug )
+    endif()
 endif()


Fix CMake syntactical errors in GTest Superbuild

Change-Id: Idf2a8079cb497813d60c863cb31dfdbc8a1736b4

--- SuperBuild/External_GTest.cmake
+++ SuperBuild/External_GTest.cmake
@@ -28,13 +28,13 @@
 endif()

 set(ep_extra_args)
-if(MSVC_VERSION == 1700)
+if(MSVC_VERSION EQUAL 1700)
   # Tuples are limited by _VARIADIC_MAX in VS11. The variadic
   # templates are not deep enough by default. We are not currently
   # using the GTest features which require tuple, so just disable them
   # and hope that upstream premanetly addresses the problem, with out
   # required more CMake core for compiler issues.
-  set(ep_extra_args "${ep_extra_args} -D CMAKE_CXX_FLAGS=-DGTEST_HAS_TR1_TUPLE=0 ${CMAKE_CXX_FLAGS}"
+  set(ep_extra_args "${ep_extra_args} -D CMAKE_CXX_FLAGS=-DGTEST_HAS_TR1_TUPLE=0 ${CMAKE_CXX_FLAGS}")
 endif()

 if(MSVC)


Fix Ospray build dependencies

Fix Ospray build dependencies

Found by @kgillette

--- Superbuild/OsprayExternal.cmake
+++ Superbuild/OsprayExternal.cmake
@@ -26,18 +26,10 @@

 SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 SET(ospray_GIT_TAG "origin/scirun-build")
-SET(ospray_DEPENDENCIES "Tbb_external")
-SET(ospray_DEPENDENCIES "Embree_external")
-SET(ospray_DEPENDENCIES "Ispc_external")
-
-#MESSAGE("in ospray now")
-#MESSAGE(STATUS "TBB_BIN_DIR: ${TBB_BIN_DIR}")
-#MESSAGE(STATUS "TBB_SRC_DIR: ${TBB_SRC_DIR}")
-
-#SET(TBB_ROOT ${TBB_BIN_DIR}/tbb_cmake_build_subdir_release)
-#SET(TBB_DIR ${TBB_SRC_DIR}/cmake)
-#MESSAGE(STATUS "TBB_ROOT: ${TBB_ROOT}")
-#find_package(TBB)
+SET(ospray_DEPENDENCIES
+  "Tbb_external"
+  "Embree_external"
+  "Ispc_external")

 # If CMake ever allows overriding the checkout command or adding flags,
 # git checkout -q will silence message about detached head (harmless).


Move to use patched repository when preparing for release

--- versions.cmake
+++ versions.cmake
@@ -82,8 +82,11 @@
   # Test the revision locally before proposing a move
   set(_paraview_revision "ae4263019d571691dc88ca41da8e85f761cceea0")
 endif()
+# Locally patched ParaView repo, or main repo
+#set(_paraview_repo "https://gitlab.kitware.com/paraview/paraview.git")
+set(_paraview_repo "https://github.com/openchemistry/paraview.git")
 add_revision(paraview
-  GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"
+  GIT_REPOSITORY "${_paraview_repo}"
   GIT_TAG "${_paraview_revision}")

 option(tomviz_FROM_GIT "If enabled then the repository is fetched from git" ON)


Remove CMake support file we no longer use

--- cmake/CheckCXXSymbolExists.cmake
+++ cmake/CheckCXXSymbolExists.cmake
@@ -1,42 +0,0 @@
-# - Check if a symbol exists as a function, variable, or macro in C++
-# CHECK_CXX_SYMBOL_EXISTS(<symbol> <files> <variable>)
-#
-# Check that the <symbol> is available after including given header
-# <files> and store the result in a <variable>.  Specify the list
-# of files in one argument as a semicolon-separated list.
-# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as opposed
-# to CHECK_SYMBOL_EXISTS(), which works only for C.
-#
-# If the header files define the symbol as a macro it is considered
-# available and assumed to work.  If the header files declare the
-# symbol as a function or variable then the symbol must also be
-# available for linking.  If the symbol is a type or enum value
-# it will not be recognized (consider using CheckTypeSize or
-# CheckCSourceCompiles).
-#
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
-#
-#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
-#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-#  CMAKE_REQUIRED_INCLUDES = list of include directories
-#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-
-#=============================================================================
-# Copyright 2003-2011 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-INCLUDE(CheckSymbolExists)
-
-MACRO(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
-  _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
-ENDMACRO(CHECK_CXX_SYMBOL_EXISTS)


Change to c++11

Change to c++11

--- cmake/compilation_settings.cmake
+++ cmake/compilation_settings.cmake
@@ -25,7 +25,7 @@

 ########## COMMON SETTINGS ##########

-TARGET_COMPILE_OPTIONS(${CMAKE_PROJECT_NAME} PRIVATE -std=c++14)
+TARGET_COMPILE_OPTIONS(${CMAKE_PROJECT_NAME} PRIVATE -std=c++11)
 TARGET_COMPILE_OPTIONS(${CMAKE_PROJECT_NAME} PRIVATE -Wall)
 TARGET_COMPILE_OPTIONS(${CMAKE_PROJECT_NAME} PRIVATE -Wextra)
 TARGET_COMPILE_OPTIONS(${CMAKE_PROJECT_NAME} PRIVATE -Weffc++)


ENH: Adding instantiations of ImageFunction that take as input an Image      of Vectors and produce as output a Vector. This was needed due to      recent changes in the VectorLinearInterpolateImageFunction.

--- Wrapping/ExplicitITK/Modules/Common/wrap_itkImageFunction.cmake
+++ Wrapping/ExplicitITK/Modules/Common/wrap_itkImageFunction.cmake
@@ -35,6 +35,11 @@
 WRAP_TEMPLATE("IVF32FAD3D" "Templates::ImageVF32,Templates::FixedArrayD3,double")
 WRAP_TEMPLATE("IVF33FAD3D" "Templates::ImageVF33,Templates::FixedArrayD3,double")
 WRAP_TEMPLATE("IVUS33FAD3D" "Templates::ImageVUS33,Templates::FixedArrayD3,double")
+WRAP_TEMPLATE("IVF22VD2D" "Templates::ImageVF22,Templates::VectorD2,double")
+WRAP_TEMPLATE("IVF22VD2F" "Templates::ImageVF22,Templates::VectorD2,float")
+WRAP_TEMPLATE("IVF32VD3D" "Templates::ImageVF32,Templates::VectorD3,double")
+WRAP_TEMPLATE("IVF33VD3D" "Templates::ImageVF33,Templates::VectorD3,double")
+WRAP_TEMPLATE("IVUS33VD3D" "Templates::ImageVUS33,Templates::VectorD3,double")
 WRAP_TEMPLATE("ISL2DD" "Templates::ImageSL2,double,double")
 WRAP_TEMPLATE("ISS2DD" "Templates::ImageSS2,double,double")
 WRAP_TEMPLATE("IUC2BD" "Templates::ImageUC2,bool,double")


ENH: updating ITKv4 to RC2

ENH: updating ITKv4 to RC2

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -14,7 +14,7 @@
 set(proj ITK)  ## Use ITK convention of calling it ITK
 set(ITK_REPOSITORY git://itk.org/ITK.git)
 set(ITK_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake/ITK-4.0)
-set(ITK_TAG_COMMAND GIT_TAG v4.0rc01) # use ITKv4 Release canidate 1
+set(ITK_TAG_COMMAND GIT_TAG v4.0rc02) # use ITKv4 Release canidate 2
 set(WrapITK_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake/ITK-4.0/WrapITK)

 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${proj}-build/CMakeCacheInit.txt" "${ep_languages_cache}\n${ep_common_cache}" )


BUG : deleted the "zlib required" useless in ITK4.cmake

This line was crashing the compilation on Windows.

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -101,8 +101,6 @@
   string(REPLACE "-fopenmp" "" ITK_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
   string(REPLACE "-fopenmp" "" ITK_CMAKE_CXX_FLAGS "${CMAKE_CX_FLAGS}")

-  find_package(ZLIB REQUIRED)
-
   set(${proj}_CMAKE_OPTIONS
       -DBUILD_TESTING:BOOL=OFF
       -DBUILD_EXAMPLES:BOOL=OFF


BUG: incorrect caseing for GenerateExampleDox.cmake script

Custom command was not working due to incorrect script name.

--- Utilities/Doxygen/Doxygen.cmake
+++ Utilities/Doxygen/Doxygen.cmake
@@ -17,7 +17,7 @@
   add_custom_command( OUTPUT "${PROJECT_BINARY_DIR}/Documentation/Doxygen/Examples.dox"
     COMMAND ${CMAKE_COMMAND} -D "PROJECT_SOURCE_DIR:PATH=${PROJECT_SOURCE_DIR}"
     -D "OUTPUT_FILE:PATH=${PROJECT_BINARY_DIR}/Documentation/Doxygen/Examples.dox"
-    -P "${PROJECT_SOURCE_DIR}/Utilities/Doxygen/GenerateExamplesDOX.cmake"
+    -P "${PROJECT_SOURCE_DIR}/Utilities/Doxygen/GenerateExamplesDox.cmake"
     WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/Examples"
     DEPENDS "${PROJECT_SOURCE_DIR}/Examples"
     )


fix SSE 4.1 identifier

fix SSE 4.1 identifier

--- cmake/FindSSE.cmake
+++ cmake/FindSSE.cmake
@@ -12,8 +12,8 @@
       set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host")
    ENDIF (SSSE3_TRUE)

-   STRING(REGEX REPLACE "^.*(sse4.1).*$" "\\1" SSE_THERE ${CPUINFO})
-   STRING(COMPARE EQUAL "sse4.1" "${SSE_THERE}" SSE41_TRUE)
+   STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO})
+   STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE)
    IF (SSE41_TRUE)
       set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host")
    ELSE (SSE41_TRUE)


fix FindTBB

fix FindTBB

--- cmake/FindTBB.cmake
+++ cmake/FindTBB.cmake
@@ -50,10 +50,6 @@
         ADD_DEPENDENCIES (${exe_name} ${exe_name}_tbb_dylib)
     ENDIF (XCODE_VERSION)
 ENDFUNCTION (ADD_TBB_RUNTIME)
-
-IF (TBB_FOUND)
-    RETURN ()
-ENDIF (TBB_FOUND)

 IF (NOT TBB_LIB_PATH)
     IF (MSVC)
@@ -143,9 +139,9 @@
 ENDIF (NOT DEFINED TBB_INCLUDE_DIR)

 IF (TBB_LINK_LIBRARIES AND TBB_INCLUDE_DIR)
-    SET (TBB_FOUND TRUE)
+    SET (TBB_BASIC_FOUND TRUE)
 ELSE (TBB_LINK_LIBRARIES AND TBB_INCLUDE_DIR)
-    SET (TBB_FOUND FALSE)
+    SET (TBB_BASIC_FOUND FALSE)
 ENDIF (TBB_LINK_LIBRARIES AND TBB_INCLUDE_DIR)

 SET (TBB_TEST_SOURCE "
@@ -215,7 +211,7 @@
 }
 ")

-IF (TBB_FOUND AND NOT MSVC AND NOT DEFINED TBB_TEST_SOURCE_RUNS)
+IF (TBB_BASIC_FOUND AND NOT MSVC AND NOT DEFINED TBB_TEST_SOURCE_RUNS)
     INCLUDE (CheckCXXSourceRuns)
     SET (SAFE_CMAKE_REQUIRED_INCLUDES  ${CMAKE_REQUIRED_INCLUDES})
     SET (SAFE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
@@ -238,7 +234,7 @@
     ENDIF (TBB_TEST_SOURCE_RUNS)
     SET (CMAKE_REQUIRED_INCLUDES ${SAFE_CMAKE_REQUIRED_INCLUDES})
     SET (CMAKE_REQUIRED_LIBRARIES ${SAFE_CMAKE_REQUIRED_LIBRARIES})
-ENDIF (TBB_FOUND AND NOT MSVC AND NOT DEFINED TBB_TEST_SOURCE_RUNS)
+ENDIF (TBB_BASIC_FOUND AND NOT MSVC AND NOT DEFINED TBB_TEST_SOURCE_RUNS)

 IF (MSVC)
     SET (TBB_DLL_PATH ${TBB_DLL_PATH})


Set glm as header only lib ;

Set glm as header only lib ;

--- cmake/Findglm.cmake
+++ cmake/Findglm.cmake
@@ -51,3 +51,9 @@
 # Hide some variables
 mark_as_advanced(GLM_INCLUDE_DIR)

+
+if(GLM_FOUND AND NOT TARGET glm)
+  add_library(glm INTERFACE IMPORTED)
+  set_target_properties(glm PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${GLM_INCLUDE_DIRS}")
+endif()


Added debian package dependencies libopenslide and libusb

--- cmake/Package.cmake
+++ cmake/Package.cmake
@@ -46,6 +46,9 @@
     set(CPACK_PACKAGING_INSTALL_PREFIX "/opt")
     set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")

+    # Add debian package depedencies
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "libopenslide0,libusb-1.0-0")
+
     set(CPACK_COMPONENTS_ALL fast)

     set(CPACK_DEBIAN_FAST_FILE_NAME "fast_${DISTRO_NAME}${DISTRO_VERSION}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.deb")


qemu_x86: Use Qemu Q35 machine feature (ICH9)

Using very old machine does not make sense anymore. Switch to the new
Q35 (https://wiki.qemu.org/Features/Q35). Among other things it allows
to test SMBus and watchdog.

Signed-off-by: Andrei Emeltchenko <a6565233ddc88e4fb9c66c1d70743223493f2ed4@intel.com>

--- boards/x86/qemu_x86/board.cmake
+++ boards/x86/qemu_x86/board.cmake
@@ -60,6 +60,7 @@
 set(QEMU_FLAGS_${ARCH}
   -m ${QEMU_MEMORY_SIZE_MB}
   -cpu ${QEMU_CPU_TYPE_${ARCH}}${QEMU_CPU_FLAGS}
+  -machine q35
   -device isa-debug-exit,iobase=0xf4,iosize=0x04
   ${REBOOT_FLAG}
   -nographic


Buildroot.cmake: Add missing custom target definition

--- Buildroot.cmake
+++ Buildroot.cmake
@@ -634,6 +634,10 @@
     )
 endfunction()

+# Meta target for fetching all buildroot package sources
+# Is set to depend on all the buildroot-*-source-fetch targets.
+add_custom_target(source-fetch)
+
 function(_buildroot_source_fetch_target name build_dir source_dir)
     add_custom_target(
         ${name}-source-fetch


Update MatchPoint third party file to include recent changes and bug fixes.

Test Plan: manual

Reviewers: O1 MITK Core!

Maniphest Tasks: T26270

Differential Revision: https://phabricator.mitk.org/D196

--- CMakeExternals/MatchPoint.cmake
+++ CMakeExternals/MatchPoint.cmake
@@ -26,8 +26,9 @@
       set(download_step SOURCE_DIR ${MatchPoint_SOURCE_DIR})
     else()
       set(download_step
-          URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev_75012b13.tar.gz
-          URL_MD5 233c2c717bd11b25bc12c2ed54abb3f1
+          #URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev_471e4259.tar.gz
+          URL D:/MatchPoint/MatchPoint_rev_471e4259.tar.gz
+          URL_MD5 ef2f1f80a41ee561d9dfe8d7437055f0
          )
     endif()


Refactored the C++ warning flag checking

--- cmake/Modules/CppUTestWarningFlags.cmake
+++ cmake/Modules/CppUTestWarningFlags.cmake
@@ -56,18 +56,16 @@
         Wno-old-style-cast
         )

+    if (C++11)
+        set(WARNING_CXX_FLAGS
+           ${WARNING_CXX_FLAGS}
+           Wno-c++98-compat
+           Wno-c++98-compat-pedantic
+           )
+    endif (C++11)
+
     check_and_append_c_warning_flags(${WARNING_C_FLAGS})
     check_and_append_c_warning_flags(${WARNING_C_ONLY_FLAGS})
     check_and_append_cxx_warning_flags(${WARNING_CXX_FLAGS})

-    if (C++11)
-        check_cxx_compiler_flag("-Wno-c++98-compat" NO_WARNING_CXX_98_COMPAT_FLAG)
-        check_cxx_compiler_flag("-Wno-c++98-compat-pedantic" NO_WARNING_CXX_98_COMPAT_PEDANTIC_FLAG)
-        if (NO_WARNING_CXX_98_COMPAT_FLAG)
-            set(CPPUTEST_CXX_WARNING_FLAGS "${CPPUTEST_CXX_WARNING_FLAGS} -Wno-c++98-compat")
-        endif (NO_WARNING_CXX_98_COMPAT_FLAG)
-        if (NO_WARNING_CXX_98_COMPAT_PEDANTIC_FLAG)
-            set(CPPUTEST_CXX_WARNING_FLAGS "${CPPUTEST_CXX_WARNING_FLAGS} -Wno-c++98-compat-pedantic")
-        endif (NO_WARNING_CXX_98_COMPAT_PEDANTIC_FLAG)
-    endif (C++11)
 endif (MSVC)


don't copy headers into app bundle for embedded Frameworks

Buddy: Tom

--- cmake/templates/ios/EmbedFramework.cmake
+++ cmake/templates/ios/EmbedFramework.cmake
@@ -29,6 +29,19 @@
       \"
   )

+  # Remove Headers from Framework in app bundle
+  add_custom_command(
+      TARGET ${target_name}
+      POST_BUILD COMMAND /bin/sh -c
+      \"
+      ${CMAKE_COMMAND} -E remove_directory "\${CONFIGURATION_BUILD_DIR}/\${FRAMEWORKS_FOLDER_PATH}/${framework_name}.framework/Headers/" \&\>/dev/null \;
+      if [ $$\? -ne 0 ] \; then
+          echo "Failed to remove Headers from framework ${framework_name}" \;
+          exit 1 \;
+      fi
+      \"
+  )
+
   # Codesign framework
   add_custom_command(
       TARGET ${target_name}


cmake: Use https to drop results.

cmake: Use https to drop results.

Signed-off-by: Andreas Schneider <5be00ddc76278cf6077f5047ca3384a88460c671@cryptomilk.org>

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -3,7 +3,7 @@
 set(CTEST_PROJECT_NAME "cmocka")
 set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")

-set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "mock.cryptomilk.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=${CTEST_PROJECT_NAME}")
 set(CTEST_DROP_SITE_CDASH TRUE)


swap 3.2 <-> default CTestConfig.cmake file

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -4,10 +4,14 @@
 ## # The following are required to uses Dart and the Cdash dashboard
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
-set(CTEST_PROJECT_NAME "Eigen3.2")
+set(CTEST_PROJECT_NAME "Eigen")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 UTC")

 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "manao.inria.fr")
-set(CTEST_DROP_LOCATION "/CDash/submit.php?project=Eigen3.2")
+set(CTEST_DROP_LOCATION "/CDash/submit.php?project=Eigen")
 set(CTEST_DROP_SITE_CDASH TRUE)
+set(CTEST_PROJECT_SUBPROJECTS
+Official
+Unsupported
+)


Fix std::experimental::filesystem detection on MSVC

--- cmake/DetectCxxFilesystem.cmake
+++ cmake/DetectCxxFilesystem.cmake
@@ -35,16 +35,19 @@
   "}\n"
   )
   message(STATUS "Detecting CXX std::experimental::filesystem support")
+  if (NOT MSVC)
+    set(TEMP_FILESYSTEM_LIBS stdc++fs)
+  endif ()
   try_compile(HAVE_CXX_EXPERIMENTAL_FILESYSTEM
     ${CMAKE_CURRENT_BINARY_DIR}/CMakeTemp/HaveCxxExperimentalFilesystem
     ${CMAKE_CURRENT_BINARY_DIR}/CMakeTemp/test_cxx_experimental_filesystem.cc
     CXX_STANDARD 17
     CXX_STANDARD_REQUIRED 17
-    LINK_LIBRARIES stdc++fs
+    LINK_LIBRARIES ${TEMP_FILESYSTEM_LIBS}
     OUTPUT_VARIABLE OUTPUT
   )
   if (HAVE_CXX_EXPERIMENTAL_FILESYSTEM)
-    set(CXX_FILESYSTEM_LIBS stdc++fs)
+    set(CXX_FILESYSTEM_LIBS ${TEMP_FILESYSTEM_LIBS})
     message(STATUS "Detecting CXX std::experimental::filesystem support -- found")
   else ()
     message(STATUS "Detecting CXX std::experimental::filesystem support -- NOT FOUND")


Disabled setting C flags to --std=c++11

Disabled setting C flags to --std=c++11

--- cmake/Modules/EnableCXX11.cmake
+++ cmake/Modules/EnableCXX11.cmake
@@ -12,11 +12,11 @@
     check_cxx_compiler_flag(--std=c++0x SUPPORTS_STD_CXX01)
     if(SUPPORTS_STD_CXX11)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c++11")
+        #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c++11")
         message(STATUS "Compiler supports --std=c++11.")
     elseif(SUPPORTS_STD_CXX01)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c++0x")
+        #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c++0x")
         message(WARNING "Compiler supports only --std=c++0x.")
     else()
         message(ERROR "Compiler does not support --std=c++11 or --std=c++0x.")


Add openssl include dir on Solaris.

Add openssl include dir on Solaris.

--- cmake/Modules/FindOpenSSL.cmake
+++ cmake/Modules/FindOpenSSL.cmake
@@ -40,6 +40,7 @@
       /usr/local/ssl/include
       /opt/local/include
       /sw/include
+      /usr/lib/sfw/include
   )
   mark_as_advanced(OPENSSL_INCLUDE_DIR)


disable unit-test execution by default

disable unit-test execution by default

--- cmake/SetupProjectOptions.cmake
+++ cmake/SetupProjectOptions.cmake
@@ -8,7 +8,7 @@

 # testing
 OPTION(DCSC08961_BLD_UTEST "Enable unit-test building by default"                          ON)
-OPTION(DCSC08961_RUN_CTEST "Enable unit-test execution using CTest by default"             ON)
+OPTION(DCSC08961_RUN_CTEST "Enable unit-test execution using CTest by default"            OFF)
 OPTION(DCSC08961_RUN_UTEST "Enable unit-test execution using the build system by default" OFF)

 # tracing


update(cmake/modules): declare cpack version component variables

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

--- cmake/modules/CPackConfig.cmake
+++ cmake/modules/CPackConfig.cmake
@@ -4,6 +4,9 @@
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Falco - Container Native Runtime Security")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/scripts/description.txt")
 set(CPACK_PACKAGE_VERSION "${FALCO_VERSION}")
+set(CPACK_PACKAGE_VERSION_MAJOR "${FALCO_VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${FALCO_VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${FALCO_VERSION_PATCH}")
 set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_PROJECT_CONFIG_FILE "${PROJECT_SOURCE_DIR}/cmake/cpack/CMakeCPackOptions.cmake")
 set(CPACK_STRIP_FILES "ON")


prefer the avrdude shipped by arduino sdk

Since cmake prefers the systems paths instead of the given ones, the
avrdude installed by some Linux distributions might be prefered. Since
arduino patches the avrdude program, the default should be to use the
avrdude provided by the arduino sdk instead of the system one and only
use the later as a fallback option.

Of course, the user can still override the ARDUINO_AVRDUDE_PROGRAM
variable within cmake to use the systems binary.

--- cmake/modules/FindArduino.cmake
+++ cmake/modules/FindArduino.cmake
@@ -926,7 +926,10 @@
     find_program(ARDUINO_AVRDUDE_PROGRAM
                  NAMES avrdude
                  PATHS ${ARDUINO_SDK_PATH}
-                 PATH_SUFFIXES hardware/tools)
+                 PATH_SUFFIXES hardware/tools
+                 NO_DEFAULT_PATH)
+    find_program(ARDUINO_AVRDUDE_PROGRAM
+                 NAMES avrdude)

     find_program(ARDUINO_AVRDUDE_CONFIG_PATH
                  NAMES avrdude.conf


[CMake] Deliberately get all LLVM library dependencies for standalone builds.

CMake won't expand the dependency graph for us if the dependencies are in
another project, which leads to link errors in the standalone build.
This is a refinement of r200765.

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

--- cmake/modules/LLVM-Config.cmake
+++ cmake/modules/LLVM-Config.cmake
@@ -62,7 +62,13 @@
 function(explicit_llvm_config executable)
   set( link_components ${ARGN} )

-  llvm_map_components_to_libnames(LIBRARIES ${link_components})
+  # Check for out-of-tree builds.
+  if(PROJECT_NAME STREQUAL "LLVM")
+    llvm_map_components_to_libnames(LIBRARIES ${link_components})
+  else()
+    explicit_map_components_to_libraries(LIBRARIES ${link_components})
+  endif()
+
   target_link_libraries(${executable} ${LIBRARIES})
 endfunction(explicit_llvm_config)


fix install

fix install

--- cmake/ospray_cmake_config.cmake
+++ cmake/ospray_cmake_config.cmake
@@ -59,7 +59,6 @@
   ${CMAKE_SOURCE_DIR}/cmake/icc_xeonphi.cmake
   ${CMAKE_SOURCE_DIR}/cmake/ispc.cmake
   ${CMAKE_SOURCE_DIR}/cmake/gcc.cmake
-  ${CMAKE_SOURCE_DIR}/cmake/mpi.cmake
   ${CMAKE_SOURCE_DIR}/cmake/msvc.cmake
   ${CMAKE_SOURCE_DIR}/cmake/ospray_macros.cmake
   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ospray-${OSPRAY_VERSION}"


Cleanup template

Cleanup template

--- cmake/projects/foo/hunter.cmake
+++ cmake/projects/foo/hunter.cmake
@@ -19,28 +19,6 @@
     1111111111111111111111111111111111111111
 )

-hunter_add_version(
-    PACKAGE_NAME
-    foo
-    VERSION
-    2.0.0
-    URL
-    "https://github.com/hunter-packages/foo/archive/v2.0.0.tar.gz"
-    SHA1
-    2222222222222222222222222222222222222222
-)
-
-hunter_add_version(
-    PACKAGE_NAME
-    foo
-    VERSION
-    3.0.0
-    URL
-    "https://github.com/hunter-packages/foo/archive/v3.0.0.tar.gz"
-    SHA1
-    3333333333333333333333333333333333333333
-)
-
 hunter_pick_scheme(DEFAULT url_sha1_cmake)
 hunter_cacheable(foo)
 hunter_download(PACKAGE_NAME foo)