be quiet if CFITSIO is already in the cache Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

be quiet if CFITSIO is already in the cache
Signed-off-by: Bernhard Reutner-Fischer <ce1ac9e9ad16abccd7821f371ad381197b4768ac@gmail.com>

--- cmake_modules/FindCFITSIO.cmake
+++ cmake_modules/FindCFITSIO.cmake
@@ -16,10 +16,8 @@

 if (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)

-  # in cache already
-  set(CFITSIO_FOUND TRUE)
-  message(STATUS "Found CFITSIO: ${CFITSIO_LIBRARIES}")
-
+  # in cache already, be quiet
+  set(CFITSIO_FIND_QUIETLY TRUE)

 else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)


Include (relative) path to locally-installed jars in classpath.txt files.

--- cmake_modules/ZorbaModule.cmake
+++ cmake_modules/ZorbaModule.cmake
@@ -425,27 +425,28 @@
     MESSAGE (FATAL_ERROR "'FILE' argument is required for DECLARE_ZORBA_JAR")
   ENDIF (NOT JAR_FILE)

+  # Initialize classpath file and set up copy rule (once per project)
+  SET (_CP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-classpath.txt")
+  GET_PROPERTY (_known_project GLOBAL PROPERTY "${PROJECT_NAME}-jars")
+  IF (NOT _known_project)
+    FILE (REMOVE "${_CP_FILE}")
+    SET_PROPERTY (GLOBAL PROPERTY "${PROJECT_NAME}-jars" 1)
+    ADD_COPY_RULE ("LIB" "${_CP_FILE}" "jars/${PROJECT_NAME}-classpath.txt"
+      "" "" 1 "${JAR_TEST_ONLY}")
+  ENDIF (NOT _known_project)
+
   # Iterate over all supplied jar files
   FOREACH (_jar_file ${JAR_FILE})
-    IF (NOT IS_ABSOLUTE "${_jar_file}")
-      SET (_jar_file "${CMAKE_CURRENT_SOURCE_DIR}/${_jar_file}")
-    ENDIF (NOT IS_ABSOLUTE "${_jar_file}")

     IF (JAR_EXTERNAL)
-      SET (_LIST_FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-jars.txt")
-      # Remember whether we've seen external jars for this project yet
-      GET_PROPERTY (_known_project GLOBAL PROPERTY "${PROJECT_NAME}-ext-jars")
-      IF (NOT _known_project)
-	FILE (REMOVE "${_LIST_FILE}")
-	SET_PROPERTY (GLOBAL PROPERTY "${PROJECT_NAME}-ext-jars" 1)
-	ADD_COPY_RULE ("LIB" "${_LIST_FILE}" "jars/${PROJECT_NAME}-jars.txt"
-	  "" "" 1 0)
-      ENDIF (NOT _known_project)
-      FILE (APPEND "${_LIST_FILE}" "${_jar_file}\n")
+      # Put absolute path into classpath file
+      FILE (APPEND "${_CP_FILE}" "${_jar_file}\n")
     ELSE (JAR_EXTERNAL)
+      # Copy jar to jars/ directory and add relative path to classpath file
       GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
       ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" "" ""
 	1 "${JAR_TEST_ONLY}")
+      FILE (APPEND "${_CP_FILE}" "${_output_filename}\n")
     ENDIF (JAR_EXTERNAL)

   ENDFOREACH (_jar_file)


SQL Cipher fix: Define OPENSSL_LIB as crypto TARGET_FILE_DIR (instead of TARGET_FILE)

--- core/lib/cmake/ProjectSQLiteCipher.cmake
+++ core/lib/cmake/ProjectSQLiteCipher.cmake
@@ -3,7 +3,7 @@

 set(OPENSSL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/openssl")
-set(OPENSSL_LIB $<TARGET_FILE:crypto>)
+set(OPENSSL_LIB $<TARGET_FILE_DIR:crypto>)
 string(FIND "${CMAKE_OSX_SYSROOT}" "iphone" IS_IOS)
 if(IS_IOS GREATER_EQUAL 0)
     set(OPENSSL_LIB ${CMAKE_BINARY_DIR}/core/lib/openssl/crypto/${CMAKE_BUILD_TYPE}-${CMAKE_OSX_SYSROOT})


COMP (#15012): Commented out two tests because of bug 15022 and bug 15023

--- Modules/IGT/Testing/files.cmake
+++ Modules/IGT/Testing/files.cmake
@@ -14,8 +14,8 @@
    mitkNavigationDataSourceTest.cpp
    mitkNavigationDataToMessageFilterTest.cpp
    mitkNavigationDataToNavigationDataFilterTest.cpp
-   mitkNavigationDataToPointSetFilterTest.cpp
-   mitkNavigationDataTransformFilterTest.cpp
+   # mitkNavigationDataToPointSetFilterTest.cpp commented out because of bug 15022
+   # mitkNavigationDataTransformFilterTest.cpp commented out because of bug 15023
    mitkNDIPassiveToolTest.cpp
    mitkNDIProtocolTest.cpp
    mitkNDITrackingDeviceTest.cpp


Specify the correct C++ libraries for clang in linux OSes.

--- cmake/DOConfigureCompiler.cmake
+++ cmake/DOConfigureCompiler.cmake
@@ -28,7 +28,12 @@

 # Clang compiler
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  set (ENABLE_CXX11 "-std=c++11 -stdlib=libc++")
+  if (APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+  else ()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
+  endif ()
+  set (ENABLE_CXX11 "-std=c++11")

 # GNU compiler
 elseif (CMAKE_COMPILER_IS_GNUCXX)


Removed obsolete FindCppUnit.cmake

Removed obsolete FindCppUnit.cmake

--- cmake/Modules/FindCppUnit.cmake
+++ cmake/Modules/FindCppUnit.cmake
@@ -1,75 +0,0 @@
-# - try to find cppunit library
-#
-# Cache Variables: (probably not for direct use in your scripts)
-#  CPPUNIT_INCLUDE_DIR
-#  CPPUNIT_LIBRARY
-#
-# Non-cache variables you might use in your CMakeLists.txt:
-#  CPPUNIT_FOUND
-#  CPPUNIT_INCLUDE_DIRS
-#  CPPUNIT_LIBRARIES
-#
-# Requires these CMake modules:
-#  SelectLibraryConfigurations (included with CMake >= 2.8.0)
-#  FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
-#
-# Original Author:
-# 2009-2011 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2011.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-set(CPPUNIT_ROOT_DIR
-    "${CPPUNIT_ROOT_DIR}"
-    CACHE
-    PATH
-    "Directory to search")
-
-find_library(CPPUNIT_LIBRARY_RELEASE
-    NAMES
-    cppunit
-    HINTS
-    "${CPPUNIT_ROOT_DIR}")
-
-find_library(CPPUNIT_LIBRARY_DEBUG
-    NAMES
-    cppunitd
-    HINTS
-    "${CPPUNIT_ROOT_DIR}")
-
-include(SelectLibraryConfigurations)
-select_library_configurations(CPPUNIT)
-
-# Might want to look close to the library first for the includes.
-get_filename_component(_libdir "${CPPUNIT_LIBRARY_RELEASE}" PATH)
-
-find_path(CPPUNIT_INCLUDE_DIR
-    NAMES
-    cppunit/TestCase.h
-    HINTS
-    "${_libdir}/.."
-    PATHS
-    "${CPPUNIT_ROOT_DIR}"
-    PATH_SUFFIXES
-    include/)
-
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(cppunit
-    DEFAULT_MSG
-    CPPUNIT_LIBRARY
-    CPPUNIT_INCLUDE_DIR)
-
-if(CPPUNIT_FOUND)
-    set(CPPUNIT_LIBRARIES ${CPPUNIT_LIBRARY} ${CMAKE_DL_LIBS})
-    set(CPPUNIT_INCLUDE_DIRS "${CPPUNIT_INCLUDE_DIR}")
-    mark_as_advanced(CPPUNIT_ROOT_DIR)
-endif()
-
-mark_as_advanced(CPPUNIT_INCLUDE_DIR
-    CPPUNIT_LIBRARY_RELEASE
-    CPPUNIT_LIBRARY_DEBUG)


Fix Windows debug build.

Fix Windows debug build.

Closes #548.

--- cmake/Modules/FindZlib_EP.cmake
+++ cmake/Modules/FindZlib_EP.cmake
@@ -50,6 +50,7 @@
     NAMES
       libz${CMAKE_STATIC_LIBRARY_SUFFIX}
       zlibstatic${CMAKE_STATIC_LIBRARY_SUFFIX}
+      zlibstaticd${CMAKE_STATIC_LIBRARY_SUFFIX}
     PATHS ${ZLIB_PATHS}
     PATH_SUFFIXES lib
     ${TILEDB_DEPS_NO_DEFAULT_PATH}


forgot to add SimDiscrete from last commit

--- cmake/TPLs/FindTPLSimMesh.cmake
+++ cmake/TPLs/FindTPLSimMesh.cmake
@@ -2,6 +2,6 @@

 TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( SimMesh
   REQUIRED_HEADERS MeshSim.h SimPartitionedMesh.h
-  REQUIRED_LIBS_NAMES SimPartitionedMesh-${SIM_BASEMPI}${SIM_DEBUG} SimMeshing${SIM_DEBUG} SimMeshTools${SIM_DEBUG} SimPartitionWrapper-${SIM_MPI}${SIM_DEBUG}
+  REQUIRED_LIBS_NAMES SimPartitionedMesh-${SIM_BASEMPI}${SIM_DEBUG} SimMeshing${SIM_DEBUG} SimDiscrete${SIM_DEBUG} SimMeshTools${SIM_DEBUG} SimPartitionWrapper-${SIM_MPI}${SIM_DEBUG}
 )


updated md5 hash

updated md5 hash

--- cmake/modules/Build-mysql.cmake
+++ cmake/modules/Build-mysql.cmake
@@ -21,7 +21,7 @@
   ExternalProject_Add(
     mysql
     URL https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.17.tar.gz
-    URL_HASH MD5=82ba7cc22755f77635768c6e6d184161
+    URL_HASH MD5=7472a25d91973cbba5d8a8f176a3080b
     CMAKE_ARGS -G${CMAKE_GENERATOR} -DCMAKE_INSTALL_PREFIX=${MYSQL_INSTALL_DIR} -DWITHOUT_SERVER=ON -DWITH_UNIT_TESTS=OFF -DWITH_BOOST=<SOURCE_DIR>/boost/boost_1_69_0
     BUILD_BYPRODUCTS ${_byproducts}
     INSTALL_DIR ${MYSQL_INSTALL_DIR}


cmake: avoid adding source info driver flag to swift_module_flags

rdar://55748348

--- cmake/modules/SwiftSource.cmake
+++ cmake/modules/SwiftSource.cmake
@@ -326,8 +326,6 @@
     set(sib_file "${module_base}.Onone.sib")
     set(sibopt_file "${module_base}.O.sib")
     set(sibgen_file "${module_base}.sibgen")
-    list(APPEND swift_module_flags
-         "-emit-module-source-info-path" "${source_info_file}")

     if(SWIFT_ENABLE_MODULE_INTERFACES)
       set(interface_file "${module_base}.swiftinterface")
@@ -501,6 +499,7 @@
         COMMAND
           "${PYTHON_EXECUTABLE}" "${line_directive_tool}" "@${file_path}" --
           "${swift_compiler_tool}" "-emit-module" "-o" "${module_file}"
+          "-emit-module-source-info-path" "${source_info_file}"
           ${swift_flags} ${swift_module_flags} "@${file_path}"
         ${command_touch_module_outputs}
         OUTPUT ${module_outputs}


Add an option for the analyze flag for MSVC

--- cmake/snippets/flags-msvc.cmake
+++ cmake/snippets/flags-msvc.cmake
@@ -4,6 +4,11 @@
   sprokit_check_compiler_flag(sprokit_warnings /wd4251)
   # C4275: Inheritance warnings
   sprokit_check_compiler_flag(sprokit_warnings /wd4275)
+endif ()
+
+option(SPROKIT_ENABLE_ANALYZE "Enables MSVC static analysis" OFF)
+if (SPROKIT_ENABLE_ANALYZE)
+  sprokit_check_compiler_flag(sprokit_warnings /analyze)
 endif ()

 sprokit_check_compiler_flag(sprokit_warnings /W3)


Add a better test for OpenMP 3

Add a better test for OpenMP 3

Our previous test for OpenMP 3 used a pragma
that was only present in OpenMP 3 (not 2).
However, this didn't work because most compilers
simply ignore unknown pragmas. Replace with a call
to a function that's only present in OpenMP 3, so
that compilation will decisively fail. This should
fix the Mac 10.6 build, which was including OpenMP
support even though the gcc version in OS X 10.6
only supports OpenMP 2.5.

As an aside, recent cmake versions extract the OpenMP
vesion number, which would simplify this test in the
future once we can require a new enough cmake.

--- cmake_modules/FindOpenMP3.cmake
+++ cmake_modules/FindOpenMP3.cmake
@@ -3,8 +3,10 @@
   set(CMAKE_REQUIRED_FLAGS ${OpenMP_CXX_FLAGS})
   set(mybody "#include <omp.h>
 int main() {
-#pragma omp taskwait
-return 0;
+omp_sched_t kind;
+int chunk_size;
+omp_get_schedule(&kind, &chunk_size);
+return chunk_size;
 }")

   check_cxx_source_compiles("${mybody}" OpenMP3)


Pushing ParaView forward for updated rendering

--- versions.cmake
+++ versions.cmake
@@ -68,7 +68,7 @@
   set(_paraview_revision "master")
 else()
   # Test the revision with OpenGL2 rendering before updating, update often!
-  set(_paraview_revision "28dfcd039338a2d369672cae51a9ecfc6fbd8ff3")
+  set(_paraview_revision "6787c17c5887c87abc2fb796e11d2e125b0aae7b")
 endif()
 add_revision(paraview
   GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"


Fix comments to match autoconf.

Fix comments to match autoconf.

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

--- include/llvm/Config/config.h.cmake
+++ include/llvm/Config/config.h.cmake
@@ -75,7 +75,7 @@
 /* Define to 1 if you have the <ffi.h> header file. */
 #cmakedefine HAVE_FFI_H ${HAVE_FFI_H}

-/* Define to 1 if you have the `futimens' function */
+/* Define to 1 if you have the `futimens' function. */
 #cmakedefine HAVE_FUTIMENS ${HAVE_FUTIMENS}

 /* Define to 1 if you have the `futimes' function. */
@@ -123,7 +123,7 @@
 /* Define to 1 if you have the `shell32' library (-lshell32). */
 #cmakedefine HAVE_LIBSHELL32 ${HAVE_LIBSHELL32}

-/* Define to 1 if you have the 'z' library (-lz). */
+/* Define to 1 if you have the `z' library (-lz). */
 #cmakedefine HAVE_LIBZ ${HAVE_LIBZ}

 /* Define to 1 if you have the 'edit' library (-ledit). */
@@ -142,7 +142,7 @@
 /* Define to 1 if you have the <mach/mach.h> header file. */
 #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H}

-/* Define to 1 if you have the `mallctl` function. */
+/* Define to 1 if you have the `mallctl' function. */
 #cmakedefine HAVE_MALLCTL ${HAVE_MALLCTL}

 /* Define to 1 if you have the `mallinfo' function. */


Remove unused PACKAGE_TARNAME; looks like a remnant of the old autoconf build.

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

--- include/llvm/Config/config.h.cmake
+++ include/llvm/Config/config.h.cmake
@@ -350,9 +350,6 @@
 /* Define to the full name and version of this package. */
 #cmakedefine PACKAGE_STRING "${PACKAGE_STRING}"

-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
 /* Define to the version of this package. */
 #cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}"


Add "packageonly" option for debugging.

Add "packageonly" option for debugging.

--- test/remote/RunRemoteTest.cmake
+++ test/remote/RunRemoteTest.cmake
@@ -62,6 +62,11 @@
 svn_package ("${srcdir}" "${CMAKE_ZORBA_BUILD_DIR}/remotequeue"
              "${changelist}" changefile)

+# Testing option: Don't submit job at all if "packageonly" is set
+if (packageonly)
+  message (FATAL_ERROR "Not submitting job as requested!")
+endif ()
+
 # Copy the local changes to the remotequeue svn repository.  In
 # future, we could pass data to the remote queue (such as test suites
 # to run, etc.) with properties on the checkin. For now at least, if


[axl] release 6.2.1

[axl] release 6.2.1

--- version.cmake
+++ version.cmake
@@ -11,7 +11,7 @@

 set (AXL_VERSION_MAJOR     6)
 set (AXL_VERSION_MINOR     2)
-set (AXL_VERSION_REVISION  0)
+set (AXL_VERSION_REVISION  1)
 set (AXL_VERSION_TAG)

 set (AXL_VERSION_FULL      "${AXL_VERSION_MAJOR}.${AXL_VERSION_MINOR}.${AXL_VERSION_REVISION}")


Split off 8.6.18

Split off 8.6.18

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

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


Split off 7.6.26

Split off 7.6.26

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

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


[jnc] release 1.8.0

[jnc] release 1.8.0

re-release (prev release was never publicly available)

--- version.cmake
+++ version.cmake
@@ -10,8 +10,8 @@
 #...............................................................................

 set (JANCY_VERSION_MAJOR     1)
-set (JANCY_VERSION_MINOR     7)
-set (JANCY_VERSION_REVISION  9)
+set (JANCY_VERSION_MINOR     8)
+set (JANCY_VERSION_REVISION  0)
 set (JANCY_VERSION_TAG)

 set (JANCY_VERSION_FILE_SUFFIX "${JANCY_VERSION_MAJOR}.${JANCY_VERSION_MINOR}.${JANCY_VERSION_REVISION}")


Split off 8.0.38

Split off 8.0.38

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

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


update: coverage testing/verbosity

update: coverage testing/verbosity

--- share/hugh/cmake/functions/cma_setup_test.cmake
+++ share/hugh/cmake/functions/cma_setup_test.cmake
@@ -41,9 +41,9 @@
   set(TST_TESTS)

   set(BOOSTTEST_ARGS)
-  list(APPEND BOOSTTEST_ARGS "--random=1") # randomized execution order
+  # list(APPEND BOOSTTEST_ARGS "--random=1") # randomized execution order
   if(TST_DEBUG OR VERBOSE)
-    list(APPEND BOOSTTEST_ARGS "--report_level=detailed")
+    # list(APPEND BOOSTTEST_ARGS "--report_level=detailed")
     # list(APPEND BOOSTTEST_ARGS "--log_level=message")
   endif()

@@ -98,7 +98,7 @@
       else()
 	set(CTEST_ARGS)
 	if(TST_DEBUG OR VERBOSE)
-	  list(APPEND CTEST_ARGS "-V")
+	  #list(APPEND CTEST_ARGS "-V")
 	endif()
 	add_custom_target(test_${TST_PREFIX}
 	                  COMMAND ${CMAKE_CTEST_COMMAND} ${CTEST_ARGS}


Replace EXTENSION_SUFFIX with MODULE_SUFFIX

--- cmake/Macros/PySideModules.cmake
+++ cmake/Macros/PySideModules.cmake
@@ -63,7 +63,7 @@
     add_library(${module_name} MODULE ${${module_sources}} ${${module_static_sources}})
     set_target_properties(${module_name} PROPERTIES
                           PREFIX ""
-                          OUTPUT_NAME "${module_name}${PYTHON_EXTENSION_SUFFIX}${PYTHON_DEBUG_SUFFIX}"
+                          OUTPUT_NAME "${module_name}${PYTHON_MODULE_SUFFIX}${PYTHON_DEBUG_SUFFIX}"
                           LIBRARY_OUTPUT_DIRECTORY ${pyside2_BINARY_DIR})
     if(WIN32)
         set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")


Fixed indentation mistakes.

Fixed indentation mistakes.

Reviewer: Marcelo Lira <6be3b93b2f09145ada72571578cc4097e4ba9a9e@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>

--- cmake/Macros/PySideModules.cmake
+++ cmake/Macros/PySideModules.cmake
@@ -77,7 +77,7 @@
         file(WRITE ${SRC_FILE}
              "#include <${include_file}>\n"
              "#include <typeinfo>\n"
-	     "${NAMESPACE_USE}\n"
+             "${NAMESPACE_USE}\n"
              "int main() { typeid(${class}); }\n"
         )
         try_compile(Q_WORKS ${CMAKE_BINARY_DIR}


Add linux/mac plugin extension

Add linux/mac plugin extension

--- cmake/IDA.cmake
+++ cmake/IDA.cmake
@@ -78,7 +78,8 @@
     set(ida_lib_path_platform "linux")

     if (IDA_ARCH_64)
-        message(SEND_ERROR "FIXME: What is the file extension here?")
+        set(plugin_extension ".plx64")
+    else()
         set(plugin_extension ".plx")
     endif()
 elseif (APPLE) # Untested!
@@ -86,7 +87,7 @@
     set(ida_lib_path_platform "mac")

     if (IDA_ARCH_64)
-        message(SEND_ERROR "FIXME: What is the file extension here?")
+        set(plugin_extension ".pmc64")
     else()
         set(plugin_extension ".pmc")
     endif()


cmake: dt: Reconfigure when DTS dependencies change

When DT sources change CMake must be run again. CMake is currently
detecting changes to DT source files that we manually specify, but not
sources that are included through use of the preprocessor.

This patch makes the preprocessor output the includes used and adds
them to the 'CMAKE_CONFIGURE_DEPENDS' property.

This fixes #16791.

Signed-off-by: Sebastian Bøe <edee888afd63e94916688495334700803eba20a0@nordicsemi.no>

--- cmake/dts.cmake
+++ cmake/dts.cmake
@@ -64,12 +64,6 @@
     else()
       message(STATUS "Overlaying ${dts_file}")
     endif()
-
-    # Ensure that changes to 'dts_file's cause CMake to be re-run
-    set_property(DIRECTORY APPEND PROPERTY
-      CMAKE_CONFIGURE_DEPENDS
-      ${dts_file}
-      )

     math(EXPR i "${i}+1")
   endforeach()
@@ -109,7 +103,8 @@

   # Run the C preprocessor on an empty C source file that has one or
   # more DTS source files -include'd into it to create the
-  # intermediary file *.dts.pre.tmp
+  # intermediary file *.dts.pre.tmp. Also, generate a dependency file
+  # so that changes to DT sources are detected.
   execute_process(
     COMMAND ${CMAKE_C_COMPILER}
     -x assembler-with-cpp
@@ -119,14 +114,29 @@
     ${NOSYSDEF_CFLAG}
     -D__DTS__
     -P
-    -E ${ZEPHYR_BASE}/misc/empty_file.c
+    -E   # Stop after preprocessing
+    -MD  # Generate a dependency file as a side-effect
     -o ${BOARD}.dts.pre.tmp
+    ${ZEPHYR_BASE}/misc/empty_file.c
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
     RESULT_VARIABLE ret
     )
   if(NOT "${ret}" STREQUAL "0")
     message(FATAL_ERROR "command failed with return code: ${ret}")
   endif()
+
+  # Parse the generated dependency file to find the DT sources that
+  # were included and then add them to the list of files that trigger
+  # a re-run of CMake.
+  toolchain_parse_make_rule(
+    ${PROJECT_BINARY_DIR}/${BOARD}.dts.pre.d
+    include_files # Output parameter
+    )
+
+  set_property(DIRECTORY APPEND PROPERTY
+    CMAKE_CONFIGURE_DEPENDS
+    ${include_files}
+    )

   # Run the DTC on *.dts.pre.tmp to create the intermediary file *.dts_compiled


detect int64_t size

detect int64_t size

--- cmake/lib.cmake
+++ cmake/lib.cmake
@@ -13,14 +13,13 @@

 include(CheckTypeSize)

-check_type_size("int64_t" INT64_T)
+check_type_size("int64_t" SIZEOF_INT64_T)

-if(NOT INT64_T)
-    check_type_size("__int64_t" INT64_T BUILTIN_TYPES_ONLY)
+if(NOT SIZEOF_INT64_T)
+    check_type_size("__int64_t" SIZEOF_INT64_T BUILTIN_TYPES_ONLY)
 endif()

-if(INT64_T)
-    message("has int 64")
+if(SIZEOF_INT64_T EQUAL 8)
     add_definitions(-D__HAS_INT64__)
 endif()


Ensure native artifacts have a build-id in them

--- src/corehost/cli/setup.cmake
+++ src/corehost/cli/setup.cmake
@@ -60,6 +60,8 @@
 # containing the reference instead of using definitions from other modules.
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1")
     add_compile_options(-fstack-protector-strong)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     add_compile_options(-fstack-protector)


flatten npm node_modules directories

flatten npm node_modules directories

--- projects/node.cmake
+++ projects/node.cmake
@@ -86,8 +86,18 @@
       )
     xpStringAppend(rmdirs test)
     xpStringAppend(rmdirs example)
-    if(MSVC AND ${ver} STREQUAL v0)
-      xpStringAppend(flatten ${npmDst}/${nm}/node-gyp/${nm}/glob/${nm})
+    if(MSVC)
+      if(${ver} STREQUAL v0)
+        xpStringAppend(flatten ${npmDst}/${nm}/node-gyp/${nm}/glob/${nm})
+        xpStringAppend(flatten ${npmDst}/${nm}/node-gyp/${nm}/path-array/${nm})
+        xpStringAppend(flatten ${npmDst}/${nm}/request/${nm}/form-data/${nm})
+        xpStringAppend(flatten ${npmDst}/${nm}/request/${nm}/har-validator/${nm})
+      endif()
+      if(${ver} STREQUAL v5)
+        xpStringAppend(flatten ${npmDst}/${nm}/init-package-json/${nm}/glob/${nm})
+        xpStringAppend(flatten ${npmDst}/${nm}/node-gyp/${nm}/glob/${nm})
+        xpStringAppend(flatten ${npmDst}/${nm}/read-package-json/${nm}/glob/${nm})
+      endif()
     endif()
     # copy npm to STAGE_DIR
     ExternalProject_Add_Step(${XP_TARGET} post_${XP_TARGET}


Android: removed unneeded workaround for library output path initialization.

--- android/android.toolchain.cmake
+++ android/android.toolchain.cmake
@@ -670,16 +670,12 @@
 set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "root for library output, set this to change where android libs are installed to" )
 set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" )

-set( DO_NOT_CHANGE_OUTPUT_PATHS_ON_FIRST_PASS OFF CACHE BOOL "" )
-if( DO_NOT_CHANGE_OUTPUT_PATHS_ON_FIRST_PASS )
- if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" )
-  set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" )
- else()
-  set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" )
- endif()
- set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" )
-endif()
-set( DO_NOT_CHANGE_OUTPUT_PATHS_ON_FIRST_PASS ON CACHE INTERNAL "" FORCE )
+if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" )
+ set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" )
+else()
+ set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" )
+endif()
+set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" )

 #includes
 list( APPEND ANDROID_SYSTEM_INCLUDE_DIRS "${ANDROID_SYSROOT}/usr/include" )


build OgreActivityJNI.cpp inside the Android project as this is the proper use case

--HG--
branch : ogrejni

--- CMake/toolchain/AndroidJNI.cmake
+++ CMake/toolchain/AndroidJNI.cmake
@@ -34,6 +34,7 @@
 	file(MAKE_DIRECTORY "${NDKOUT}/src/org/ogre3d/android")
 	file(COPY "${JNI_PATH}/OgreActivityJNI.java" DESTINATION "${NDKOUT}/src/org/ogre3d/android")
 	file(COPY "${JNI_PATH}/MainActivity.java" DESTINATION "${NDKOUT}/src/org/ogre3d/android")
+	file(COPY "${JNI_PATH}/OgreActivityJNI.cpp" DESTINATION "${NDKOUT}/jni")

     configure_file("${OGRE_TEMPLATES_DIR}/Android_resources.cfg.in" "${NDKOUT}/assets/resources.cfg" @ONLY)
     configure_file("${OGRE_TEMPLATES_DIR}/samples.cfg.in" "${NDKOUT}/assets/samples.cfg" @ONLY)
@@ -54,6 +55,7 @@
     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummyJNI.cpp "int x = 23;")
     ADD_LIBRARY(OgreJNIDummy MODULE ${CMAKE_CURRENT_BINARY_DIR}/dummyJNI.cpp)

+    set(JNI_PATH "${NDKOUT}/jni")
     create_android_proj(OgreJNIDummy)


Slight changes.

Slight changes.

--- CheckFortranSourceCompiles.cmake
+++ CheckFortranSourceCompiles.cmake
@@ -1,4 +1,4 @@
-# - Check if given C source compiles and links into an executable
+# - Check if given Fortran source compiles and links into an executable
 # CHECK_Fortran_SOURCE_COMPILES(<code> <var> [FAIL_REGEX <fail-regex>])
 #  <code>       - source code to try to compile, must define 'main'
 #  <var>        - variable to store whether the source code compiled
@@ -76,14 +76,14 @@
       set(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
       message(STATUS "Performing Test ${VAR} - Success")
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n"
+        "Performing Fortran SOURCE FILE Test ${VAR} succeded with the following output:\n"
         "${OUTPUT}\n"
         "Source file was:\n${SOURCE}\n")
     else()
       message(STATUS "Performing Test ${VAR} - Failed")
       set(${VAR} "" CACHE INTERNAL "Test ${VAR}")
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-        "Performing C SOURCE FILE Test ${VAR} failed with the following output:\n"
+        "Performing Fortran SOURCE FILE Test ${VAR} failed with the following output:\n"
         "${OUTPUT}\n"
         "Source file was:\n${SOURCE}\n")
     endif()


fmu-v2: remove orbit support to save flash

--- boards/px4/fmu-v2/default.cmake
+++ boards/px4/fmu-v2/default.cmake
@@ -118,3 +118,8 @@
 		#rover_steering_control # Rover example app
 		#segway
 	)
+
+# remove optional flight task features from fmu-v2 to save flash memory
+list(APPEND flight_tasks_to_remove
+		Orbit
+	)


The imagenavigator plug-in should be build by default.

--- Modules/Bundles/PluginList.cmake
+++ Modules/Bundles/PluginList.cmake
@@ -19,7 +19,7 @@
   org.mitk.gui.qt.colourimageprocessing:OFF
   org.mitk.gui.qt.tofutil:OFF
   org.mitk.gui.qt.toftutorial:OFF
-  org.mitk.gui.qt.imagenavigator:OFF
+  org.mitk.gui.qt.imagenavigator:ON
   org.mitk.gui.qt.moviemaker:OFF
   org.mitk.gui.qt.deformableregistration:OFF
   org.mitk.gui.qt.rigidregistration:OFF


ENH: Update elastix

ENH: Update elastix

Should fix elastix “find_package” error

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

 set( ELASTIX_GIT_REPOSITORY https://github.com/SuperElastix/elastix )
-set( ELASTIX_GIT_TAG 2ac905afdb1a5a841c05ed6abf92a1bf232d1e89 )
+set( ELASTIX_GIT_TAG 30c25322529d04f72430b344cb8fb4475678410a )

 UPDATE_SELX_SUPERBUILD_COMMAND(${proj})


BUG: Do not download clang-format with ITK_FORBID_DOWNLOADS enabled

--- CMake/ITKModuleClangFormat.cmake
+++ CMake/ITKModuleClangFormat.cmake
@@ -10,6 +10,6 @@
 option(ITK_USE_CLANG_FORMAT "Enable the use of clang-format for coding style formatting." ${BUILD_TESTING})
 mark_as_advanced(ITK_USE_CLANG_FORMAT)

-if(BUILD_TESTING AND ITK_USE_CLANG_FORMAT AND NOT CMAKE_CROSSCOMPILING)
+if(BUILD_TESTING AND ITK_USE_CLANG_FORMAT AND NOT CMAKE_CROSSCOMPILING AND NOT ITK_FORBID_DOWNLOADS)
   include(${ITK_CMAKE_DIR}/../Utilities/ClangFormat/DownloadClangFormat.cmake)
 endif()


Use standard installation path for CMake targets

--- CMakeModules/FGInstallDirs.cmake
+++ CMakeModules/FGInstallDirs.cmake
@@ -40,7 +40,7 @@

 # CMake files
 if(NOT DEFINED FG_INSTALL_CMAKE_DIR)
-    set(FG_INSTALL_CMAKE_DIR "cmake" CACHE PATH "Installation path for CMake files")
+    set(FG_INSTALL_CMAKE_DIR "lib/cmake/Forge" CACHE PATH "Installation path for CMake files")
 endif()

 # Use absolute paths (these changes are internal and will not show up in cache)


Attempt to make FindSvnClient.cmake portable

--- CMakeModules/FindSvnClient.cmake
+++ CMakeModules/FindSvnClient.cmake
@@ -3,6 +3,31 @@

 include (CheckFunctionExists)
 include (CheckIncludeFile)
+include (CheckLibraryExists)
+
+macro(find_static_component comp libs)
+    # account for alternative Windows svn distribution naming
+    if(MSVC)
+      set(compLib "lib${comp}")
+    else(MSVC)
+      set(compLib "${comp}")
+    endif(MSVC)
+
+    string(TOUPPER "${comp}" compLibBase)
+    set( compLibName ${compLibBase}_LIBRARY )
+
+    FIND_LIBRARY(${compLibName}
+      NAMES ${compLib}
+      HINTS $ENV{PLIBDIR}
+      PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
+      PATHS
+      /usr/local
+      /usr
+      /opt
+    )
+
+	list(APPEND ${libs} ${${compLibName}})
+endmacro()

 find_program(HAVE_APR_CONFIG apr-1-config)
 if(HAVE_APR_CONFIG)
@@ -22,7 +47,7 @@
     message(STATUS "apr-1-config not found, implement manual search for APR")
 endif(HAVE_APR_CONFIG)

-if(HAVE_APR_CONFIG OR MSVC)
+if(HAVE_APR_CONFIG OR MSVC)
 	find_path(LIBSVN_INCLUDE_DIR svn_client.h
 	  HINTS
 	  $ENV{LIBSVN_DIR}
@@ -32,26 +57,17 @@
 	  /usr
 	  /opt
 	)
-
+
+	set(LIBSVN_LIBRARIES "")
 	if (MSVC)
-		check_library_exists(libsvn_client-1 svn_client_checkout "${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib" HAVE_LIB_SVNCLIENT)
-		check_library_exists(libsvn_subr-1 svn_cmdline_init "${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib" HAVE_LIB_SVNSUBR)
-		check_library_exists(libsvn_ra-1 svn_ra_initialize "${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib" HAVE_LIB_SVNRA)
+		find_static_component("apr-1" LIBSVN_LIBRARIES)
 	else (MSVC)
-		check_library_exists(svn_client-1 svn_client_checkout "" HAVE_LIB_SVNCLIENT)
-		check_library_exists(svn_subr-1 svn_cmdline_init "" HAVE_LIB_SVNSUBR)
-		check_library_exists(svn_ra-1 svn_ra_initialize "" HAVE_LIB_SVNRA)
+		list(APPEND LIBSVN_LIBRARIES APR_LIBS)
 	endif (MSVC)
+	find_static_component("svn_client-1" LIBSVN_LIBRARIES)
+	find_static_component("svn_subr-1" LIBSVN_LIBRARIES)
+	find_static_component("svn_ra-1" LIBSVN_LIBRARIES)

 	include(FindPackageHandleStandardArgs)
-	FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG
-		HAVE_LIB_SVNSUBR
-		HAVE_LIB_SVNCLIENT
-		HAVE_LIB_SVNRA
-		LIBSVN_INCLUDE_DIR)
-
-	if(LIBSVN_FOUND)
-		set(LIBSVN_LIBRARIES "svn_client-1" "svn_subr-1" "svn_ra-1" ${APR_LIBS})
-	endif(LIBSVN_FOUND)
+	FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG LIBSVN_LIBRARIES LIBSVN_INCLUDE_DIR)
 endif(HAVE_APR_CONFIG OR MSVC)
-


Minor bugfix with avrdude arguments, fixes issue #16

--- cmake/modules/FindArduino.cmake
+++ cmake/modules/FindArduino.cmake
@@ -633,7 +633,7 @@
 #
 # Sets up default avrdude settings for uploading firmware via the bootloader.
 function(setup_arduino_bootloader_args BOARD_ID TARGET_NAME PORT OUTPUT_VAR)
-    set(AVRDUDE_ARGS ${OUTPUT_VAR})
+    set(AVRDUDE_ARGS ${${OUTPUT_VAR}})

     set(AVRDUDE_FLAGS ${ARDUINO_AVRDUDE_FLAGS})
     if(DEFINED ${TARGET_NAME}_AFLAGS)


Changed debug mode to -O0 so that symbols arent getting stripped out.

--- cmake/clang.cmake
+++ cmake/clang.cmake
@@ -25,7 +25,7 @@
 SET(CMAKE_CXX_COMPILER "clang++")
 SET(CMAKE_C_COMPILER "clang")
 SET(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -Wno-narrowing")
-SET(CMAKE_CXX_FLAGS_DEBUG          "-DDEBUG  -g -O2 -Wstrict-aliasing=1")
+SET(CMAKE_CXX_FLAGS_DEBUG          "-DDEBUG  -g -O0 -Wstrict-aliasing=1")
 SET(CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG    -O3 -Wstrict-aliasing=1")
 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -g -O3 -Wstrict-aliasing=1")
 SET(CMAKE_EXE_LINKER_FLAGS "")


Deactivate vicon (unused at the moment)

Deactivate vicon (unused at the moment)

--- software/externals/cmake/externals.cmake
+++ software/externals/cmake/externals.cmake
@@ -163,7 +163,7 @@
   microstrain
   fovis
   estimate-pose
-  vicon
+  #vicon # deactivated since removed in removed in d50971b64e901e48839a987ef6710bfabb0a67ed
   apriltags
   bullet
   spotless


Whitespace

Whitespace

--- common/cmake/CommonHeader.cmake
+++ common/cmake/CommonHeader.cmake
@@ -37,7 +37,7 @@
 endif (OPENMP_FOUND)

 if (MVSC)
-        # So that Visual Studio will define M_PI
-        add_definitions (-D_USE_MATH_DEFINES)
+	# So that Visual Studio will define M_PI
+	add_definitions (-D_USE_MATH_DEFINES)
 endif (MVSC)


CheckAtomic.cmake: Put all C++ code inside CHECK_CXX_SOURCE_COMPILES.

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

--- cmake/modules/CheckAtomic.cmake
+++ cmake/modules/CheckAtomic.cmake
@@ -2,11 +2,10 @@

 INCLUDE(CheckCXXSourceCompiles)

+CHECK_CXX_SOURCE_COMPILES("
 #ifdef _MSC_VER
 #include <windows.h>
 #endif
-
-CHECK_CXX_SOURCE_COMPILES("
 int main() {
 #ifdef _MSC_VER
         volatile LONG val = 1;


Reverting commit to LLVMLibDeps that was inadvertently done in 121649.

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

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


CMake: updated library dependencies.

CMake: updated library dependencies.

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

--- cmake/modules/LLVMLibDeps.cmake
+++ cmake/modules/LLVMLibDeps.cmake
@@ -60,7 +60,8 @@
 set(MSVC_LIB_DEPS_LLVMMipsAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMipsCodeGen LLVMMipsInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMipsCodeGen LLVMCodeGen LLVMCore LLVMMipsInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMMipsInfo LLVMSupport)
-set(MSVC_LIB_DEPS_LLVMPIC16 LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPIC16Info LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMPIC16 LLVMAnalysis LLVMCodeGen LLVMCore LLVMMC LLVMPIC16Info LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
+set(MSVC_LIB_DEPS_LLVMPIC16AsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMPIC16 LLVMPIC16Info LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPIC16Info LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMPowerPCAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMPowerPCInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMPowerPCCodeGen LLVMCodeGen LLVMCore LLVMPowerPCInfo LLVMSelectionDAG LLVMSupport LLVMSystem LLVMTarget)
@@ -71,7 +72,7 @@
 set(MSVC_LIB_DEPS_LLVMSparcCodeGen LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSparcInfo LLVMSupport LLVMSystem LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSparcInfo LLVMSupport)
 set(MSVC_LIB_DEPS_LLVMSupport LLVMSystem)
-set(MSVC_LIB_DEPS_LLVMSystem:)
+set(MSVC_LIB_DEPS_LLVMSystem )
 set(MSVC_LIB_DEPS_LLVMSystemZAsmPrinter LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMSupport LLVMSystem LLVMSystemZInfo LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSystemZCodeGen LLVMCodeGen LLVMCore LLVMSelectionDAG LLVMSupport LLVMSystemZInfo LLVMTarget)
 set(MSVC_LIB_DEPS_LLVMSystemZInfo LLVMSupport)


If specified EXTERNAL jar is a symlink, install the target of the symlink. Approved: Juan Zacarias, Chris Hillery

--- cmake_modules/ZorbaModule.cmake
+++ cmake_modules/ZorbaModule.cmake
@@ -516,7 +516,11 @@
       # Put absolute path into classpath file
       FILE (APPEND "${_CP_FILE}" "${_jar_file}\n")
     ELSE (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
-      # Copy jar to jars/ directory and add relative path to classpath file
+      # Copy real jar (after following any symlinks) to jars/ directory
+      # and add relative path to classpath file
+      IF (IS_SYMLINK "${_jar_file}")
+	GET_FILENAME_COMPONENT (_jar_file "${_jar_file}" REALPATH)
+      ENDIF (IS_SYMLINK "${_jar_file}")
       GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
       ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" ""
 	"${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")


gstreamer backend *requires* gstreamer ;) also needs moving to a somewhat more visible place (main cmakelists?)

--- gstreamer/ConfigureChecks.cmake
+++ gstreamer/ConfigureChecks.cmake
@@ -12,25 +12,25 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.

-macro_optional_find_package(GStreamer)
-macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 0.10 is required for the multimedia backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
+find_package(GStreamer REQUIRED)
+macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 0.10 is required for the multimedia backend" "http://gstreamer.freedesktop.org/modules/" TRUE "0.10")

-macro_optional_find_package(GStreamerPlugins)
-macro_log_feature(GSTREAMER_PLUGIN_VIDEO_FOUND "GStreamer video plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
-macro_log_feature(GSTREAMER_PLUGIN_AUDIO_FOUND "GStreamer audio plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
-macro_log_feature(GSTREAMER_PLUGIN_PBUTILS_FOUND "GStreamer pbutils plugin" "The gstreamer pbutils plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
+find_package(GStreamerPlugins REQUIRED)
+macro_log_feature(GSTREAMER_PLUGIN_VIDEO_FOUND "GStreamer video plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" TRUE "0.10")
+macro_log_feature(GSTREAMER_PLUGIN_AUDIO_FOUND "GStreamer audio plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" TRUE "0.10")
+macro_log_feature(GSTREAMER_PLUGIN_PBUTILS_FOUND "GStreamer pbutils plugin" "The gstreamer pbutils plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" TRUE "0.10")

-macro_optional_find_package(GLIB2)
-macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the gstreamer backend for Phonon" "http://www.gtk.org/download/" FALSE)
+find_package(GLIB2 REQUIRED)
+macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the gstreamer backend for Phonon" "http://www.gtk.org/download/" TRUE)

-macro_optional_find_package(GObject)
+find_package(GObject REQUIRED)
 # No log, since GObject is bundled with GLib

-macro_optional_find_package(LibXml2)
-macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the gstreamer backend for Phonon" "http://xmlsoft.org/downloads.html" FALSE)
+find_package(LibXml2 REQUIRED)
+macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the gstreamer backend for Phonon" "http://xmlsoft.org/downloads.html" TRUE)

-macro_optional_find_package(OpenGL)
-macro_log_feature(OPENGL_FOUND "OpenGL" "OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE)
+find_package(OpenGL REQUIRED)
+macro_log_feature(OPENGL_FOUND "OpenGL" "OpenGL support is required to compile the gstreamer backend for Phonon" "" TRUE)

 if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_FOUND AND GSTREAMER_PLUGIN_AUDIO_FOUND AND GSTREAMER_PLUGIN_PBUTILS_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
    set(BUILD_PHONON_GSTREAMER TRUE)


New version: 0.4.11

New version: 0.4.11

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


add orocos/types to the RPATH

add orocos/types to the RPATH

--- lib/orogen/templates/config/Base.cmake
+++ lib/orogen/templates/config/Base.cmake
@@ -28,7 +28,7 @@
 option(WITH_RPATH "enables or disables embedding RPath information in binaries" ON)
 if(WITH_RPATH)
     include(RPATHHandling)
-    CMAKE_USE_FULL_RPATH("${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/orocos")
+    CMAKE_USE_FULL_RPATH("${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/orocos:${CMAKE_INSTALL_PREFIX}/lib/orocos/types")
 endif(WITH_RPATH)

 # Set the build type to debug by default


Remove swig's REAL_NAME in-favor of using TARGET_NAME

This makes it quite clear the name of the target to use and how it can
be used. REAL_NAME could have ment the library or could have been the
target.

--- CMake/UseSWIGLocal.cmake
+++ CMake/UseSWIGLocal.cmake
@@ -5,12 +5,13 @@
 #   SWIG_LINK_LIBRARIES(name [ libraries ])
 #     - Link libraries to swig module
 # All other macros are for internal use only.
-# To get the actual name of the swig module,
-# use: ${SWIG_MODULE_${name}_REAL_NAME}.
+# To get the actual target name of the swig moduel,
+# use:  ${SWIG_MODULE_${name}_TARGET_NAME}.
+# The target name can be used to set dependecies between targets.
 # Set Source files properties such as CPLUSPLUS and SWIG_FLAGS to specify
 # special behavior of SWIG. Also global CMAKE_SWIG_FLAGS can be used to add
 # special flags to all swig calls.
-# Another special variable is CMAKE_SWIG_OUTDIR, it allows one to specify
+# Another special variable is CMAKE_SWIG_OUTDIR, it allows one to specify
 # where to write all the swig generated module (swig -outdir option)
 # The name-specific variable SWIG_MODULE_<name>_EXTRA_DEPS may be used
 # to specify extra dependencies for the generated modules.
@@ -51,16 +52,10 @@
     MESSAGE(FATAL_ERROR "SWIG Error: Language \"${language}\" not found")
   ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xUNKNOWNx$")

-  SET(SWIG_MODULE_${name}_REAL_NAME "${name}")
-  IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
-    # when swig is used without the -interface it will produce in the module.py
-    # a 'import _modulename' statement, which implies having a corresponding
-    # _modulename.so (*NIX), _modulename.pyd (Win32).
-    SET(SWIG_MODULE_${name}_REAL_NAME "_${name}")
-  ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
   IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xRUBYx$")
     STRING(TOLOWER "${name}" ruby_module_name)
   ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xRUBYx$")
+
   IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPERLx$")
     SET(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow")
   ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPERLx$")
@@ -102,13 +97,13 @@
   ENDIF("${swig_source_file_flags}" STREQUAL "NOTFOUND")
   SET(swig_source_file_fullname "${infile}")
   IF(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
-    STRING(REGEX REPLACE
+    STRING(REGEX REPLACE
       "^${CMAKE_CURRENT_SOURCE_DIR}" ""
       swig_source_file_relative_path
       "${swig_source_file_path}")
   ELSE(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
     IF(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_BINARY_DIR}")
-      STRING(REGEX REPLACE
+      STRING(REGEX REPLACE
         "^${CMAKE_CURRENT_BINARY_DIR}" ""
         swig_source_file_relative_path
         "${swig_source_file_path}")
@@ -187,7 +182,7 @@
     "${swig_source_file_fullname}"
     MAIN_DEPENDENCY "${swig_source_file_fullname}"
     DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS}
-    COMMENT "Swig source to generate ${SWIG_MODULE_${name}_LANGUAGE} wrapping")
+    COMMENT "Swig source to generate ${SWIG_MODULE_${name}_LANGUAGE} wrapping")
   SET_SOURCE_FILES_PROPERTIES("${swig_generated_file_fullname}" ${swig_extra_generated_files}
     PROPERTIES GENERATED 1)
   SET(${outfiles} "${swig_generated_file_fullname}" ${swig_extra_generated_files})
@@ -220,7 +215,7 @@
     MODULE
     ${swig_generated_sources}
     ${swig_other_sources})
-  SET_TARGET_PROPERTIES( ${SWIG_MODULE_${name}_TARGET_NAME} PROPERTIES OUTPUT_NAME ${SWIG_MODULE_${name}_REAL_NAME})
+  SET_TARGET_PROPERTIES( ${SWIG_MODULE_${name}_TARGET_NAME} PROPERTIES OUTPUT_NAME "${name}" )
   STRING(TOLOWER "${language}" swig_lowercase_language)
   IF ("${swig_lowercase_language}" STREQUAL "java")
     IF (APPLE)
@@ -234,8 +229,15 @@
       ENDIF (APPLE)
   ENDIF ("${swig_lowercase_language}" STREQUAL "java")
   IF ("${swig_lowercase_language}" STREQUAL "python")
+
+    # when swig is used without the -interface it will produce in the module.py
+    # a 'import _modulename' statement, which implies having a corresponding
+    # _modulename.so (*NIX), _modulename.pyd (Win32).
+    SET_TARGET_PROPERTIES( ${SWIG_MODULE_${name}_TARGET_NAME} PROPERTIES OUTPUT_NAME "_${name}" )
+
     # this is only needed for the python case where a _modulename.so is generated
     SET_TARGET_PROPERTIES(${SWIG_MODULE_${name}_TARGET_NAME} PROPERTIES PREFIX "")
+
     # Python extension modules on Windows must have the extension ".pyd"
     # instead of ".dll" as of Python 2.5.  Older python versions do support
     # this suffix.
@@ -270,4 +272,3 @@
     MESSAGE(SEND_ERROR "Cannot find Swig library \"${name}\".")
   ENDIF(SWIG_MODULE_${name}_TARGET_NAME)
 ENDMACRO(SWIG_LINK_LIBRARIES name)
-


Changed revision_tag and md5 sum.

Changed revision_tag and md5 sum.

--- CMakeExternals/CTK.cmake
+++ CMakeExternals/CTK.cmake
@@ -15,7 +15,7 @@

   if(NOT DEFINED CTK_DIR)

-    set(revision_tag 1dd16ae7)
+    set(revision_tag fd3ecf96)
     #IF(${proj}_REVISION_TAG)
     #  SET(revision_tag ${${proj}_REVISION_TAG})
     #ENDIF()
@@ -61,7 +61,7 @@
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
       URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_${revision_tag}.tar.gz
-      URL_MD5 03438db5c9a8324deb45d82c8a27784c
+      URL_MD5 a33be5c622fee05179c55e67a7d1b9cf
       UPDATE_COMMAND ""
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}


Have vsyasm_install.cmake fail (instead of warn) if it cannot install proceed

--- source/cmake/Modules/vsyasm_install.cmake
+++ source/cmake/Modules/vsyasm_install.cmake
@@ -8,33 +8,31 @@

 		set(USER_LEVEL 0 CACHE INTERNAL "")
 		function(do_admin_check REASON)
-			macro(denied)
+			macro(access_denied)
 				set(USER_LEVEL "USER" CACHE INTERNAL "")
-				message(WARNING "Was not able to ${REASON}. Please run as administrator.")
+				message(FATAL_ERROR "Was not able to ${REASON}. Please run as administrator.")
 				return()
-			endmacro(denied)
+			endmacro(access_denied)

-			macro(granted)
+			macro(access_granted)
 				set(USER_LEVEL "ROOT" CACHE INTERNAL "")
 				#message(STATUS "checked for elevated privileges before trying to ${REASON}")
 				return()
-			endmacro(granted)
+			endmacro(access_granted)

 			set(${RESULT_NAME} "TRUE" PARENT_SCOPE)
 			if (USER_LEVEL STREQUAL "ROOT")
-				granted()
+				access_granted()
 			elseif (USER_LEVEL STREQUAL "USER")
-				denied()
+				access_denied()
 			endif()
 			execute_process(COMMAND "cmd.exe" "/C dir $ENV{windir}\\temp" RESULT_VARIABLE TEST_RESULT OUTPUT_QUIET ERROR_QUIET)
 			if (NOT "${TEST_RESULT}" STREQUAL "0")
-				denied ()
+				access_denied ()
 			else ()
-				granted()
+				access_granted()
 			endif()
 		endfunction(do_admin_check)
-
-		file(MAKE_DIRECTORY "${DOWNLOADS_DIR}")

 		set(PROGS_PATH $ENV{ProgramFiles})
 		set(X86_PROGS_PATH ${PROGS_PATH})


Reordered plugin list and changed default build to OFF

--- Modules/Bundles/PluginList.cmake
+++ Modules/Bundles/PluginList.cmake
@@ -1,27 +1,27 @@
 SET(MITK_EXT_PLUGINS
   org.mitk.core.ext:ON
   org.mitk.core.jobs:OFF
+  org.mitk.planarfigure:ON
   org.mitk.diffusionimaging:OFF
-  org.mitk.gui.qt.diffusionimaging:OFF
   org.mitk.gui.qt.ext:ON
   org.mitk.gui.qt.extapplication:ON
+  org.mitk.gui.qt.datamanager:ON
   org.mitk.gui.qt.segmentation:OFF
-  org.mitk.planarfigure:ON
-  org.mitk.gui.qt.datamanager:ON
+  org.mitk.gui.qt.diffusionimaging:OFF
   org.mitk.gui.qt.igtnavigationtoolmanager:OFF
-  org.mitk.gui.qt.igttoolpairnavigation:ON
+  org.mitk.gui.qt.igttoolpairnavigation:OFF
   org.mitk.gui.qt.igttrackingtoolbox:OFF
   org.mitk.gui.qt.regiongrowing:OFF
-  org.mitk.gui.qt.navigationdataplayer:ON
+  org.mitk.gui.qt.navigationdataplayer:OFF
   org.mitk.gui.qt.basicimageprocessing:OFF
   org.mitk.gui.qt.igttutorial:OFF
   org.mitk.gui.qt.colourimageprocessing:OFF
   org.mitk.gui.qt.tofutil:OFF
   org.mitk.gui.qt.toftutorial:OFF
-  org.mitk.gui.qt.imagenavigator:ON
+  org.mitk.gui.qt.imagenavigator:OFF
   org.mitk.gui.qt.moviemaker:OFF
-  org.mitk.gui.qt.deformableregistration:ON
-  org.mitk.gui.qt.rigidregistration:ON
+  org.mitk.gui.qt.deformableregistration:OFF
+  org.mitk.gui.qt.rigidregistration:OFF
   org.mitk.gui.qt.imagestatistics:OFF
   org.mitk.gui.qt.volumetry:OFF
   org.mitk.gui.qt.materialeditor:OFF


cmake: fixup FindProtobuf

cmake: fixup FindProtobuf

--- cmake/FindProtobuf.cmake
+++ cmake/FindProtobuf.cmake
@@ -7,8 +7,8 @@
 IMPORTED Targets
 ^^^^^^^^^^^^^^^^

-This module defines :prop_tgt:`IMPORTED` target ``Protobuf::Protobuf``, if
-Protobuf has been found.
+This module defines :prop_tgt:`IMPORTED` target ``protobuf::libprotobuf`` and
+``protobuf::protoc``, if Protobuf has been found.

 Result Variables
 ^^^^^^^^^^^^^^^^


fix missing language flags

fix missing language flags

--- cmake/LLVM-IR-Util.cmake
+++ cmake/LLVM-IR-Util.cmake
@@ -255,7 +255,7 @@

   debug("@ExtractLangFlags ${lang}: ${lang_flags}")

-  set(${out_lang_flags} ${out_lang_flags_tmp} PARENT_SCOPE)
+  set(${out_lang_flags} ${lang_flags} PARENT_SCOPE)
 endfunction()


force c++11 compiler

force c++11 compiler

--- cmake/compat_flags.cmake
+++ cmake/compat_flags.cmake
@@ -1,3 +1,32 @@
 Include(TestCXXAcceptsFlag)
 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
 				OUTPUT_VARIABLE GCC_VERSION)
+
+# try to use compiler flag -std=c++11
+include(TestCXXAcceptsFlag)
+CHECK_CXX_ACCEPTS_FLAG("-std=c++11" CXX_FLAG_CXX11)
+if(CXX_FLAG_CXX11)
+	set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11 ")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -std=c++11 ")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11 ")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -std=c++11 ")
+	set(CXX_STD0X_FLAGS "-std=c++11")
+else()
+	# try to use compiler flag -std=c++0x for older compilers
+	CHECK_CXX_ACCEPTS_FLAG("-std=c++0x" CXX_FLAG_CXX0X)
+	if(CXX_FLAG_CXX0X)
+		set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++0x" )
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ")
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x ")
+		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -std=c++0x ")
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++0x ")
+		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -std=c++0x ")
+	set(CXX_STD0X_FLAGS "-std=c++0x")
+	endif(CXX_FLAG_CXX0X)
+endif(CXX_FLAG_CXX11)
+
+if(NOT CXX_STD0X_FLAGS)
+	message(FATAL "you need a c++11 compatible compiler")
+endif()


find.cmake: fix tiny bug in mark_as_advanced

--- cmake/qibuild/find.cmake
+++ cmake/qibuild/find.cmake
@@ -88,7 +88,7 @@
   set(${prefix}_SEARCHED    FALSE        CACHE INTERNAL "Cleared." FORCE)
   mark_as_advanced(
     ${prefix}_DEFINITIONS
-    ${prefix}_INCLUDE_DIR
+    ${prefix}_INCLUDE_DIRS
     ${prefix}_LIBRARIES
     ${prefix}_EXECUTABLE
     ${prefix}_EXECUTABLE_DEBUG)


SVN_SILENT made messages (.desktop file)

--- plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake
+++ plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake
@@ -9,6 +9,7 @@
 Comment[es]=Interfaz de configuración de cuentas personalizadas para las cuentas que usen el gestor de conexiones Pintxo.
 Comment[fi]=Pintxo-yhteyshallintaa käyttävien tilien mukautettu hallintakäyttöliittymä.
 Comment[fr]=Interface utilisateur de configuration de comptes pour les comptes employant le gestionnaire de connexion « Pintxo ».
+Comment[hu]=Egyedi beállítófelület a Pintxo kapcsolatkezelőt használó azonosítókhoz.
 Comment[ia]=Interfacie de usator pro configuration de conto personalisate pro contos usante le gerente de connexion Pintxo
 Comment[it]=Interfaccia utente personalizzata di configurazione account per account che usano il gestore di connessioni Pintxo.
 Comment[kk]=Pintxo байланыс менеджерін қолданатын тіркелгі пайдаланушы интерфейс параметрлерін ыңғайлау.
@@ -34,6 +35,7 @@
 Name[es]=Interfaz de configuración de cuentas Pintxo
 Name[fi]=Pintxo-tilinmäärityksen käyttöliittymä
 Name[fr]=Interface utilisateur pour la configuration de comptes « Pintxo ».
+Name[hu]=Pintxo azonosítóbeállító felület
 Name[ia]=Interfacie de usator de configuration de conto de Pintxo
 Name[it]=Interfaccia utente di configurazione account Pintxo
 Name[kk]=Pintxo тіркелгі пайдаланушы интерфейсін баптау


simplify protobuf use script: libprotobuf TARGET obsolete

* palam::mb uses xpro::libprotobuf now
* reverts part of https://github.com/smanders/externpro/commit/be7ffd9ebfe4b2d3661e68673490b990e4b7b039 which introduced 'support current internpro release'
* issue https://github.com/smanders/externpro/issues/264

--- projects/use/usexp-protobuf-config.cmake
+++ projects/use/usexp-protobuf-config.cmake
@@ -16,23 +16,6 @@
 # protobuf installs a config file which includes -targets.cmake and -module.cmake
 include(${XP_ROOTDIR}/lib/cmake/protobuf_@VER@/${prj}-config.cmake)
 set(${PRJ}_LIBRARIES ${nsPrefix}libprotobuf)
-if(NOT TARGET libprotobuf)
-  add_library(libprotobuf STATIC IMPORTED)
-  foreach(prop
-    INTERFACE_INCLUDE_DIRECTORIES
-    IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE
-    IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG
-    IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE
-    IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG
-    IMPORTED_LOCATION_RELEASE
-    IMPORTED_LOCATION_DEBUG
-    )
-    get_target_property(tmp ${nsPrefix}libprotobuf ${prop})
-    if(tmp)
-      set_target_properties(libprotobuf PROPERTIES ${prop} "${tmp}")
-    endif()
-  endforeach()
-endif()
 set(${PRJ}_PROTOC_EXECUTABLE ${nsPrefix}protoc) # TRICKY: must be named to match what's used in -module.cmake
 get_target_property(PROTOBUF_INCLUDE_DIR ${nsPrefix}libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
 set(reqVars ${PRJ}_VER ${PRJ}_INCLUDE_DIR ${PRJ}_LIBRARIES ${PRJ}_PROTOC_EXECUTABLE)


Return once we've already determined the cppcheck version.

--- CPPCheck.cmake
+++ CPPCheck.cmake
@@ -19,6 +19,7 @@
     if (DEFINED CPPCHECK_VERSION)

         set (${CONTINUE} TRUE PARENT_SCOPE)
+        return ()

     endif (DEFINED CPPCHECK_VERSION)


Set up adequate compilation flags (Release, Debug).

--- cmake/DOConfigureCompiler.cmake
+++ cmake/DOConfigureCompiler.cmake
@@ -54,4 +54,11 @@
   message("WARNING: Compiler '${CMAKE_CXX_COMPILER}' may not be supported by DO-CV. Make sure that C++0x features are needed (auto and lambda) and adjust the CMake variable 'ENABLE_CXX11'. Otherwise, report back to me: david.ok8@gmail.com and I'll try to do what I can.")
 endif ()

+if (UNIX)
+  set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wunused-variable -fPIE")
+  set(CMAKE_CXX_RELEASE_FLAGS "-03 -ffast-math")
+  set(CMAKE_CXX_DEBUG_FLAGS "-00 -g -DDEBUG -D_DEBUG")
+endif ()
+
+
 do_step_message("Activating C++11 features with: '${ENABLE_CXX11}'")


[misc] Add checking of gitpython in cmake (#2473)

generate_commit_hash.py relies on `gitpython` to generate commit hash,
so we should check it in cmake and show the way to install it.

--- cmake/PythonNumpyPybind11.cmake
+++ cmake/PythonNumpyPybind11.cmake
@@ -68,6 +68,17 @@
 message("    library: ${PYTHON_LIBRARIES}")

 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+        "import git; from git import Repo; import sys;\
+        sys.stdout.write(git.__version__)"
+	OUTPUT_VARIABLE GITPYTHON_VERSION
+	RESULT_VARIABLE GITPYTHON_IMPORT_RET)
+if (NOT GITPYTHON_IMPORT_RET)
+    message("    gitpython version: ${GITPYTHON_VERSION}")
+else ()
+    message(FATAL_ERROR "Cannot import git. Please install. ([sudo] pip3 install --user gitpython)")
+endif ()
+
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
         "import numpy.distutils, sys;\
         sys.stdout.write(':'.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
         OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR)


cmake fix airframes.xml dependency

cmake fix airframes.xml dependency

--- cmake/common/px4_metadata.cmake
+++ cmake/common/px4_metadata.cmake
@@ -191,11 +191,12 @@
 		REQUIRED BOARD
 		ARGN ${ARGN})

-	add_custom_command(OUTPUT ${PX4_SOURCE_DIR}/airframes.xml
+	add_custom_command(OUTPUT ${PX4_BINARY_DIR}/airframes.xml
 		COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
 			-a ${PX4_SOURCE_DIR}/ROMFS/${config_romfs_root}/init.d
 			--board CONFIG_ARCH_BOARD_${BOARD} --xml
 		DEPENDS ${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
+		COMMENT "Creating airframes.xml"
 		)
-	add_custom_target(airframes_xml DEPENDS ${PX4_SOURCE_DIR}/airframes.xml)
+	add_custom_target(airframes_xml DEPENDS ${PX4_BINARY_DIR}/airframes.xml)
 endfunction()


Building both the shared and static libraries

--- cmake/modules/ALICEMacros.cmake
+++ cmake/modules/ALICEMacros.cmake
@@ -105,6 +105,9 @@

   CheckViols(${LIB} "${SRCS}")
   add_dependencies("${label}-all" ${LIB})
+  if(ALICE_STATIC_BUILD)
+    add_dependencies("${label}-all" "${LIB}_a")
+  endif(ALICE_STATIC_BUILD)
 EndFunction (AddLibrary)
 #_______________________________________________________________________________
 Function (AddHLTLibrary LIB SRCS DHDRS)
@@ -174,6 +177,9 @@

   CheckViols(${LIB} "${SRCS}")
   add_dependencies("${label}-all" ${LIB})
+  if(ALICE_STATIC_BUILD)
+    add_dependencies("${label}-all" "${LIB}_a")
+  endif(ALICE_STATIC_BUILD)
 EndFunction (AddHLTLibrary)

 #_______________________________________________________________________________
@@ -219,6 +225,9 @@

   CheckViols(${BIN} "${SRCS}")
   add_dependencies("${label}-all" ${BIN})
+  if(ALICE_STATIC_BUILD)
+    add_dependencies("${label}-all" "${BIN}_a")
+  endif(ALICE_STATIC_BUILD)
 EndFunction (AddExecutable)

 #_______________________________________________________________________________


More updates to building mysql on windows.

--- cmake/modules/Build-mysql.cmake
+++ cmake/modules/Build-mysql.cmake
@@ -13,7 +13,7 @@
     mysql
     URL https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.17.zip
     URL_HASH MD5=12ffebf5a1a2b2047c6044b9b0e5860b
-    CMAKE_ARGS -G${CMAKE_GENERATOR} -DCMAKE_INSTALL_PREFIX=${MYSQL_INSTALL_DIR} -DWITHOUT_SERVER=ON -DWITH_UNIT_TESTS=OFF
+    CMAKE_ARGS -G${CMAKE_GENERATOR} -DCMAKE_INSTALL_PREFIX=${MYSQL_INSTALL_DIR} -DDOWNLOAD_BOOST=1 -DWITH_BOOST=<SOURCE_DIR>/boost -DWITHOUT_SERVER=ON -DWITH_UNIT_TESTS=OFF
     BUILD_BYPRODUCTS ${_byproducts}
     INSTALL_DIR ${MYSQL_INSTALL_DIR}
   )


-Wmissing-include-dirs

-Wmissing-include-dirs

svn path=/trunk/extragear/pim/googledata/; revision=1173068

--- cmake/modules/FindLibGCal.cmake
+++ cmake/modules/FindLibGCal.cmake
@@ -8,7 +8,7 @@
 #       LIBGCAL_FOUND
 #
 # Copyright (c) 2009 Mike Arthur <mike@mikearthur.co.uk>
-set(LIBGCAL_INCLUDE_DIR "include/libgcal")
+
 find_path(LIBGCAL_INCLUDE_DIR gcal.h)

 set(LIBGCAL_NAMES ${LIBGCAL_NAMES} gcal)


CMake:[1/2] Moved `__WINDOWS__` flag definition to CompilationConfigure.

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

--- cmake/CompilationConfigure.cmake
+++ cmake/CompilationConfigure.cmake
@@ -65,10 +65,16 @@
     "flag. Please use a different C++ compiler.")
 endif (WIN32)

-# Convenience flags to simplify Windows support in C++ source.
-if (MSVC)
-  add_definitions(-DMESOS_MSVC)
-endif (MSVC)
+# Convenience flags to simplify Windows support in C++ source, used to #ifdef
+# out some platform-specific parts of Mesos. We choose to define a new flag
+# rather than using an existing flag (e.g., `_WIN32`) because we want to give
+# the build system fine-grained control over what code is #ifdef'd out in  the
+# future. Using only flags defined by our build system to control this logic is
+# the clearest and most stable way of accomplishing this.
+if (WIN32)
+  add_definitions(-D__WINDOWS__)
+endif (WIN32)
+

 # Configure directory structure for different platforms.
 ########################################################


Increased mimimum android version to API level 9. Required for OpenSLES.

--- cmake/ConfigOptionsAndroid.cmake
+++ cmake/ConfigOptionsAndroid.cmake
@@ -26,6 +26,6 @@
 option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DEFAULT})

 set(ANDROID_APP_TARGET_SDK 11 CACHE STRING "Application target android SDK")
-set(ANDROID_APP_MIN_SDK 8 CACHE STRING "Application minimum android SDK requirement")
+set(ANDROID_APP_MIN_SDK 9 CACHE STRING "Application minimum android SDK requirement")
 set(ANDROID_APP_GOOGLE_TARGET_SDK "16" CACHE STRING "Application target google SDK")


Match option description with package name

--- cmake/Modules/FindSampGdk3.cmake
+++ cmake/Modules/FindSampGdk3.cmake
@@ -61,8 +61,8 @@
 	set(SampGdk3_LIBRARY_DEBUG   ${SampGdk3_LIBRARY_RELEASE})
 endif()

-set(SampGdk3_LIBRARY ${SampGdk3_LIBRARY} CACHE FILEPATH "SA-MP GDK library")
-set(SampGdk3_INCLUDE_DIR ${SampGdk3_INCLUDE_DIR} CACHE PATH "SA-MP GDK include directory")
+set(SampGdk3_LIBRARY ${SampGdk3_LIBRARY} CACHE FILEPATH "SampGdk3 library")
+set(SampGdk3_INCLUDE_DIR ${SampGdk3_INCLUDE_DIR} CACHE PATH "SampGdk3 include directory")

 mark_as_advanced(
 	SampGdk3_LIBRARY_DIRS


QUIET icub find_package

QUIET icub find_package

--- cmake/iDynTreeDependencies.cmake
+++ cmake/iDynTreeDependencies.cmake
@@ -37,7 +37,7 @@
   find_package(orocos_kdl REQUIRED)
 endif ()

-find_package(ICUB)
+find_package(ICUB QUIET)
 option(IDYNTREE_USES_ICUB_MAIN "Build the part of iDynTree that depends on package ICUB" ${ICUB_FOUND})
 if (IDYNTREE_USES_ICUB)
   find_package(ICUB REQUIRED)


Fix compilation warnings on Windows 64 bit

Fix a zillion of compilation warnings like:
```
warning C4267: 'initializing': conversion from 'size_t' to 'UInt_t', possible loss of data
```
From Microsoft:
Compiler Warning (level 3) C4267
'var' : conversion from 'size_t' to 'type', possible loss of data
The compiler detected a conversion from size_t to a smaller type.
To fix this warning, use size_t instead of type. Alternatively, use an integral type that is at least as large as size_t.
(size_t is unsigned __int64 or unsigned integer, depending on the target platform)

--- cmake/modules/SetUpWindows.cmake
+++ cmake/modules/SetUpWindows.cmake
@@ -19,7 +19,7 @@

 elseif(MSVC)
   if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64")
-    set(ARCH -D_WIN64)
+    set(ARCH "-wd4267 -D_WIN64")
     set(ROOT_ARCHITECTURE win64)
   else()
     set(ROOT_ARCHITECTURE win32)


minor cleanup

minor cleanup

--- cmake/toolchain-emscripten.cmake
+++ cmake/toolchain-emscripten.cmake
@@ -1,4 +0,0 @@
-set (EMSCRIPTEN_BUILD 1)
-set (CMAKE_C_COMPILER   emcc)
-set (CMAKE_CXX_COMPILER emcc)
-set (CMAKE_CXX_FLAGS -std=c++11)


Unify C and CXX flags more

Unify C and CXX flags more

--- Compiler.cmake
+++ Compiler.cmake
@@ -24,19 +24,22 @@
   if(GCC_COMPILER_VERSION VERSION_LESS 4.1)
     message(ERROR "GCC 4.1 or later required, found ${GCC_COMPILER_VERSION}")
   endif()
+  if(NOT WIN32 AND NOT XCODE_VERSION AND NOT RELEASE_VERSION)
+    set(COMMON_GCC_FLAGS "${COMMON_GCC_FLAGS} -Werror")
+  endif()
+  if(GCC_COMPILER_VERSION VERSION_GREATER 4.1)
+    set(COMMON_GCC_FLAGS "${COMMON_GCC_FLAGS} -Wshadow")
+  endif()
+  if(CMAKE_COMPILER_IS_CLANG)
+    set(COMMON_GCC_FLAGS
+      "${COMMON_GCC_FLAGS} -Qunused-arguments -ferror-limit=5")
+  endif()
+
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_GCC_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_GCC_FLAGS} -Wnon-virtual-dtor -Wsign-promo")
-  if(GCC_COMPILER_VERSION VERSION_GREATER 4.1)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
-  endif()
+  set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} ${COMMON_GCC_FLAGS} -Wnon-virtual-dtor -Wsign-promo")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wuninitialized")
-  if(NOT WIN32 AND NOT XCODE_VERSION AND NOT RELEASE_VERSION)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-  endif()
-  if(CMAKE_COMPILER_IS_CLANG)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -ferror-limit=5")
-  endif()

   if(NOT GCC_COMPILER_VERSION VERSION_LESS 4.3)
     if(GCC_COMPILER_VERSION VERSION_LESS 4.7)


- issue 2419: use specified level / version combination when initializing test suite

--- sbml-testsuite/run_suite.cmake
+++ sbml-testsuite/run_suite.cmake
@@ -68,7 +68,7 @@
 execute_process(
   COMMAND "${JAVA_EXECUTABLE}"
     -cp "${CLASSPATH}"
-    initalizeSuite ${CASES_DIR} 0 0
+    initalizeSuite ${CASES_DIR} ${SBML_LEVEL} ${SBML_VERSION}
   WORKING_DIRECTORY "${SRC_DIR}"
   OUTPUT_QUIET
 )


update polly_init text to be more descriptive

--- android-ndk-r10e-api-19-armeabi-v7a-neon-hid-sections.cmake
+++ android-ndk-r10e-api-19-armeabi-v7a-neon-hid-sections.cmake
@@ -22,7 +22,7 @@
 polly_init(
     "Android NDK ${ANDROID_NDK_VERSION} / \
 API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
-NEON / 32-bit ARM / c++11 support"
+NEON / 32-bit ARM / c++11 support / hidden / function-sections / data-sections "
     "Unix Makefiles"
 )


Made unreachable code an error

Made unreachable code an error

--- SetFlags.cmake
+++ SetFlags.cmake
@@ -198,8 +198,8 @@
 			add_flags_cxx("-Wno-error=covered-switch-default -Wno-error=shadow")
 			add_flags_cxx("-Wno-error=exit-time-destructors -Wno-error=missing-variable-declarations")
 			add_flags_cxx("-Wno-error=global-constructors -Wno-implicit-fallthrough")
-			add_flags_cxx("-Wno-missing-noreturn -Wno-error=unreachable-code -Wno-error=undef")
-		endif()
-	endif()
-
-endmacro()
+			add_flags_cxx("-Wno-missing-noreturn -Wno-error=undef")
+		endif()
+	endif()
+
+endmacro()


Include CMakeParseArguments

Include CMakeParseArguments

--- cmake/Utils.cmake
+++ cmake/Utils.cmake
@@ -1,3 +1,6 @@
+# For cmake_parse_arguments
+include(CMakeParseArguments)
+
 ################################################################################################
 # Command alias for debugging messages
 # Usage:
@@ -395,4 +398,5 @@
     file(GLOB_RECURSE srcs2 ${CAFFE_SOURCE_GROUP_GLOB_RECURSE})
     source_group(${group} FILES ${srcs2})
   endif()
-endfunction()+endfunction()
+


removed automatic test coverage - coverage needs to be now explicitly enabled with COVERAGE=yes passed to cmake

--- cmake/tests.cmake
+++ cmake/tests.cmake
@@ -8,8 +8,6 @@
   target_link_libraries(${app} but)
   target_link_libraries(${app} gmock_main gmock gtest)
   target_link_libraries(${app} boost_filesystem boost_system)
-  set_target_properties(${app} PROPERTIES COMPILE_FLAGS --coverage)
-  set_target_properties(${app} PROPERTIES LINK_FLAGS    --coverage)
   list(APPEND TEST_TARGETS ${app})
 endforeach()


CMake: fixing omniidl detection under Win32

--- salome_adm/cmake_files/FindOmniORB.cmake
+++ salome_adm/cmake_files/FindOmniORB.cmake
@@ -94,10 +94,12 @@
 ##############################################################################
 IF (WIN32)
   FIND_PROGRAM( OMNIORB_IDL_COMPILER
-    NAMES omniidl PATHS bin/x86_win32
+    NAMES omniidl
+    PATH_SUFFIXES x86_win32
     DOC "What is the path where omniidl (the idl compiler) can be found")
   FIND_PROGRAM( OMNIORB_OMNINAMES_COMMAND
-    NAMES omniNames PATHS bin/x86_win32
+    NAMES omniNames
+    PATH_SUFFIXES x86_win32
   DOC "What is the path where omniNames (the ORB server) can be found")
 ELSE(WIN32)
   FIND_PROGRAM(OMNIORB_IDL_COMPILER NAMES omniidl)


moved up flann version

moved up flann version

--- software/externals/cmake/externals.cmake
+++ software/externals/cmake/externals.cmake
@@ -15,7 +15,7 @@
 set(opencv-drc_depends Eigen_pod)

 set(pcl_dep_url https://svn.csail.mit.edu/drc/trunk/software/externals/pcl_dep)
-set(pcl_dep_revision 8333)
+set(pcl_dep_revision 8337)
 set(pcl_dep_depends)

 set(pcl_drc_url https://svn.csail.mit.edu/drc/trunk/software/externals/pcl_drc)


Add PATHs passed via env vars to find on Linux

--- salome_adm/cmake_files/FindOmniORB.cmake
+++ salome_adm/cmake_files/FindOmniORB.cmake
@@ -50,7 +50,14 @@
 ##############################################################################
 # find headers
 ##############################################################################
-FIND_PATH(OMNIORB_INCLUDE_DIR omniORB4/CORBA.h)
+IF (WIN32)
+  FIND_PATH(OMNIORB_INCLUDE_DIR omniORB4/CORBA.h)
+ELSE (WIN32)
+  FIND_PATH(OMNIORB_INCLUDE_DIR omniORB4/CORBA.h
+    PATHS "${OMNIORB_DIR}/include" "$ENV{OMNIORB_DIR}/include"
+    NO_DEFAULT_PATH)
+  FIND_PATH(OMNIORB_INCLUDE_DIR omniORB4/CORBA.h)
+ENDIF()

 ##############################################################################
 # find libraries
@@ -63,11 +70,19 @@
   FIND_LIBRARY( OMNIORB_LIBRARY_omniDynamic4
     NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}omniDynamic4${CMAKE_STATIC_LIBRARY_SUFFIX})
 ELSE (WIN32)
-  FIND_LIBRARY(OMNIORB_LIBRARY_omniORB4 NAMES omniORB4)
-  FIND_LIBRARY(OMNIORB_LIBRARY_omnithread NAMES omnithread)
-  FIND_LIBRARY(OMNIORB_LIBRARY_omniDynamic4 NAMES omniDynamic4)
+  FIND_LIBRARY(OMNIORB_LIBRARY_omniORB4 NAMES omniORB4
+    PATHS "${OMNIORB_DIR}/lib${LIB_SUFFIX}" "$ENV{OMNIORB_DIR}/lib${LIB_SUFFIX}"
+    NO_DEFAULT_PATH)
+  FIND_LIBRARY(OMNIORB_LIBRARY_omniORB4 NAMES omnithread)
+
+  #the rest libraries must be at the same PATH as omniORB4
+  GET_FILENAME_COMPONENT(OMNIORB_LIBRARY_PATH ${OMNIORB_LIBRARY_omniORB4} PATH)
+  FIND_LIBRARY(OMNIORB_LIBRARY_omnithread NAMES omnithread
+    PATHS "${OMNIORB_LIBRARY_PATH}" NO_DEFAULT_PATH)
+  FIND_LIBRARY(OMNIORB_LIBRARY_omniDynamic4 NAMES omniDynamic4
+    PATHS "${OMNIORB_LIBRARY_PATH}" NO_DEFAULT_PATH)
 ENDIF (WIN32)
-
+
 # Optional libraries

 IF (WIN32)
@@ -76,8 +91,10 @@
   FIND_LIBRARY( OMNIORB_LIBRARY_COSDynamic4
     NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}COSDynamic4${CMAKE_STATIC_LIBRARY_SUFFIX})
 ELSE (WIN32)
-  FIND_LIBRARY(OMNIORB_LIBRARY_COS4 NAMES COS4)
-  FIND_LIBRARY(OMNIORB_LIBRARY_COSDynamic4 NAMES COSDynamic4)
+  FIND_LIBRARY(OMNIORB_LIBRARY_COS4 NAMES COS4
+    PATHS "${OMNIORB_LIBRARY_PATH}" NO_DEFAULT_PATH)
+  FIND_LIBRARY(OMNIORB_LIBRARY_COSDynamic4 NAMES COSDynamic4
+    PATHS "${OMNIORB_LIBRARY_PATH}" NO_DEFAULT_PATH)
 ENDIF (WIN32)

 ##############################################################################
@@ -91,7 +108,13 @@
     NAMES omniNames PATHS bin/x86_win32
   DOC "What is the path where omniNames (the ORB server) can be found")
 ELSE(WIN32)
+  FIND_PROGRAM(OMNIORB_IDL_COMPILER NAMES omniidl
+    PATHS "${OMNIORB_DIR}/bin" "$ENV{OMNIORB_DIR}/bin"
+    NO_DEFAULT_PATH)
   FIND_PROGRAM(OMNIORB_IDL_COMPILER NAMES omniidl)
+  FIND_PROGRAM(OMNIORB_NAMESERVER NAMES omniNames
+    PATHS "${OMNIORB_DIR}/bin" "$ENV{OMNIORB_DIR}/bin"
+    NO_DEFAULT_PATH)
   FIND_PROGRAM(OMNIORB_NAMESERVER NAMES omniNames)
 ENDIF (WIN32)

@@ -108,7 +131,10 @@
 ELSE()
   FIND_PATH(OMNIORB_PYTHON_BACKEND
      NAMES __init__.py
-     PATHS "/lib/python${_py_version}/site-packages/omniidl_be" "/usr/lib/omniidl/omniidl_be"
+     PATHS
+     "${OMNIORB_DIR}/lib/python${_py_version}/site-packages/omniidl_be"
+     "$ENV{OMNIORB_DIR}/lib/python${_py_version}/site-packages/omniidl_be"
+     "/usr/lib/omniidl/omniidl_be"
      DOC ${_doc})
 ENDIF()


tweaks

tweaks

--- cmake/all.cmake
+++ cmake/all.cmake
@@ -24,11 +24,12 @@
 if(catkin_BINARY_DIR)
   set(CATKIN_CONTEXT_FILE ${catkin_BINARY_DIR}/catkin-context.py
     CACHE INTERNAL "catkin context file")
-  set(CATKIN_ENV ${CMAKE_BINARY_DIR}/env.sh)
+  set(CATKIN_ENV ${CMAKE_BINARY_DIR}/env.sh CACHE INTERNAL "catkin env")
 else()
   set(CATKIN_CONTEXT_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/catkin-context.py
     CACHE INTERNAL "catkin context file")
-  set(CATKIN_ENV ${catkin_INSTALL_PREFIX}/env.sh)
+  set(CATKIN_ENV ${catkin_INSTALL_PREFIX}/env.sh
+    CACHE INTERNAL "catkin env")
 endif()
 configure_file(${catkin_EXTRAS_DIR}/catkin-context.in ${CATKIN_CONTEXT_FILE})


java: quote arguments

java: quote arguments

If the build path has spaces, the arguments are split improperly.

--- Wrapping/Java/MakeJavacResponseFile.cmake
+++ Wrapping/Java/MakeJavacResponseFile.cmake
@@ -20,7 +20,7 @@

 set(CMAKE_CONFIGURABLE_FILE_CONTENT)
 foreach( java_file IN LISTS ${all_vtk_java_files} )
-  set(CMAKE_CONFIGURABLE_FILE_CONTENT "${CMAKE_CONFIGURABLE_FILE_CONTENT}${java_file}\n")
+  set(CMAKE_CONFIGURABLE_FILE_CONTENT "${CMAKE_CONFIGURABLE_FILE_CONTENT}\"${java_file}\"\n")
 endforeach()

 configure_file(


roll IRIS forward to get a few bug fixes

--- software/externals/cmake/externals.cmake
+++ software/externals/cmake/externals.cmake
@@ -118,7 +118,7 @@
 set(gurobi_depends)

 set(iris_url ssh://git@github.com/rdeits/iris-distro.git)
-set(iris_revision 30d630695e1c232bfd96df94f2bcac5d0dd567ff)
+set(iris_revision 8799cdea888fe3cf17aad0fadc4ad013f9a81834)
 set(iris_depends)

 set(mosek_url ssh://git@github.com/RobotLocomotion/mosek.git)


Dump stdout/stderr in runtest.cmake when matching fails.

This allows us to get more information from logs of failing tests,
because the raw stdout/stderr is not recorded anywhere else.

I also fixed the matching code that was intended to remove up to and
including the matching line to remove the line that matched.  We rely on
this behavior in the nudge test on Linux to count the number of error
reports.

SVN-Revision: 594

--- tests/runtest.cmake
+++ tests/runtest.cmake
@@ -333,6 +333,32 @@
   string(REGEX REPLACE "(^|\n)%(if|endif)[^\n]*\n" "\\1" ${str} "${${str}}")
 endforeach (str)

+# Remove up to and including the line matched by 'needle'.  Used to ensure that
+# each pattern line matches in order.  Regex matching is greedy, so we can't
+# just replace up to ${needle} because there may be later matches.  Instead, we
+# remove one line at a time.
+function(remove_up_to_and_including_line haystack_out haystack needle)
+  # paranoid so have an escape from loop here w/ prev_haystack.
+  set(prev_haystack "")
+  while (NOT "${haystack}" STREQUAL "${prev_haystack}" AND
+         NOT "${haystack}" MATCHES "^[^\n]*${needle}")
+    set(prev_haystack "${haystack}")
+    string(REGEX REPLACE "^[^\n]+" "" haystack "${haystack}")
+    string(REGEX REPLACE "^\r?\n" "" haystack "${haystack}")
+  endwhile ()
+  # Remove the line that was matched.
+  string(REGEX REPLACE "^[^\n]+" "" haystack "${haystack}")
+  string(REGEX REPLACE "^\r?\n" "" haystack "${haystack}")
+  set(${haystack_out} "${haystack}" PARENT_SCOPE)
+endfunction(remove_up_to_and_including_line)
+
+# Removes the regex we use for matching newlines.
+function(strip_trailing_newline_regex str_out str)
+  # Use [?] to match raw ? because CMake doesn't like \?.
+  string(REGEX REPLACE "(\r[?])?\n$" "" str "${str}")
+  set(${str_out} "${str}" PARENT_SCOPE)
+endfunction(strip_trailing_newline_regex)
+
 ##################################################
 # check stderr

@@ -352,7 +378,7 @@
     # FIXME PR 470723: add Dr. Heapstat-specific tests
     if (NOT TOOL_DR_HEAPSTAT OR
         NOT "${line}" MATCHES "^~~Dr\\\\.M~~")
-      string(REGEX REPLACE "\r?\n$" "" line "${line}")
+      strip_trailing_newline_regex(line "${line}")
       set(msg "stderr failed to match \"${line}\"")
       # try to find what was meant to match
       string(REGEX REPLACE "[0-9]" "." rline "${line}")
@@ -361,22 +387,11 @@
       if (NOT "${real_out}" STREQUAL "")
         set(msg "${msg}, found \"${real_out}\" instead")
       endif ()
+      set(msg "${msg}\nstderr:\n${cmd_err}")
       message(FATAL_ERROR "${msg}")
     endif ()
   endif ()
-  # remove up to and including the line matched, to enforce
-  # matching in order, and for better error message.
-  # regex matching is greedy so we can't just replace up to
-  # ${line} b/c there may be later matches, so we remove one
-  # line at a time.
-  # paranoid so have an escape from loop here w/ prev_cmd_tomatch.
-  set(prev_cmd_tomatch "")
-  while (NOT "${cmd_tomatch}" STREQUAL "${prev_cmd_tomatch}" AND
-      NOT "${cmd_tomatch}" MATCHES "^[^\n]*${line}")
-    set(prev_cmd_tomatch "${cmd_tomatch}")
-    string(REGEX REPLACE "^[^\n]+" "" cmd_tomatch "${cmd_tomatch}")
-    string(REGEX REPLACE "^\r?\n" "" cmd_tomatch "${cmd_tomatch}")
-  endwhile ()
+  remove_up_to_and_including_line(cmd_tomatch "${cmd_tomatch}" "${line}")
 endforeach (line)

 ##################################################
@@ -456,7 +471,7 @@
       set(require_in_order 1)
     else ()
       # we do NOT include the newline, to support matching intra-line substrings
-      string(REGEX REPLACE "\r?\n" "" line "${line}")
+      strip_trailing_newline_regex(line "${line}")
       if (NOT "${results}" MATCHES "${line}")
         set(msg "${resfile_using} failed to match \"${line}\"")
         # try to find what was meant to match
@@ -469,19 +484,7 @@
         message(FATAL_ERROR "${msg}")
       endif ()
       if (require_in_order)
-        # remove up to and including the line matched, to enforce
-        # matching in order, and for better error message.
-        # regex matching is greedy so we can't just replace up to
-        # ${line} b/c there may be later matches, so we remove one
-        # line at a time.
-        # paranoid so have an escape from loop here w/ prev_results.
-        set(prev_results "")
-        while (NOT "${results}" STREQUAL "${prev_results}" AND
-            NOT "${results}" MATCHES "^[^\n]*${line}")
-          set(prev_results "${results}")
-          string(REGEX REPLACE "^[^\n]+" "" results "${results}")
-          string(REGEX REPLACE "^\r?\n" "" results "${results}")
-        endwhile ()
+        remove_up_to_and_including_line(results "${results}" "${line}")
       endif (require_in_order)
     endif ()
   endforeach (line)


Squashed '3rdparty/github/genericLogger-remote/' changes from 99661e5..1f50851

1f50851 Merge commit 'c2581337f9aeb24f4d6badc24e58b4224a406558'
c258133 Squashed '3rdparty/github/cmake-utils-remote/' changes from f60f488..4522e8e

git-subtree-dir: 3rdparty/github/genericLogger-remote
git-subtree-split: 1f508517b48d6860c7594ac746f25120732fae26

--- 3rdparty/github/cmake-utils-remote/cmake/MyPackageStart.cmake
+++ 3rdparty/github/cmake-utils-remote/cmake/MyPackageStart.cmake
@@ -34,11 +34,11 @@
   #
   # Paths
   #
-  SET (CMAKE_MODULE_PATH      "${PROJECT_SOURCE_DIR}/cmake" "${PROJECT_SOURCE_DIR}/3rdparty/github/cmake-utils/cmake") # General module search path
-  SET (INCLUDE_OUTPUT_PATH    "${PROJECT_SOURCE_DIR}/output/include")                                                  # General include output path
-  SET (LIBRARY_OUTPUT_PATH    "${PROJECT_SOURCE_DIR}/output/lib")                                                      # General library output path
-  SET (BINARY_OUTPUT_PATH     "${PROJECT_SOURCE_DIR}/output/bin")                                                      # General binary output path
-  SET (3RDPARTY_OUTPUT_PATH   "${PROJECT_SOURCE_DIR}/output/3rdparty")                                                 # General 3rdparty output path
+  SET (CMAKE_MODULE_PATH      "${PROJECT_SOURCE_DIR}/cmake" "${PROJECT_SOURCE_DIR}/3rdparty/github/cmake-utils-remote/cmake") # General module search path
+  SET (INCLUDE_OUTPUT_PATH    "${PROJECT_SOURCE_DIR}/output/include")                                                         # General include output path
+  SET (LIBRARY_OUTPUT_PATH    "${PROJECT_SOURCE_DIR}/output/lib")                                                             # General library output path
+  SET (BINARY_OUTPUT_PATH     "${PROJECT_SOURCE_DIR}/output/bin")                                                             # General binary output path
+  SET (3RDPARTY_OUTPUT_PATH   "${PROJECT_SOURCE_DIR}/output/3rdparty")                                                        # General 3rdparty output path
   #
   # Output directories
   # C.f. http://stackoverflow.com/questions/7747857/in-cmake-how-do-i-work-around-the-debug-and-release-directories-visual-studio-2


Fix in FindROOT.cmake to adapt to new rootcint requirements -  ROOT-7039

--- etc/cmake/FindROOT.cmake
+++ etc/cmake/FindROOT.cmake
@@ -104,7 +104,7 @@
     unset(linkFile CACHE)
   endforeach()
   #---call rootcint------------------------------------------
-  add_custom_command(OUTPUT ${dictionary}.cxx ${dictionary}.h
+  add_custom_command(OUTPUT ${dictionary}.cxx
                      COMMAND ${ROOTCINT_EXECUTABLE} -cint -f  ${dictionary}.cxx
                                           -c ${ARG_OPTIONS} ${includedirs} ${headerfiles} ${linkdefs}
                      DEPENDS ${headerfiles} ${linkdefs} VERBATIM)


cpack: Ignore obj directory.

cpack: Ignore obj directory.

--- CPackConfig.cmake
+++ CPackConfig.cmake
@@ -19,7 +19,7 @@

 ### source generator
 set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;tags;cscope.*")
+set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj/;tags;cscope.*")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")

 if (WIN32)


added hermite basis test

added hermite basis test

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

 set(CTEST_PROJECT_NAME "Embree")
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(TEST_MODELS_HASH 516b235b5eba18960f880b8c3cbfeb6b76366e9d)
+set(TEST_MODELS_HASH ceb5d485cb8c121c692a8e23a258d60f135e0d5e)

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


fix drop site

fix drop site

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -1,7 +1,7 @@
 set(CTEST_PROJECT_NAME       "cmake-example")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 CEST")
 set(CTEST_DROP_METHOD        "http")
-set(CTEST_DROP_SITE          "http://my.cdash.org")
+set(CTEST_DROP_SITE          "my.cdash.org")
 set(CTEST_DROP_LOCATION      "/submit.php?project=cmake-example")
 set(CTEST_DROP_SITE_CDASH    TRUE)
 set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 200)


Fix debian package generation

Fix debian package generation

--- CommonCPack.cmake
+++ CommonCPack.cmake
@@ -18,6 +18,7 @@
   foreach(i RANGE ${VERSION_ABI})
     list(APPEND OLD_PACKAGES "${LOWER_PROJECT_NAME}${i},")
   endforeach()
+  list(APPEND OLD_PACKAGES "${LOWER_PROJECT_NAME}")
   string(REGEX REPLACE ";" " " OLD_PACKAGES ${OLD_PACKAGES})
 else()
   set(CPACK_PACKAGE_NAME "${CPACK_PROJECT_NAME}")


fixing cmake dir for spdlog

fixing cmake dir for spdlog

Former-commit-id: cafd9136e7dba084d8378afcf5347101632eeaca

--- cmake-modules/Fetch_spdlog.cmake
+++ cmake-modules/Fetch_spdlog.cmake
@@ -22,7 +22,7 @@
     ExternalProject_Get_Property(external_SPDLOG INSTALL_DIR)
     add_library(spdlog INTERFACE)
     add_library(spdlog::spdlog ALIAS spdlog)
-    set(spdlog_DIR ${INSTALL_DIR}/lib/cmake/spdlog)
+    set(spdlog_DIR ${INSTALL_DIR}/spdlog/lib/spdlog/cmake)
     add_dependencies(spdlog external_SPDLOG)
     target_include_directories(spdlog INTERFACE ${INSTALL_DIR}/include)
     target_link_libraries(spdlog INTERFACE ${INSTALL_DIR}/lib/spdlog/libspdlog${CUSTOM_SUFFIX})


Fixed invaid setting of android app default version.

--- cmake/ConfigOptionsAndroid.cmake
+++ cmake/ConfigOptionsAndroid.cmake
@@ -26,7 +26,7 @@
 option(ANDROID_BUILD_JAVA "Automatically android java code - build type depends on CMAKE_BUILD_TYPE" ON)
 option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DEFAULT})

-set(ANDROID_APP_VERSION 3 "Application version")
+set(ANDROID_APP_VERSION 3 CACHE STRING "Application version")
 set(ANDROID_APP_TARGET_SDK 11 CACHE STRING "Application target android SDK")
 set(ANDROID_APP_MIN_SDK 9 CACHE STRING "Application minimum android SDK requirement")
 set(ANDROID_APP_GOOGLE_TARGET_SDK "16" CACHE STRING "Application target google SDK")


added missing patch (thanks Mourad!), per #85

git-svn-id: e7ea667a1d39a4453c4efcc4ba7bca3d620c3f19@573 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/Modules/FindCMinpack.cmake
+++ cmake/Modules/FindCMinpack.cmake
@@ -28,5 +28,12 @@

 if(CMINPACK_FOUND)
   message(STATUS "CMinPack found (include: ${CMINPACK_INCLUDE_DIRS}, lib: ${CMINPACK_LIBRARY})")
+  if(WIN32)
+    option(CMINPACK_IS_STATIC "Set to ON if you use static cminpack library." OFF)
+    mark_as_advanced(CMINPACK_IS_STATIC)
+    if(CMINPACK_IS_STATIC)
+      add_definitions(-DCMINPACK_NO_DLL)
+    endif(CMINPACK_IS_STATIC)
+  endif(WIN32)
 endif(CMINPACK_FOUND)


patched cmake to make it compile with ubuntu 14.04

--- cmake/modules/FindGraphviz.cmake
+++ cmake/modules/FindGraphviz.cmake
@@ -19,9 +19,12 @@
 if( NOT WIN32 )
   find_package(PkgConfig)

-  pkg_check_modules(GRAPHVIZ_GVC_PKG gvc)
-  pkg_check_modules(GRAPHVIZ_CGRAPH_PKG cgraph)
-  pkg_check_modules(GRAPHVIZ_CDT_PKG cdt)
+  pkg_check_modules(GRAPHVIZ_GVC_PKG libgvc)
+  pkg_check_modules(GRAPHVIZ_CGRAPH_PKG libcgraph)
+  pkg_check_modules(GRAPHVIZ_CDT_PKG libcdt)
+
+  SET(GRAPHVIZ_INCLUDE_DIR ${GRAPHVIZ_CGRAPH_PKG_INCLUDE_DIRS})
+
 endif( NOT WIN32 )

 FIND_LIBRARY(GRAPHVIZ_GVC_LIBRARY NAMES gvc libgvc
@@ -69,9 +72,10 @@
 FIND_LIBRARY(GRAPHVIZ_INCLUDE_DIR NAMES cgraph.h
   PATHS
     /usr/include
+    /usr/include/graphviz
     /usr/local/include
   HINTS
-    ${GRAPHVIZ_PKG_INCLUDE_DIR} # Generated by pkg-config
+    ${GRAPHVIZ_CGRAPH_PKG_INCLUDE_DIRS} # Generated by pkg-config
 )
 IF ( NOT(GRAPHVIZ_INCLUDE_DIR) )
   MESSAGE(STATUS "Could not find graphviz headers." )