fixed my editing of CPackConfig.cmake

fixed my editing of CPackConfig.cmake

--- CPackConfig.cmake
+++ CPackConfig.cmake
@@ -1,82 +1,20 @@
-# This file will be configured to contain variables for CPack. These variables
-# should be set in the CMake list file of the project before CPack module is
-# included. The list of available CPACK_xxx variables and their associated
-# documentation may be obtained using
-#  cpack --help-variable-list
-#
-# Some variables are common to all generators (e.g. CPACK_PACKAGE_NAME)
-# and some are specific to a generator
-# (e.g. CPACK_NSIS_EXTRA_INSTALL_COMMANDS). The generator specific variables
-# usually begin with CPACK_<GENNAME>_xxxx.
+set(CPACK_PACKAGE_VENDOR "Ultimaker")
+set(CPACK_PACKAGE_CONTACT "Arjen Hiemstra <a.hiemstra@ultimaker.com>")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Cura Engine")
+set(CPACK_PACKAGE_VERSION "15.05.90")
+set(CPACK_GENERATOR "DEB")
+if(NOT DEFINED CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+  execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")

+set(DEB_DEPENDS
+    "arcus (>= 15.05.90)"
+    "protobuf (>= 3.0.0)"
+    "libstdc++6 (>= 4.9.0)"
+    "libgcc1 (>= 4.9.0)"
+)
+string(REPLACE ";" ", " DEB_DEPENDS "${DEB_DEPENDS}")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DEB_DEPENDS})

-SET(CPACK_BINARY_7Z "")
-SET(CPACK_BINARY_BUNDLE "")
-SET(CPACK_BINARY_CYGWIN "")
-SET(CPACK_BINARY_DEB "")
-SET(CPACK_BINARY_DRAGNDROP "")
-SET(CPACK_BINARY_IFW "")
-SET(CPACK_BINARY_NSIS "")
-SET(CPACK_BINARY_OSXX11 "")
-SET(CPACK_BINARY_PACKAGEMAKER "")
-SET(CPACK_BINARY_RPM "")
-SET(CPACK_BINARY_STGZ "")
-SET(CPACK_BINARY_TBZ2 "")
-SET(CPACK_BINARY_TGZ "")
-SET(CPACK_BINARY_TXZ "")
-SET(CPACK_BINARY_TZ "")
-SET(CPACK_BINARY_WIX "")
-SET(CPACK_BINARY_ZIP "")
-SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
-SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
-SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
-SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "")
-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "arcus (>= 15.05.90), protobuf (>= 3.0.0), libstdc++6 (>= 4.9.0), libgcc1 (>= 4.9.0)")
-SET(CPACK_GENERATOR "DEB")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "/root/Data/Firm2017/release/CuraEngine;CuraEngine;ALL;/")
-SET(CPACK_INSTALL_PREFIX "/usr/local")
-SET(CPACK_MODULE_PATH "")
-SET(CPACK_NSIS_DISPLAY_NAME "CuraEngine 15.05.90")
-SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
-SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
-SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
-SET(CPACK_NSIS_PACKAGE_NAME "CuraEngine 15.05.90")
-SET(CPACK_OUTPUT_CONFIG_FILE "/root/Data/Firm2017/release/CuraEngine/CPackConfig.cmake")
-SET(CPACK_PACKAGE_CONTACT "Arjen Hiemstra <a.hiemstra@ultimaker.com>")
-SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-3.6/Templates/CPack.GenericDescription.txt")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Cura Engine")
-SET(CPACK_PACKAGE_FILE_NAME "CuraEngine-15.05.90_")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CuraEngine 15.05.90")
-SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "CuraEngine 15.05.90")
-SET(CPACK_PACKAGE_NAME "CuraEngine")
-SET(CPACK_PACKAGE_RELOCATABLE "true")
-SET(CPACK_PACKAGE_VENDOR "Ultimaker")
-SET(CPACK_PACKAGE_VERSION "15.05.90")
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
-SET(CPACK_RESOURCE_FILE_LICENSE "/usr/share/cmake-3.6/Templates/CPack.GenericLicense.txt")
-SET(CPACK_RESOURCE_FILE_README "/usr/share/cmake-3.6/Templates/CPack.GenericDescription.txt")
-SET(CPACK_RESOURCE_FILE_WELCOME "/usr/share/cmake-3.6/Templates/CPack.GenericWelcome.txt")
-SET(CPACK_SET_DESTDIR "OFF")
-SET(CPACK_SOURCE_7Z "")
-SET(CPACK_SOURCE_CYGWIN "")
-SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ;TXZ;TZ")
-SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/root/Data/Firm2017/release/CuraEngine/CPackSourceConfig.cmake")
-SET(CPACK_SOURCE_TBZ2 "ON")
-SET(CPACK_SOURCE_TGZ "ON")
-SET(CPACK_SOURCE_TXZ "ON")
-SET(CPACK_SOURCE_TZ "ON")
-SET(CPACK_SOURCE_ZIP "OFF")
-SET(CPACK_SYSTEM_NAME "Linux")
-SET(CPACK_TOPLEVEL_TAG "Linux")
-SET(CPACK_WIX_SIZEOF_VOID_P "8")
-
-if(NOT CPACK_PROPERTIES_FILE)
-  set(CPACK_PROPERTIES_FILE "/root/Data/Firm2017/release/CuraEngine/CPackProperties.cmake")
-endif()
-
-if(EXISTS ${CPACK_PROPERTIES_FILE})
-  include(${CPACK_PROPERTIES_FILE})
-endif()
+include(CPack)


cmake: Use tar.xz source package generator

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

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

 ### source generator
-set(CPACK_SOURCE_GENERATOR "TGZ")
+set(CPACK_SOURCE_GENERATOR "TXZ")
 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}")


Increased timeout to 3600, to prevent test timeouts with large file tests when submitting to an online dashboard.

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -6,10 +6,13 @@
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)

+set(CTEST_TEST_TIMEOUT  "1")
+set(DART_TESTING_TIMEOUT "3600")
+
 set(CTEST_PROJECT_NAME "netcdf-c")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")

 set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "my.cdash.org")
+set(CTEST_DROP_SITE "my.cdash.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=netcdf-c")
 set(CTEST_DROP_SITE_CDASH TRUE)


CTest: drop old warning suppression

CTest: drop old warning suppression

Signed-off-by: Matthias Kretz <372ea4eca737a13cd010ee806d4ce7b98ee71550@kde.org>

--- CTestCustom.cmake
+++ CTestCustom.cmake
@@ -6,7 +6,6 @@
    "warning is a GCC extension"
    "^-- "  # Ignore output from cmake
    "AVX disabled per default because of old/broken compiler" # This warning is meant for users not the dashboard
-   "warning: the mangled name of .*typename Vc::{anonymous}::Decltype.* will change in a future version of GCC"
    "WARNING non-zero return value in ctest from: make" # Ignore output from ctest
    "ipo: warning #11010:" # Ignore warning about incompatible libraries with ICC -m32 on 64-bit system
    "include/qt4" # -Wuninitialized in QWeakPointer(X *ptr)


写错了，自动检测是否可用

写错了，自动检测是否可用

--- project/cmake/CompilerOption.cmake
+++ project/cmake/CompilerOption.cmake
@@ -21,9 +21,15 @@
 if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
     add_definitions(-Wall -Werror -fPIC)

-    if(UNIX and NOT CYGWIN and not MINGW) {
+    include(CheckCCompilerFlag)
+    message(STATUS "Check Flag: -rdynamic -- running")
+    CHECK_C_COMPILER_FLAG(-rdynamic, C_FLAGS_RDYNAMIC_AVAILABLE)
+    if(C_FLAGS_RDYNAMIC_AVAILABLE)
+        message(STATUS "Check Flag: -rdynamic -- yes")
         add_definitions(-rdynamic)
-    }
+    else()
+        message(STATUS "Check Flag: -rdynamic -- no")
+    endif()

     # gcc 4.9 编译输出颜色支持
     if ( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.9.0" OR CMAKE_CXX_COMPILER_VERSION  VERSION_EQUAL "4.9.0" )


set XP_USE_LATEST_NODE in use script

set XP_USE_LATEST_NODE in use script

* no need for cmake option now that v6 has been removed and we only build v8
* issue https://github.com/smanders/externpro/issues/193

--- projects/use/usexp-node-config.cmake
+++ projects/use/usexp-node-config.cmake
@@ -8,6 +8,7 @@
 get_filename_component(XP_ROOTDIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)
 get_filename_component(XP_ROOTDIR ${XP_ROOTDIR} ABSOLUTE) # remove relative parts
 string(TOUPPER ${prj} PRJ)
+set(XP_USE_LATEST_NODE ON)
 if(NOT DEFINED XP_USE_LATEST_NODE)
   option(XP_USE_LATEST_NODE "build with node @NODE_NEWVER@ instead of @NODE_OLDVER@" OFF)
 endif()


no more need for rostest if not using rostests

--- core/rosbuild/public.cmake
+++ core/rosbuild/public.cmake
@@ -267,17 +267,21 @@
   # Set up the test targets.  Subsequent calls to rosbuild_add_gtest and
   # friends add targets and dependencies from these targets.
   #
+
+  # Find roslib; roslib_path will be used later
+  rosbuild_invoke_rospack("" roslib path find roslib)
+
   # Find rostest.  The variable rostest_path will also be reused in other
   # macros.
-  rosbuild_invoke_rospack("" rostest path find rostest)
+  #rosbuild_invoke_rospack("" rostest path find rostest)

   # Record where we're going to put test results (#2003)
-  execute_process(COMMAND ${rostest_path}/bin/test-results-dir
+  execute_process(COMMAND ${roslib_path}/bin/test-results-dir
                   OUTPUT_VARIABLE rosbuild_test_results_dir
                   RESULT_VARIABLE _test_results_dir_failed
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
   if(_test_results_dir_failed)
-    message(FATAL_ERROR "Failed to invoke rostest/bin/test-results-dir")
+    message(FATAL_ERROR "Failed to invoke roslib/bin/test-results-dir")
   endif(_test_results_dir_failed)

   # The 'tests' target builds the test program
@@ -308,13 +312,13 @@

   add_custom_target(test-results-run)
   add_custom_target(test-results
-                    COMMAND ${rostest_path}/bin/rostest-results --nodeps ${_project})
+                    COMMAND ${roslib_path}/bin/rostest-results --nodeps ${_project})
   add_dependencies(test-results test-results-run)
   # Do we want coverage reporting (only matters for Python, because
   # Bullseye already collects everything into a single file).
   if("$ENV{ROS_TEST_COVERAGE}" STREQUAL "1")
     add_custom_target(test-results-coverage
-                      COMMAND ${rostest_path}/bin/coverage-html
+                      COMMAND ${roslib_path}/bin/coverage-html
                       WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
     # Make tests run before collecting coverage results
     add_dependencies(test-results-coverage test-results-run)


Added a warning when disabling openmp support

--- core/rosbuild/public.cmake
+++ core/rosbuild/public.cmake
@@ -858,6 +858,8 @@
       message("WARNING: OpenMP compile flag not found")
     endif(_rospack_openmp_flag_found)

+  else("$ENV{COVFILE}" STREQUAL "")
+    _rosbuild_warn("because COVFILE is set, OpenMP support is disabled")
   endif("$ENV{COVFILE}" STREQUAL "")
 endmacro(rosbuild_add_openmp_flags)


Add NSIS support.

Add NSIS support.

git-svn-id: b1dee0d48e635e16c3b356ce77271b225d4db9f7@251 7dcaeef0-15fb-0310-b436-a5af3365683c

--- CPackConfig.cmake
+++ CPackConfig.cmake
@@ -7,6 +7,9 @@
 set(CPACK_PACKAGE_NAME ${APPLICATION_NAME})
 set(CPACK_PACKAGE_VENDOR "${APPLICATION_NAME} developers")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The SSH library")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "libssh")
+set(CPACK_PACKAGING_INSTALL_PREFIX "libssh")
+set(CPACK_PACKAGE_VENDOR "The SSH Libaray Development Team")

 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")

@@ -16,7 +19,7 @@
 set(CPACK_PACKAGE_VERSION_PATCH "90")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")

-set(CPACK_GENERATOR "TGZ")
+set(CPACK_GENERATOR "NSIS")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")

 ### source package settings
@@ -24,4 +27,27 @@
 set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;tags;cscope.*")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")

+### nsis specific
+set(CPACK_NSIS_DISPLAY_NAME "The SSH Library")
+#set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
+
+# see http://www.cmake.org/Wiki/CMake:Component_Install_With_CPack
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "libssh")
+
+set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries")
+set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C/C++ Headers")
+
+set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION
+  "Libraries used to build programs which use libssh")
+set(CPACK_COMPONENT_HEADERS_DESCRIPTION
+  "C/C++ header files for use with libssh")
+
+set(CPACK_COMPONENT_HEADERS_DEPENDS libraries)
+
+#set(CPACK_COMPONENT_APPLICATIONS_GROUP "Runtime")
+#set(CPACK_COMPONENT_LIBRARIES_GROUP "Development")
+#set(CPACK_COMPONENT_HEADERS_GROUP "Development")
+
+set(CPACK_NSIS_MENU_LINKS "http://0xbadc0de.be/wiki/libssh:libssh" "libssh homepage")
+
 include(CPack)


AVX is now another subproject to test

AVX is now another subproject to test

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -12,6 +12,7 @@
    Scalar
    SSE
    LRBni
+   AVX
    )

 set(CTEST_UPDATE_TYPE "git")


CTest: Updated CTestConfig.cmake to new CDash on jwein2.

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -5,9 +5,9 @@
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
 set(CTEST_PROJECT_NAME "ViennaFEM")
-set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
+set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")

 set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "my.cdash.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=ViennaFEM")
+set(CTEST_DROP_SITE "jwein2.iue.tuwien.ac.at:50000")
+set(CTEST_DROP_LOCATION "/CDash/submit.php?project=ViennaFEM")
 set(CTEST_DROP_SITE_CDASH TRUE)


ignore operator[] warning that is emitted with GCC 4.3

--- CTestCustom.cmake
+++ CTestCustom.cmake
@@ -17,6 +17,7 @@
    "ipo: warning #11010:" # Ignore warning about incompatible libraries with ICC -m32 on 64-bit system
    "include/qt4" # -Wuninitialized in QWeakPointer(X *ptr)
    "implicit_type_conversion.cpp.*(double|float).*argument 1 to.*TestImplicitCast" # ignore GCC 4.1 warning
+   "Vc::Warnings::_operator_bracket_warning" # GCC 4.3 is supposed to throw this warning like crazy
    )

 set(CTEST_CUSTOM_ERROR_EXCEPTION ${CTEST_CUSTOM_ERROR_EXCEPTION}


Fix GLEW_MX finder

Fix GLEW_MX finder

--- FindGLEW_MX.cmake
+++ FindGLEW_MX.cmake
@@ -1,5 +1,5 @@
 # Copyright (c) 2010 Daniel Pfeifer <daniel@pfeifer-mail.de>
-#               2011 Stefan Eilemann <eile@eyescale.ch>
+#               2011-2013 Stefan Eilemann <eile@eyescale.ch>

 find_path(_glew_mx_INCLUDE_DIR GL/glew.h
   /usr/include /usr/local/include /opt/local/include)
@@ -15,16 +15,14 @@
     "int main(int argc, char* argv[])\n"
     "{\n"
     "  glewContextInit(0);\n"
+    "}\n"
     )
-  if(X11_FOUND)
-    file(APPEND ${TEST_SRC} "  glxewContextInit();\n")
-  endif()
   file(APPEND ${TEST_SRC} "}\n")

   try_compile(_glew_mx_SUPPORTED ${CMAKE_BINARY_DIR}/glew_test ${TEST_SRC}
     CMAKE_FLAGS
-      "-DINCLUDE_DIRECTORIES:STRING=${_glew_mx_INCLUDE_DIR}"
-      "-DLINK_LIBRARIES:STRING=${_glew_mx_LIBRARY}"
+    "-DINCLUDE_DIRECTORIES:STRING=${_glew_mx_INCLUDE_DIR}"
+    "-DLINK_LIBRARIES:STRING=${_glew_mx_LIBRARY}"
     COMPILE_DEFINITIONS -DGLEW_MX=1
     )


add missing zlib dependency to FindOpenEXR.cmake

--- FindOpenEXR.cmake
+++ FindOpenEXR.cmake
@@ -1,4 +1,5 @@
 find_package(IlmBase REQUIRED)
+find_package(ZLIB REQUIRED)

 set(OPENEXR_INCLUDE_DIRS ${CONAN_INCLUDE_DIRS_OPENEXR})
 set(OPENEXR_LIBRARY_DIRS ${CONAN_LIB_DIRS_OPENEXR})
@@ -7,6 +8,7 @@
 set(OPENEXR_LIBRARY_DIR  ${OPENEXR_LIBRARY_DIRS})

 set(OPENEXR_LIBRARIES "${ILMBASE_LIBRARIES}")
+list(APPEND OPENEXR_LIBRARIES "${ZLIB_LIBRARIES}")
 foreach (LIBNAME ${CONAN_LIBS_OPENEXR})
     string(REGEX MATCH "[^-]+" LIBNAME_STEM ${LIBNAME})
     find_library(OPENEXR_${LIBNAME_STEM}_LIBRARY NAMES ${LIBNAME} PATHS ${OPENEXR_LIBRARY_DIRS})


Updated FindCorrade.cmake from Corrade repository.

--- modules/FindCorrade.cmake
+++ modules/FindCorrade.cmake
@@ -21,6 +21,8 @@
 # Features of found Corrade library are exposed in these variables:
 #  CORRADE_GCC46_COMPATIBILITY  - Defined if compiled with compatibility
 #   mode for GCC 4.6
+#  CORRADE_GCC47_COMPATIBILITY  - Defined if compiled with compatibility
+#   mode for GCC 4.7
 #  CORRADE_BUILD_STATIC         - Defined if compiled as static libraries
 #  CORRADE_TARGET_NACL          - Defined if compiled for Google Chrome
 #   Native Client
@@ -44,16 +46,14 @@
 #
 #
 # Compile data resources into application binary.
-#  corrade_add_resource(name group_name
-#                       file [ALIAS alias]
-#                       [file1 [ALIAS alias1]...])
+#  corrade_add_resource(name resources.conf)
 # Depends on corrade-rc, which is part of Corrade utilities. This command
-# generates resource file with group group_name from given files in current
-# build directory. Argument name is name under which the resources can be
-# explicitly loaded. Variable `name` contains compiled resource filename,
-# which is then used for compiling library / executable. Example usage:
-#  corrade_add_resource(name group_name file1 ALIAS alias1 file2 file3)
-#  add_executable(app source1 source2 ... ${name})
+# generates resource data using given configuration file in current build
+# directory. Argument name is name under which the resources can be explicitly
+# loaded. Variable `name` contains compiled resource filename, which is then
+# used for compiling library / executable. Example usage:
+#  corrade_add_resource(app_resources resources.conf)
+#  add_executable(app source1 source2 ... ${app_resources})
 #
 # Add dynamic plugin.
 #  corrade_add_plugin(plugin_name install_dir metadata_file
@@ -65,27 +65,12 @@
 #
 #
 # Add static plugin.
-#  corrade_add_static_plugin(static_plugins_variable
-#                            plugin_name metadata_file
+#  corrade_add_static_plugin(plugin_name install_dir metadata_file
 #                            sources...)
 # The macro adds preprocessor directive CORRADE_STATIC_PLUGIN. Additional
-# libraries can be linked in via target_link_libraries(plugin_name ...). Plugin
-# library name will be appended to static_plugins_variable and the variable is
-# meant to be used for linking plugins to main executable/library, e.g:
-#  target_link_libraries(app lib1 lib2 ... ${static_plugins_variable})
-# This variable is set with parent scope to be available in parent directory.
-# If there are more intermediate directories between plugin directory and main
-# executable directory, the variable can be propagated to parent scope like
-# this:
-#  set(static_plugins_variable ${static_plugins_variable} PARENT_SCOPE)
-#
-# Find and install DLLs for bundling with Windows build.
-#  corrade_bundle_dlls(library_install_dir
-#                      dlls...
-#                      [PATHS paths...])
-# It is possible to specify also additional paths for searching. DLL names can
-# also contain paths, they will be installed into exact specified path. If an
-# DLL is not found, fatal error message is printed.
+# libraries can be linked in via target_link_libraries(plugin_name ...). If
+# install_dir is set to CMAKE_CURRENT_BINARY_DIR (e.g. for testing purposes),
+# no installation is performed.
 #
 #
 # Additionally these variables are defined for internal usage:
@@ -157,6 +142,10 @@
 if(NOT _GCC46_COMPATIBILITY EQUAL -1)
     set(CORRADE_GCC46_COMPATIBILITY 1)
 endif()
+string(FIND "${_corradeConfigure}" "#define CORRADE_GCC47_COMPATIBILITY" _GCC47_COMPATIBILITY)
+if(NOT _GCC47_COMPATIBILITY EQUAL -1)
+    set(CORRADE_GCC47_COMPATIBILITY 1)
+endif()
 string(FIND "${_corradeConfigure}" "#define CORRADE_BUILD_STATIC" _BUILD_STATIC)
 if(NOT _BUILD_STATIC EQUAL -1)
     set(CORRADE_BUILD_STATIC 1)


fixed: path setups to avoid '~'

fixed: path setups to avoid '~'

--- share/hugh/cmake/CMakeAddons_SetupVariables.cmake
+++ share/hugh/cmake/CMakeAddons_SetupVariables.cmake
@@ -60,8 +60,8 @@
   set(GLI_ROOT_DIR "C:/Tools/gli/gli-git")
   set(GLM_ROOT_DIR "C:/Tools/glm/glm-git")
 elseif(CMAKE_HOST_UNIX)
-  set(GLI_ROOT_DIR "~/Projects/others/gli-git")
-  set(GLM_ROOT_DIR "~/Projects/others/glm-regnirpsj-git")
+  set(GLI_ROOT_DIR "/home/jsd/Projects/others/gli-git")
+  set(GLM_ROOT_DIR "/home/jsd/Projects/others/glm-regnirpsj-git")
 endif()
 if(DEFINED ENV{GLI_ROOT_DIR})
   set(GLI_ROOT_DIR $ENV{GLI_ROOT_DIR})


new Component to display the point Set

new Component to display the point Set

--- Qmitk/files.cmake
+++ Qmitk/files.cmake
@@ -27,6 +27,7 @@
   QmitkFunctionalityComponents/QmitkImageCropperComponent.cpp
   QmitkFunctionalityComponents/QmitkPixelGreyValueManipulatorComponent.cpp
   QmitkFunctionalityComponents/QmitkSeedPointSetComponent.cpp
+  QmitkFunctionalityComponents/QmitkDisplayPointSetComponent.cpp
   QmitkFunctionalityComponents/QmitkSingleTimeStepExporterComponent.cpp
   QmitkFunctionalityComponents/QmitkSliceSliderNavigationComponent.cpp
   QmitkFunctionalityComponents/QmitkSurfaceCreatorComponent.cpp
@@ -97,6 +98,7 @@
   QmitkFunctionalityComponents/QmitkImageCropperComponentGUI.ui
   QmitkFunctionalityComponents/QmitkPixelGreyValueManipulatorComponentGUI.ui
   QmitkFunctionalityComponents/QmitkSeedPointSetComponentGUI.ui
+  QmitkFunctionalityComponents/QmitkDisplayPointSetComponentGUI.ui
   QmitkFunctionalityComponents/QmitkSingleTimeStepExporterComponentGUI.ui
   QmitkFunctionalityComponents/QmitkSliceSliderNavigationComponentGUI.ui
   QmitkFunctionalityComponents/QmitkSurfaceCreatorComponentGUI.ui
@@ -143,6 +145,7 @@
   QmitkFunctionalityComponents/QmitkImageCropperComponent.h
   QmitkFunctionalityComponents/QmitkPixelGreyValueManipulatorComponent.h
   QmitkFunctionalityComponents/QmitkSeedPointSetComponent.h
+  QmitkFunctionalityComponents/QmitkDisplayPointSetComponent.h
   QmitkFunctionalityComponents/QmitkSingleTimeStepExporterComponent.h
   QmitkFunctionalityComponents/QmitkSliceSliderNavigationComponent.h
   QmitkFunctionalityComponents/QmitkSurfaceCreatorComponent.h


disable gui dependencies

disable gui dependencies

--- MLabPlugin/PluginConfig.cmake
+++ MLabPlugin/PluginConfig.cmake
@@ -54,7 +54,7 @@
 # Uncomment this next line if you're not planning on your plugin doing
 # any drawing:

-#set (FB_GUI_DISABLED 1)
+set (FB_GUI_DISABLED 1)

 # Mac plugin settings. If your plugin does not draw, set these all to 0
 set(FBMAC_USE_QUICKDRAW 0)


start 1.8.1

start 1.8.1

--- CMake/cotire.cmake
+++ CMake/cotire.cmake
@@ -43,7 +43,7 @@
 endif()

 set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
-set (COTIRE_CMAKE_MODULE_VERSION "1.8.0")
+set (COTIRE_CMAKE_MODULE_VERSION "1.8.1")

 # activate select policies
 if (POLICY CMP0025)


Fix issue CMAKE-18: FindPoppler implements QUIET

--- FindPoppler.cmake
+++ FindPoppler.cmake
@@ -40,7 +40,9 @@
 )

 IF( NOT(POPPLER_XPDF_INCLUDE_DIR) )
-  MESSAGE( STATUS "Could not find poppler-config.h, disabling support for Xpdf headers." )
+  IF ( NOT Poppler_FIND_QUIETLY )
+    MESSAGE( STATUS "Could not find poppler-config.h, disabling support for Xpdf headers." )
+  ENDIF ( NOT Poppler_FIND_QUIETLY )
   SET( POPPLER_HAS_XPDF false )
 ELSE( NOT(POPPLER_XPDF_INCLUDE_DIR) )
   SET( POPPLER_HAS_XPDF true )
@@ -58,55 +60,59 @@
     lib
 )
 IF ( NOT(POPPLER_LIBRARIES) )
-  MESSAGE(STATUS "Could not find libpoppler." )
-ENDIF ()
-
-# Scan poppler libraries for dependencies on Fontconfig
-INCLUDE(GetPrerequisites)
-MARK_AS_ADVANCED(gp_cmd)
-GET_PREREQUISITES("${POPPLER_LIBRARIES}" POPPLER_PREREQS 1 0 "" "")
-IF ("${POPPLER_PREREQS}" MATCHES "fontconfig")
-  SET(POPPLER_NEEDS_FONTCONFIG TRUE)
-ELSE ()
-  SET(POPPLER_NEEDS_FONTCONFIG FALSE)
-ENDIF ()
+  IF ( NOT Poppler_FIND_QUIETLY )
+    MESSAGE(STATUS "Could not find libpoppler." )
+  ENDIF ( NOT Poppler_FIND_QUIETLY )
+ELSE( NOT(POPPLER_LIBRARIES) )
+  # Scan poppler libraries for dependencies on Fontconfig
+  INCLUDE(GetPrerequisites)
+  MARK_AS_ADVANCED(gp_cmd)
+  GET_PREREQUISITES("${POPPLER_LIBRARIES}" POPPLER_PREREQS 1 0 "" "")
+  IF ("${POPPLER_PREREQS}" MATCHES "fontconfig")
+    SET(POPPLER_NEEDS_FONTCONFIG TRUE)
+  ELSE ()
+    SET(POPPLER_NEEDS_FONTCONFIG FALSE)
+  ENDIF ()

-FIND_PATH(POPPLER_QT_INCLUDE_DIR NAMES poppler-qt${QT_VERSION_MAJOR}.h poppler-link.h
-  PATHS
-    /usr/local/include
-    /usr/include
-  HINTS
-    ${POPPLER_QT_PKG_INCLUDE_DIRS} # Generated by pkg-config
-  PATH_SUFFIXES
-    poppler
-    qt${QT_VERSION_MAJOR}
-    poppler/qt${QT_VERSION_MAJOR}
-)
-IF ( NOT(POPPLER_QT_INCLUDE_DIR) )
-  MESSAGE(STATUS "Could not find Poppler-Qt${QT_VERSION_MAJOR} headers." )
-ENDIF ()
-FIND_LIBRARY(POPPLER_QT_LIBRARIES NAMES poppler-qt${QT_VERSION_MAJOR} ${POPPLER_QT_PKG_LIBRARIES}
-  PATHS
-    /usr/local
-    /usr
-  HINTS
-    ${POPPLER_PKG_LIBRARY_DIRS} # Generated by pkg-config
-  PATH_SUFFIXES
-    lib64
-    lib
-)
-MARK_AS_ADVANCED(POPPLER_QT_LIBRARIES)
-IF ( NOT(POPPLER_QT_LIBRARIES) )
-  MESSAGE(STATUS "Could not find libpoppler-qt${QT_VERSION_MAJOR}." )
-ENDIF ()
-LIST(INSERT POPPLER_LIBRARIES 0 ${POPPLER_QT_LIBRARIES})
-
+  FIND_PATH(POPPLER_QT_INCLUDE_DIR NAMES poppler-qt${QT_VERSION_MAJOR}.h poppler-link.h
+    PATHS
+      /usr/local/include
+      /usr/include
+    HINTS
+      ${POPPLER_QT_PKG_INCLUDE_DIRS} # Generated by pkg-config
+    PATH_SUFFIXES
+      poppler
+      qt${QT_VERSION_MAJOR}
+      poppler/qt${QT_VERSION_MAJOR}
+  )
+  IF ( NOT(POPPLER_QT_INCLUDE_DIR) )
+    IF ( NOT Poppler_FIND_QUIETLY )
+      MESSAGE(STATUS "Could not find Poppler-Qt${QT_VERSION_MAJOR} headers." )
+    ENDIF ( NOT Poppler_FIND_QUIETLY )
+  ENDIF ()
+  FIND_LIBRARY(POPPLER_QT_LIBRARIES NAMES poppler-qt${QT_VERSION_MAJOR} ${POPPLER_QT_PKG_LIBRARIES}
+    PATHS
+      /usr/local
+      /usr
+    HINTS
+      ${POPPLER_PKG_LIBRARY_DIRS} # Generated by pkg-config
+    PATH_SUFFIXES
+      lib64
+      lib
+  )
+  IF ( NOT(POPPLER_QT_LIBRARIES) )
+    IF ( NOT Poppler_FIND_QUIETLY )
+      MESSAGE(STATUS "Could not find libpoppler-qt${QT_VERSION_MAJOR}." )
+    ENDIF ( NOT Poppler_FIND_QUIETLY )
+  ENDIF ()
+  LIST(INSERT POPPLER_LIBRARIES 0 ${POPPLER_QT_LIBRARIES})
+ENDIF ( NOT(POPPLER_LIBRARIES) )

 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Poppler DEFAULT_MSG POPPLER_LIBRARIES POPPLER_QT_INCLUDE_DIR )

 # show the POPPLER_(XPDF/QT4)_INCLUDE_DIR and POPPLER_LIBRARIES variables only in the advanced view
-MARK_AS_ADVANCED(POPPLER_XPDF_INCLUDE_DIR POPPLER_QT_INCLUDE_DIR POPPLER_LIBRARIES)
+MARK_AS_ADVANCED(POPPLER_XPDF_INCLUDE_DIR POPPLER_QT_INCLUDE_DIR POPPLER_LIBRARIES POPPLER_QT_LIBRARIES)


Need to still define OGRE_DEP_DIR in InstallDependencies.cmake, but derive it a different way

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -12,6 +12,12 @@
 #####################################################
 if ((NOT APPLE) AND (NOT WIN32))
   return()
+endif()
+
+if (OGRE_DEPENDENCIES_DIR)
+	set(OGRE_DEP_DIR ${OGRE_DEPENDENCIES_DIR})
+else()
+	set(OGRE_DEP_DIR "${OGRE_SOURCE_DIR}/Dependencies")
 endif()

 option(OGRE_INSTALL_DEPENDENCIES "Install dependency libs needed for samples" TRUE)


Fix small typo in findpkg_framework macro (${fwk} instead of {fwk})

--- CMake/Utils/FindPkgMacros.cmake
+++ CMake/Utils/FindPkgMacros.cmake
@@ -107,7 +107,7 @@
     FOREACH(dir ${${fwk}_FRAMEWORK_PATH})
       SET(fwkpath ${dir}/${fwk}.framework)
       IF(EXISTS ${fwkpath})
-        SET(${fwk}_FRAMEWORK_INCLUDES ${{fwk}_FRAMEWORK_INCLUDES}
+        SET(${fwk}_FRAMEWORK_INCLUDES ${${fwk}_FRAMEWORK_INCLUDES}
           ${fwkpath}/Headers ${fwkpath}/PrivateHeaders)
         if (NOT ${fwk}_LIBRARY_FWK)
           SET(${fwk}_LIBRARY_FWK "-framework ${fwk}" CACHE STRING "${fwk} library")


Disable MKL

Disable MKL

Resolves #581

--- hoomd/extern/dfftlib/FindLocalFFT.cmake
+++ hoomd/extern/dfftlib/FindLocalFFT.cmake
@@ -1,5 +1,5 @@
-find_package(MKL QUIET)
-find_package(ACML QUIET)
+# find_package(MKL QUIET)
+# find_package(ACML QUIET)

 option(ENABLE_HOST "CPU FFT support" ON)
 if (MKL_LIBRARIES AND MKL_INCLUDE_DIR)


Fix OpenCV linking issues on Win32

Fix OpenCV linking issues on Win32

--- sequoia-engine/cmake/AddOpenCV.cmake
+++ sequoia-engine/cmake/AddOpenCV.cmake
@@ -28,10 +28,23 @@
 # Iterate all OpenCV targets and glob the location of the library and the dependencies
 foreach(target ${OpenCV_LIBS})
   get_property(${target}_INCLUDE_DIRS TARGET ${target} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-  get_property(${target}_EXTERNAL_LIBRARIES TARGET  ${target}
+  get_property(${target}_LIBRARY TARGET  ${target} PROPERTY IMPORTED_LOCATION_${config})
+
+  # Newer version of OpenCV set the INTERFACE_LINK_LIBRARIES while older set
+  # IMPORTED_LINK_INTERFACE_LIBRARIES_<CONFIG> and as we don't want to export targets, we have to
+  # resolve all the libraries to get the paths.
+  get_property(${target}_imported_link_interface_libraries TARGET ${target}
                PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_${config})
-  get_property(${target}_LIBRARY TARGET  ${target}
-               PROPERTY IMPORTED_LOCATION_${config})
+  get_property(${target}_interface_link_libraries TARGET ${target}
+               PROPERTY INTERFACE_LINK_LIBRARIES)
+  foreach(ext ${${target}_interface_link_libraries} ${${target}_imported_link_interface_libraries})
+    # Resolve lib in $<LINK_ONLY:"lib">
+    if("${ext}" MATCHES "\\$<LINK_ONLY:(.*)>")
+      list(APPEND ${target}_EXTERNAL_LIBRARIES "${CMAKE_MATCH_1}")
+    else()
+      list(APPEND ${target}_EXTERNAL_LIBRARIES "${ext}")
+    endif()
+  endforeach()

   list(APPEND opencv_includes ${${target}_INCLUDE_DIRS})
   list(APPEND opencv_libraries ${${target}_LIBRARY} ${${target}_EXTERNAL_LIBRARIES})


fix bug in thorpp macro

fix bug in thorpp macro

--- CMake/Packages/UsingThorPP.cmake
+++ CMake/Packages/UsingThorPP.cmake
@@ -62,7 +62,9 @@
         MESSAGE(STATUS "no code-gen extension specified -- generating without extension!")
     ENDIF()

-    ADD_CUSTOM_TARGET(${__target}) # root target
+    IF(DEFINED __target)
+        ADD_CUSTOM_TARGET(${__target}) # root target
+    ENDIF()

     FOREACH(__input ${__input_list})


From Mattias Helsing, "The addition of the GStreamer cmake find script broke my build because
cmake vars weren't passed correctly to find_package_handler_args, so
while the find script didn't find a single required GStreamer lib or
include path it still reported GSTREAMER_FOUND=TRUE (and then tried to
compile the new plugin). This fixes it and correctly reports missing
components."

git-svn-id: aa838dfc23441284dd616281de4245daec5d2135@14611 16af8721-9629-0410-8352-f15c8da7e697

--- CMakeModules/FindGStreamer.cmake
+++ CMakeModules/FindGStreamer.cmake
@@ -153,7 +153,7 @@
 endforeach ()

 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer REQUIRED_VARS _GSTREAMER_REQUIRED_VARS
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer REQUIRED_VARS ${_GSTREAMER_REQUIRED_VARS}
                                             VERSION_VAR   GSTREAMER_VERSION)

 mark_as_advanced(
@@ -171,4 +171,4 @@
     GSTREAMER_PBUTILS_LIBRARIES
     GSTREAMER_VIDEO_INCLUDE_DIRS
     GSTREAMER_VIDEO_LIBRARIES
-)+)


Linux 32-bit autobuild fix. Don't need gio-2.0 for 32-bit builds.

--- indra/cmake/UI.cmake
+++ indra/cmake/UI.cmake
@@ -40,7 +40,6 @@
         gdk-x11-2.0
         gdk_pixbuf-2.0
         glib-2.0
-        gio-2.0
         gmodule-2.0
         gobject-2.0
         gthread-2.0
@@ -60,6 +59,18 @@
                    )
       set(UI_LIBRARIES ${UI_LIBRARIES} ${UI_LIB_${libname}})
     endforeach(libname)
+
+    if (ND_BUILD64BIT_ARCH)
+      find_library(UI_LIB_gio-2.0
+                   NAMES gio-2.0
+                   PATHS
+                     debug ${LIBS_PREBUILT_DIR}/lib/debug
+                     optimized ${LIBS_PREBUILT_DIR}/lib/release
+                   NO_DEFAULT_PATH
+                   )
+      set(UI_LIBRARIES ${UI_LIBRARIES} ${UI_LIB_gio-2.0})
+    endif(ND_BUILD64BIT_ARCH)
+
     set(UI_LIBRARIES ${UI_LIBRARIES} Xinerama)
   endif (LINUX)


ManageTranslation: Fix zanata.xml path problem

--- Modules/ManageTranslation.cmake
+++ Modules/ManageTranslation.cmake
@@ -217,6 +217,8 @@
     #========================================
     # ZANATA support
     MACRO(USE_ZANATA serverUrl)
+	SET(ZANATA_SERVER "${serverUrl}")
+	SET(ZANATA_XML_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR})
 	FIND_PROGRAM(ZANATA_CMD zanata)
 	SET(_failed 0)
 	IF(ZANATA_CMD STREQUAL "ZANATA_CMD-NOTFOUND")
@@ -230,27 +232,26 @@
 	ENDIF(NOT EXISTS $ENV{HOME}/.config/zanata.ini)

 	SET(_zanata_xml "")
-	FIND_PATH(_zanata_xml_in "zanata.xml.in" PATHS
-	    ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-	M_MSG(${M_INFO1} "USE_ZANATA:_zanata_xml_in=${_zanata_xml_in}")
-	IF(NOT ${_zanata_xml_in} MATCHES "NOTFOUND")
-	    SET(ZANATA_SERVER ${serverUrl})
-	    GET_FILENAME_COMPONENT(_zanata_xml_in_dir ${_zanata_xml_in}	PATH)
+	FIND_PATH(_zanata_xml_in_dir "zanata.xml.in" PATHS ${ZANATA_XML_SEARCH_PATH})
+	IF(NOT "${_zanata_xml_in_dir}" MATCHES "NOTFOUND")
+	    SET(_zanata_xml_in ${_zanata_xml_in_dir}/zanata.xml.in)
+	    M_MSG(${M_INFO1} "USE_ZANATA:_zanata_xml_in=${_zanata_xml_in}")
 	    SET(_zanata_xml ${_zanata_xml_in_dir}/zanata.xml)
 	    CONFIGURE_FILE(${_zanata_xml_in} ${_zanata_xml} @ONLY)
-	ENDIF(NOT ${_zanata_xml_in} MATCHES "NOTFOUND")
-
-	IF(_zanata_xml STREQUAL "")
-	    FIND_PATH(_zanata_xml "zanata.xml" PATHS
-		${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-	    IF(${_zanata_xml} MATCHES "NOTFOUND")
+	ENDIF(NOT "${_zanata_xml_in_dir}" MATCHES "NOTFOUND")
+
+	IF(NOT "${_zanata_xml}" STREQUAL "")
+	    FIND_PATH(_zanata_xml_dir "zanata.xml" PATHS ${ZANATA_XML_SEARCH_PATH})
+	    IF(NOT "${_zanata_xml_dir}" MATCHES "NOTFOUND")
+		SET(_zanata_xml "${_zanata_xml_dir}/zanata.xml")
+	    ELSE(NOT "${_zanata_xml_dir}" MATCHES "NOTFOUND")
 		SET(_failed 1)
-		M_MSG(${M_OFF} "zanata.xml not found in ${CMAKE_CURRENT_SOURCE_DIR} or ${CMAKE_SOURCE_DIR}! zanata support disabled.")
-	    ENDIF(${_zanata_xml} MATCHES "NOTFOUND")
-	ENDIF(_zanata_xml STREQUAL "")
-	M_MSG(${M_INFO1} "USE_ZANATA:_zanata_xml=${_zanata_xml_in}")
+		M_MSG(${M_OFF} "zanata.xml not found in ${ZANATA_XML_SEARCH_PATH}! zanata support disabled.")
+	    ENDIF(NOT "${_zanata_xml_dir}" MATCHES "NOTFOUND")
+	ENDIF(NOT "${_zanata_xml}" STREQUAL "")

 	IF(_failed EQUAL 0)
+	    M_MSG(${M_INFO1} "USE_ZANATA:_zanata_xml=${_zanata_xml}")
 	    # Parsing arguments
 	    SET(_srcDir)
 	    SET(_transDir)
@@ -277,9 +278,10 @@
 		ENDIF(_arg STREQUAL "SRCDIR")
 	    ENDFOREACH(_arg ${ARGN})

-	    SET(_zanata_args --url=${serverURL} --project-id=${PROJECT_NAME})
+	    SET(_zanata_args --url=${ZANATA_SERVER} --project-id=${PROJECT_NAME}
+		--project-config=${_zanata_xml})
 	    ADD_CUSTOM_TARGET(zanata_project_create
-		COMMAND ${ZANATA_CMD} project create ${PROJECT_NAME} --url=${serverURL}
+		COMMAND ${ZANATA_CMD} project create ${PROJECT_NAME} ${_zanata_args}
 		--project-name="${PROJECT_NAME}" --project-desc="${PRJ_SUMMARY}"
 		COMMENT "Create project translation on Zanata server ${serverUrl}"
 		VERBATIM


Fixes the rng files in the build directory so that they're placed in the lib directory.

--- src/CMake/CyclusModuleMacros.cmake
+++ src/CMake/CyclusModuleMacros.cmake
@@ -10,7 +10,7 @@

   CONFIGURE_FILE(
     ${CYCLUS_SOURCE_DIR}${_path}/${_name}.rng
-    ${CMAKE_CURRENT_BINARY_DIR}/${_name}.rng
+    ${PROJECT_BINARY_DIR}/lib${_path}/${_name}.rng
     COPYONLY
     )


ADD path to others test directories

ADD path to others test directories

git-svn-id: ed1ce8e5c168003d808aec37bc6fda77b178f7bb@3501 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- trunk/test/CTestTestfile.cmake
+++ trunk/test/CTestTestfile.cmake
@@ -13,16 +13,120 @@
 #ADD_TEST(LS_BINARY_PATH "ls" "-all")
 #ADD_TEST(PWD_BINARY_PATH "pwd")

-## -- Other Tests : Place a file named DartTestfile.txt in this path with tests.
+## -- Other Tests : Place a file named DartTestfile.txt in path with tests.

+
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/acquisition/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/turbofieldtrip/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/tools/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/vrpn/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/stimulation/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/stimulation/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/feature-extraction/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/classification-gpl/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/signal-processing/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/signal-processing/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/simple-visualisation/branches/wip-lbonnet-p300/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/simple-visualisation/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/file-io/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/samples/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/examples/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/classification/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/stream-codecs/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/python/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/streaming/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/streaming/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/signal-processing-gpl/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/signal-processing-gpl/branches/wip-acellard-ARFeatures/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/signal-processing-gpl/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/matlab/branches/wip-lbonnet-matlabdll/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/matlab/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/id-generator/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/external-stimulation-connection-example/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/designer/tags/wip-omk4/test")
 SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/designer/trunc/test")
-SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/samples/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/ssvep-demo/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/skeleton-generator/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/vr-demo/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/vrpn-simulator/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/plugin-inspector/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/acquisition-server/branches/wip-lbonnet-micromed/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/acquisition-server/branches/wip-lbonnet-gtec/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/acquisition-server/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/acquisition-server/branches/wip-jfruitet/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-applications/acquisition-server/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-documentation/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe/tags/wip-omk4/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-toolkit/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-scenarios/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/acquisition/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/turbofieldtrip/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/tools/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/vrpn/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/stimulation/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/stimulation/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/feature-extraction/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/classification-gpl/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/signal-processing/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/signal-processing/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/simple-visualisation/branches/wip-lbonnet-p300/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/simple-visualisation/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/file-io/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/samples/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/examples/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/classification/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/stream-codecs/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/python/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/streaming/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/streaming/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/signal-processing-gpl/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/signal-processing-gpl/branches/wip-acellard-ARFeatures/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/signal-processing-gpl/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/matlab/branches/wip-lbonnet-matlabdll/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-plugins/matlab/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/id-generator/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/external-stimulation-connection-example/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/designer/tags/wip-omk4/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/designer/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/ssvep-demo/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/skeleton-generator/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/vr-demo/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/vrpn-simulator/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/plugin-inspector/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/acquisition-server/branches/wip-lbonnet-micromed/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/acquisition-server/branches/wip-lbonnet-gtec/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/acquisition-server/branches/wip-emaby/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/acquisition-server/branches/wip-jfruitet/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-applications/acquisition-server/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-documentation/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe/tags/wip-omk4/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-toolkit/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-scenarios/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-kernel-omk/tags/wip-omk4/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-kernel-omk/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-modules/xml/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-modules/automaton/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-modules/stream/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-modules/ebml/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-modules/socket/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-modules/fs/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/openvibe-modules/system/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/test/trunk/scripts/software/tmp/vrpn/java_vrpn/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-kernel-omk/tags/wip-omk4/test")
 SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-kernel-omk/trunc/test")
-SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-modules/trunc/test")
-SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-toolkit/trunc/test")
-SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-plugins/trunc/test")
-SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-scenarios/trunc/test")
-SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-externals/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-modules/xml/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-modules/automaton/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-modules/stream/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-modules/ebml/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-modules/socket/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-modules/fs/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/openvibe-modules/system/trunc/test")
+SUBDIRS("${CTEST_SOURCE_DIRECTORY}/scripts/software/tmp/vrpn/java_vrpn/test")
+


Set VTK_DIR if not using system version

Set VTK_DIR if not using system version

--- SuperBuild/External_ITKv4.cmake
+++ SuperBuild/External_ITKv4.cmake
@@ -157,6 +157,9 @@
       ${${proj}_FFTWD_ARGS}
       ${${proj}_MINC_ARGS}
       )
+      if( USE_SYSTEM_VTK STREQUAL "OFF" )
+        LIST(APPEND ${proj}_CMAKE_OPTIONS -DVTK_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/VTK-install/lib/cmake/vtk-6.2 )
+      endif()
       list(APPEND ${proj}_DEPENDENCIES VTK)
     endif()


Switch to using CMAKE_PREFIX_PATH for VTK to account for differences in lib paths

--- SuperBuild/External_ITKv5.cmake
+++ SuperBuild/External_ITKv5.cmake
@@ -138,7 +138,8 @@
     if( USE_VTK STREQUAL "ON" )
       list(APPEND ${proj}_CMAKE_OPTIONS -DModule_ITKVtkGlue:BOOL=ON)
       if( USE_SYSTEM_VTK STREQUAL "OFF" )
-        list(APPEND ${proj}_CMAKE_OPTIONS -DVTK_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/VTK-install/lib64/cmake/vtk-8.2 )
+        list(INSERT CMAKE_PREFIX_PATH 0 ${CMAKE_CURRENT_BINARY_DIR}/VTK-install)
+        list(APPEND ${proj}_CMAKE_OPTIONS -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH})
       endif()
       list(APPEND ${proj}_DEPENDENCIES VTK)
     else()


Update PythonExternal.cmake

Update PythonExternal.cmake

--- Superbuild/PythonExternal.cmake
+++ Superbuild/PythonExternal.cmake
@@ -69,7 +69,7 @@
   # TODO: figure out pip package
   SET(python_CONFIGURE_FLAGS
     "--prefix=<INSTALL_DIR>"
-    "--with-ensurepip=yes"
+    "--with-ensurepip=no"
   )
   IF(APPLE)
     # framework contains *.dylib


Add Slicer Exetension

Add Slicer Exetension

--- AutoTract.cmake
+++ AutoTract.cmake
@@ -1,6 +1,28 @@
 CMAKE_MINIMUM_REQUIRED( VERSION 2.6 )
 CMAKE_POLICY(VERSION 2.6)
 PROJECT(AutoTract)
+
+
+#-----------------------------------------------------------------------------
+# SLICER EXTENSION
+#-----------------------------------------------------------------------------
+if( AutoTract_BUILD_SLICER_EXTENSION )
+  ADD_DEFINITIONS(-DSPV_EXTENSION=1)
+  set(EXTENSION_NAME ${LOCAL_PROJECT_NAME} )
+  set(MODULE_NAME ${LOCAL_PROJECT_NAME} )
+  set(EXTENSION_HOMEPAGE "https://github.com/NIRALUser/AutoTract")
+  set(EXTENSION_CATEGORY "Tractography")
+  set(EXTENSION_CONTRIBUTORS " ")
+  set(EXTENSION_DESCRIPTION "An automatic tractography tool featuring advanced processing tools to clean fiber tracts after the initial tractography. ")
+  set(EXTENSION_ICONURL "https://www.nitrc.org/project/screenshot.php?group_id=759&screenshot_id=704")
+  set(EXTENSION_SCREENSHOTURLS "http://wiki.na-mic.org/Wiki/images/8/81/Screenshot1.png http://wiki.na-mic.org/Wiki/images/1/13/SPVscreenshot2.png")
+  set(EXTENSION_DEPENDS "NA") # Specified as a space separated list or 'NA' if any
+  set(EXTENSION_BUILD_SUBDIRECTORY .)
+  unsetForSlicer( NAMES QT_QMAKE_EXECUTABLE SlicerExecutionModel_DIR ITK_DIR VTK_DIR CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_CXX_FLAGS CMAKE_C_FLAGS ITK_LIBRARIES )
+  find_package(Slicer REQUIRED)
+  include(${Slicer_USE_FILE})
+  resetForSlicer( NAMES CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_CXX_FLAGS CMAKE_C_FLAGS )
+endif()

 #-----------------------------------------------------------------------------
 # Update CMake module path
@@ -73,3 +95,7 @@
 ENDIF(BUILD_TESTING)

+if( AutoTract_BUILD_SLICER_EXTENSION )
+  set(CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${CMAKE_BINARY_DIR};${EXTENSION_NAME};ALL;/")
+  include(${Slicer_EXTENSION_CPACK})
+endif()


Fix the cmake file for linking sfml

Fix the cmake file for linking sfml

--- SFML-2.3.2/share/SFML/cmake/Modules/FindSFML.cmake
+++ SFML-2.3.2/share/SFML/cmake/Modules/FindSFML.cmake
@@ -102,7 +102,7 @@
         # transform version numbers to an integer
 		message(STATUS ${SFML_VERSION_MAJOR})
 		message(STATUS ${SFML_VERSION_MINOR})
-		#math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10000 + ${SFML_VERSION_MINOR} * 100")
+		math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10000 + ${SFML_VERSION_MINOR} * 100")
 		message(STATUS ${SFML_VERSION})
         # compare them
         if(SFML_VERSION LESS SFML_REQUESTED_VERSION)


install: typo in filename for doxygen

install: typo in filename for doxygen

--- src/yuni/cmake/core/core.cmake
+++ src/yuni/cmake/core/core.cmake
@@ -533,7 +533,7 @@
 )
 # Install other core-related base files
 install(FILES
-	Doxygen.txt
+	doxygen.txt
 	doxygen.h
 	platform.h
 	yuni.h


adapted version of cmake/boost.cmake from strus base

--- cmake/boost.cmake
+++ cmake/boost.cmake
@@ -1,20 +1,85 @@
 set(Boost_USE_MULTITHREADED ON)
 set(BOOST_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/strus")
 set(BOOST_LIBRARYDIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/strus")
-find_package( Boost 1.57.0 COMPONENTS atomic QUIET)
+
+if( BOOST_ROOT )
+MESSAGE( STATUS "Boost root set: '${BOOST_ROOT}' " )
+set( BOOST_INSTALL_PATH ${BOOST_ROOT} )
+else( BOOST_ROOT )
+if (APPLE)
+execute_process( COMMAND  brew  --prefix  boost
+			   RESULT_VARIABLE  RET_BOOST_PATH
+			   OUTPUT_VARIABLE  OUTPUT_BOOST_PATH
+			   OUTPUT_STRIP_TRAILING_WHITESPACE )
+if( ${RET_BOOST_PATH} STREQUAL "" OR ${RET_BOOST_PATH} STREQUAL "0" )
+MESSAGE( STATUS "Call brew  --prefix  boost result: '${OUTPUT_BOOST_PATH}' " )
+set( BOOST_INSTALL_PATH ${OUTPUT_BOOST_PATH} )
+else( ${RET_BOOST_PATH} STREQUAL "" OR ${RET_BOOST_PATH} STREQUAL "0" )
+MESSAGE( STATUS "Call brew  --prefix  boost failed with error: '${RET_BOOST_PATH}' " )
+endif( ${RET_BOOST_PATH} STREQUAL "" OR ${RET_BOOST_PATH} STREQUAL "0" )
+endif (APPLE)
+endif (BOOST_ROOT)
+
+if( BOOST_INSTALL_PATH )
+MESSAGE( STATUS "Boost installation path: '${BOOST_INSTALL_PATH}' " )
+set( Boost_LIBRARY_DIRS "${BOOST_INSTALL_PATH}/lib" )
+set( Boost_INCLUDE_DIRS "${BOOST_INSTALL_PATH}/include" )
+if (APPLE)
+if (HAS_CXX11_REGEX)
+set( Boost_LIBRARIES boost_thread-mt boost_chrono-mt boost_system-mt boost_date_time-mt boost_atomic-mt )
+else (HAS_CXX11_REGEX)
+set( Boost_LIBRARIES boost_thread-mt boost_chrono-mt boost_system-mt boost_date_time-mt boost_atomic-mt boost_regex-mt )
+endif (HAS_CXX11_REGEX)
+else( APPLE)
+if (HAS_CXX11_REGEX)
+set( Boost_LIBRARIES boost_thread pthread boost_chrono boost_system boost_date_time boost_atomic )
+else (HAS_CXX11_REGEX)
+set( Boost_LIBRARIES boost_thread pthread boost_chrono boost_system boost_date_time boost_atomic boost_regex )
+endif (HAS_CXX11_REGEX)
+endif( APPLE)
+
+else( BOOST_INSTALL_PATH )
+MESSAGE( STATUS "Search for Boost ..." )
+
+find_package( Boost 1.53.0 COMPONENTS atomic QUIET)
 if( Boost_ATOMIC_FOUND )
-	if(APPLE OR WIN32)
-		find_package( Boost 1.57.0 REQUIRED COMPONENTS thread-mt system date_time atomic-mt )
-	else()
-		find_package( Boost 1.57.0 REQUIRED COMPONENTS thread system date_time atomic )
-	endif()
-else()
-	if(APPLE OR WIN32)
-		find_package( Boost 1.57.0 REQUIRED COMPONENTS thread-mt system date_time )
-	else()
-		find_package( Boost 1.57.0 REQUIRED COMPONENTS thread system date_time )
-	endif()
-endif()
+	if( APPLE OR WIN32 )
+		if( HAS_CXX11_REGEX )
+			message( STATUS "Has C++ std::regex, don't use boost regex" )
+			find_package( Boost 1.53.0 REQUIRED COMPONENTS thread-mt system date_time atomic-mt )
+		else ( HAS_CXX11_REGEX )
+			message( STATUS "No C++ std::regex, use boost regex instead" )
+			find_package( Boost 1.53.0 REQUIRED COMPONENTS thread-mt system date_time atomic-mt regex )
+		endif( HAS_CXX11_REGEX )
+	else( APPLE OR WIN32 )
+		if( HAS_CXX11_REGEX )
+			message( STATUS "Has C++ std::regex, don't use boost regex" )
+			find_package( Boost 1.53.0 REQUIRED COMPONENTS thread system date_time atomic )
+		else ( HAS_CXX11_REGEX )
+			message( STATUS "No C++ std::regex, use boost regex instead" )
+			find_package( Boost 1.53.0 REQUIRED COMPONENTS thread system date_time atomic regex )
+		endif( HAS_CXX11_REGEX )
+	endif( APPLE OR WIN32 )
+else( Boost_ATOMIC_FOUND )
+	if( APPLE OR WIN32 )
+		if( HAS_CXX11_REGEX )
+			message( STATUS "Has C++ std::regex, don't use boost regex" )
+			find_package( Boost 1.53.0 REQUIRED COMPONENTS thread-mt system date_time )
+		else ( HAS_CXX11_REGEX )
+			message( STATUS "No C++ std::regex, use boost regex instead" )
+			find_package( Boost 1.53.0 REQUIRED COMPONENTS thread-mt system date_time regex )
+		endif( HAS_CXX11_REGEX )
+	else( APPLE OR WIN32 )
+		if( HAS_CXX11_REGEX )
+			message( STATUS "Has C++ std::regex, don't use boost regex" )
+			find_package( Boost 1.53.0 REQUIRED COMPONENTS thread system date_time )
+		else ( HAS_CXX11_REGEX )
+			message( STATUS "No C++ std::regex, use boost regex instead" )
+			find_package( Boost 1.53.0 REQUIRED COMPONENTS thread system date_time regex )
+		endif( HAS_CXX11_REGEX )
+	endif( APPLE OR WIN32 )
+endif( Boost_ATOMIC_FOUND )
+endif( BOOST_INSTALL_PATH )

 MESSAGE( STATUS "Boost includes: ${Boost_INCLUDE_DIRS}" )
 MESSAGE( STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}" )


Audio: Fix the -lsndfile linking error happened on Mac

--- audio/cmake/FindSndFile.cmake
+++ audio/cmake/FindSndFile.cmake
@@ -12,11 +12,6 @@
 #  BSD license.
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
-
-if (SNDFILE_LIBRARIES AND SNDFILE_INCLUDE_DIRS)
-  # in cache already
-  set(SNDFILE_FOUND TRUE)
-else (SNDFILE_LIBRARIES AND SNDFILE_INCLUDE_DIRS)

   find_path(SNDFILE_INCLUDE_DIR
     NAMES
@@ -52,5 +47,3 @@

   # show the SNDFILE_INCLUDE_DIRS and SNDFILE_LIBRARIES variables only in the advanced view
   mark_as_advanced(SNDFILE_INCLUDE_DIRS SNDFILE_LIBRARIES)
-
-endif (SNDFILE_LIBRARIES AND SNDFILE_INCLUDE_DIRS)


cmake: avoid nested if

cmake: avoid nested if

--- src/cmake/common-settings.cmake
+++ src/cmake/common-settings.cmake
@@ -94,36 +94,27 @@
 	check_cxx_compiler_flag("-std=c++11"     YUNI_HAS_CPP11_SUPPORT)
 	check_cxx_compiler_flag("-std=c++0x"     YUNI_HAS_GCC_CPP0X_SUPPORT)
 	check_cxx_compiler_flag("-stdlib=libc++" YUNI_HAS_LIB_CPP11_SUPPORT) # clang, Apple gcc...
-
 	if (NOT APPLE)
 		if (YUNI_HAS_GNU14_SUPPORT)
 			set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=gnu++14")
 			set(YUNI_CPP_STD "-std=gnu++14" CACHE STRING "c++std" FORCE)
-		else()
-			if (YUNI_HAS_GNU11_SUPPORT)
-				set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=gnu++11")
-				set(YUNI_CPP_STD "-std=gnu++11" CACHE STRING "c++std" FORCE)
-			else()
-				if (YUNI_HAS_GCC_CPP0X_SUPPORT)
-					set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=c++0x")
-					set(YUNI_CPP_STD "-std=c++0x" CACHE STRING "c++std" FORCE)
-				endif()
-			endif()
+		elseif (YUNI_HAS_GNU11_SUPPORT)
+			set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=gnu++11")
+			set(YUNI_CPP_STD "-std=gnu++11" CACHE STRING "c++std" FORCE)
+		elseif (YUNI_HAS_GCC_CPP0X_SUPPORT)
+			set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=c++0x")
+			set(YUNI_CPP_STD "-std=c++0x" CACHE STRING "c++std" FORCE)
 		endif()
 	else()
 		if (YUNI_HAS_CPP14_SUPPORT)
 			set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=c++14")
 			set(YUNI_CPP_STD "-std=c++14" CACHE STRING "c++std" FORCE)
-		else()
-			if (YUNI_HAS_CPP11_SUPPORT)
-				set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=c++11")
-				set(YUNI_CPP_STD "-std=c++11" CACHE STRING "c++std" FORCE)
-			else()
-				if (YUNI_HAS_GCC_CPP0X_SUPPORT)
-					set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=c++0x")
-					set(YUNI_CPP_STD "-std=c++0x" CACHE STRING "c++std" FORCE)
-				endif()
-			endif()
+		elseif (YUNI_HAS_CPP11_SUPPORT)
+			set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=c++11")
+			set(YUNI_CPP_STD "-std=c++11" CACHE STRING "c++std" FORCE)
+		elseif (YUNI_HAS_GCC_CPP0X_SUPPORT)
+			set(YUNI_COMMON_CXX_OPTIONS  "${YUNI_COMMON_CXX_OPTIONS} -std=c++0x")
+			set(YUNI_CPP_STD "-std=c++0x" CACHE STRING "c++std" FORCE)
 		endif()
 	endif()
 	if (YUNI_HAS_LIB_CPP11_SUPPORT AND (NOT CLANG OR APPLE))


iox-#433 Remove Trigger_test from asan blacklist

Signed-off-by: Mathias Kraus <ebc65708cf0163c1abebe72ba676749f82c5fe3e@apex.ai>

--- iceoryx_utils/cmake/IceoryxPlatform.cmake
+++ iceoryx_utils/cmake/IceoryxPlatform.cmake
@@ -59,7 +59,6 @@
         file(APPEND ${BLACKLIST_FILE_PATH} "# src:*file_name.cpp*\n")
         file(APPEND ${BLACKLIST_FILE_PATH} "# fun:*Test_Name*\n")
         file(APPEND ${BLACKLIST_FILE_PATH} "# End of file\n")
-        file(APPEND ${BLACKLIST_FILE_PATH} "fun:*Trigger_test*\n")
     endif()
 endfunction()


Removed extra returns

Removed extra returns

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

--- cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
+++ cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
@@ -36,15 +36,13 @@
 set(CMAKE_SYSTEM_VERSION 1)

 # specify the cross compiler
-find_program(C_COMPILER arm-linux-gnueabihf-gcc
-	)
+find_program(C_COMPILER arm-linux-gnueabihf-gcc)
 if(NOT C_COMPILER)
 	message(FATAL_ERROR "could not find arm-linux-gnueabihf-gcc compiler")
 endif()
 cmake_force_c_compiler(${C_COMPILER} GNU)

-find_program(CXX_COMPILER arm-linux-gnueabihf-g++
-	)
+find_program(CXX_COMPILER arm-linux-gnueabihf-g++)
 if(NOT CXX_COMPILER)
 	message(FATAL_ERROR "could not find arm-linux-gnueabihf-g++ compiler")
 endif()
@@ -53,8 +51,7 @@
 # compiler tools
 foreach(tool objcopy nm ld)
 	string(TOUPPER ${tool} TOOL)
-	find_program(${TOOL} arm-linux-gnueabihf-${tool}
-		)
+	find_program(${TOOL} arm-linux-gnueabihf-${tool})
 	if(NOT ${TOOL})
 		message(FATAL_ERROR "could not find arm-linux-gnueabihf-${tool}")
 	endif()


Fix PCL build on windows

Fix PCL build on windows

Was needing static boost which is not built anymore.


add INTERFACE option to ament_target_dependencies() (#246)

Signed-off-by: Dirk Thomas <19795c8185177e940eedd30ceb2b716a54a3d5dc@users.noreply.github.com>

--- ament_cmake_target_dependencies/cmake/ament_target_dependencies.cmake
+++ ament_cmake_target_dependencies/cmake/ament_target_dependencies.cmake
@@ -25,9 +25,10 @@
 #
 # :param target: the target name
 # :type target: string
-# :param ARGN: a list of package names, which could start with PUBLIC keyword.
-#   If it starts with PUBLIC, this keyword is used in the target_link_libraries call.
-#   If not, the non-keyword target_link_libraries call is used.
+# :param ARGN: a list of package names, which can optionally start with an
+#   INTERFACE or PUBLIC keyword.
+#   If it starts with INTERFACE or PUBLIC, this keyword is used in the
+#   target_* calls.
 # :type ARGN: list of strings
 #
 # @public
@@ -37,13 +38,21 @@
     message(FATAL_ERROR "ament_target_dependencies() the first argument must be a valid target name")
   endif()
   if(${ARGC} GREATER 0)
-    cmake_parse_arguments(ARG "PUBLIC" "" "" ${ARGN})
-    set(TARGET_LINK_LIBRARIES_VISIBILITY)
+    cmake_parse_arguments(ARG "INTERFACE;PUBLIC" "" "" ${ARGN})
+    set(optional_keyword "")
+    set(required_keyword "PUBLIC")
+    if(ARG_INTERFACE)
+      if(NOT "${ARGV1}" STREQUAL "INTERFACE")
+        message(FATAL_ERROR "ament_target_dependencies() INTERFACE keyword is only allowed before the package names")
+      endif()
+      set(optional_keyword INTERFACE)
+      set(required_keyword INTERFACE)
+    endif()
     if(ARG_PUBLIC)
       if(NOT "${ARGV1}" STREQUAL "PUBLIC")
         message(FATAL_ERROR "ament_target_dependencies() PUBLIC keyword is only allowed before the package names")
       endif()
-      set(TARGET_LINK_LIBRARIES_VISIBILITY PUBLIC)
+      set(optional_keyword PUBLIC)
     endif()
     set(definitions "")
     set(include_dirs "")
@@ -68,15 +77,15 @@
       endif()
     endforeach()
     target_compile_definitions(${target}
-      PUBLIC ${definitions})
+      ${required_keyword} ${definitions})
     ament_include_directories_order(ordered_include_dirs ${include_dirs})
     target_link_libraries(${target}
-      ${TARGET_LINK_LIBRARIES_VISIBILITY} ${interfaces})
+      ${optional_keyword} ${interfaces})
     target_include_directories(${target}
-      PUBLIC ${ordered_include_dirs})
+      ${required_keyword} ${ordered_include_dirs})
     ament_libraries_deduplicate(unique_libraries ${libraries})
     target_link_libraries(${target}
-      ${TARGET_LINK_LIBRARIES_VISIBILITY} ${unique_libraries})
+      ${optional_keyword} ${unique_libraries})
     foreach(link_flag IN LISTS link_flags)
       set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS " ${link_flag} ")
     endforeach()


Allow 'c++_static' for ANDROID_STL in android cmake toolchain

--- toolchains/android.toolchain.cmake
+++ toolchains/android.toolchain.cmake
@@ -833,7 +833,7 @@
 mark_as_advanced( ANDROID_STL ANDROID_STL_FORCE_FEATURES )

 if( BUILD_WITH_ANDROID_NDK )
- if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared|c\\+\\+_shared)$")
+ if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared|c\\+\\+_shared|c\\+\\+_static)$")
   message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\".
 The possible values are:
   none           -> Do not configure the runtime.
@@ -1028,12 +1028,12 @@
   else()
    set( __libstl                "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libstdc++.a" )
   endif()
- elseif( ANDROID_STL MATCHES "c\\+\\+_shared" )
+ elseif( ANDROID_STL MATCHES "c\\+\\+" )
     set( ANDROID_EXCEPTIONS       ON )
     set( ANDROID_RTTI             ON )
     set( ANDROID_CXX_ROOT     "${ANDROID_NDK}/sources/cxx-stl/" )
     set( ANDROID_LLVM_ROOT    "${ANDROID_CXX_ROOT}/llvm-libc++" )
-    if( X86 )
+    if( X86 )
         set( ANDROID_ABI_INCLUDE_DIRS "${ANDROID_CXX_ROOT}/gabi++/include" )
     else()
         set( ANDROID_ABI_INCLUDE_DIRS "${ANDROID_CXX_ROOT}/llvm-libc++abi/include" )
@@ -1041,10 +1041,10 @@
     set( ANDROID_STL_INCLUDE_DIRS     "${ANDROID_LLVM_ROOT}/libcxx/include" "${ANDROID_ABI_INCLUDE_DIRS}" )
     # android support sfiles
     include_directories ( SYSTEM ${ANDROID_NDK}/sources/android/support/include )
-    if( EXISTS "${ANDROID_LLVM_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/libc++_shared.so" )
-        set( __libstl "${ANDROID_LLVM_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/libc++_shared.so" )
+    if( EXISTS "${ANDROID_LLVM_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/libc++_static.a" )
+        set( __libstl "${ANDROID_LLVM_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/libc++_static.a" )
     else()
-        message( "c++ shared library doesn't exist" )
+        message( "libc++ doesn't exist" )
     endif()
  else()
   message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" )


mistral: Support the new routes-to-bin intermediate tool generation

--- mistral/family.cmake
+++ mistral/family.cmake
@@ -1,6 +1,7 @@
 set(MISTRAL_ROOT "" CACHE STRING "Mistral install path")
 set(MISTRAL_DONT_INSTALL ON)

+add_subdirectory(${MISTRAL_ROOT}/routes-to-bin ${CMAKE_CURRENT_BINARY_DIR}/routes-to-bin)
 add_subdirectory(${MISTRAL_ROOT}/libmistral ${CMAKE_CURRENT_BINARY_DIR}/libmistral)

 find_package(LibLZMA REQUIRED)


Update PPA Host to aff3ct team.

Update PPA Host to aff3ct team.

--- cmake/Modules/UploadPPA.cmake
+++ cmake/Modules/UploadPPA.cmake
@@ -196,7 +196,9 @@
 	"\n\n%:\n"
 	"\tdh  $@ --buildsystem=cmake\n"
 	"\noverride_dh_auto_configure:\n"
-	"\tDESTDIR=\"$(CURDIR)/debian/${CPACK_DEBIAN_PACKAGE_NAME}\" dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPACKAGE_TGZ=OFF -DAFF3CT_OVERRIDE_VERSION=${GIT_VERSION} -DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS}'"
+	"\tDESTDIR=\"$(CURDIR)/debian/${CPACK_DEBIAN_PACKAGE_NAME}\" dh_auto_configure"
+  " -- -DCMAKE_BUILD_TYPE=Release -DAFF3CT_COMPILE_SHARED_LIB=ON -DPACKAGE_TGZ=OFF "
+  "-DAFF3CT_OVERRIDE_VERSION=${GIT_VERSION} -DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS}'"
 	"\n\noverride_dh_auto_install:\n"
 	"\tdh_auto_install --destdir=\"$(CURDIR)/debian/${CPACK_DEBIAN_PACKAGE_NAME}\" --buildsystem=cmake"
 	"\n\noverride_dh_strip:\n"
@@ -316,7 +318,7 @@
 # ##############################################################################
 # # dput ppa:your-lp-id/ppa <source.changes>

-set(DPUT_HOST "ppa:mathieu-leonardon/aff3ct")
+set(DPUT_HOST "ppa:aff3ct/aff3ct")

 add_custom_target(dput_${DISTRI} ALL
         COMMAND ${DPUT_EXECUTABLE} ${DPUT_HOST} ${DEB_SOURCE_CHANGES}


build: disable Poco::JWT build

build: disable Poco::JWT build

--- cmake/SetupDependencies.cmake
+++ cmake/SetupDependencies.cmake
@@ -50,6 +50,7 @@
         "ENABLE_JSON FALSE"
         "ENABLE_NETSSL_WIN FALSE"
         "ENABLE_CRYPTO TRUE"
+        "ENABLE_JWT FALSE"
         "ENABLE_DATA TRUE"
         "ENABLE_DATA_SQLITE TRUE"
         "ENABLE_DATA_MYSQL FALSE"


Add CONDA_PREFIX to NumPy search paths

Add CONDA_PREFIX to NumPy search paths

--- cmake_scripts/Findnumpy.cmake
+++ cmake_scripts/Findnumpy.cmake
@@ -5,6 +5,7 @@
     numpy/npy_common.h
     HINTS
         $ENV{VIRTUAL_ENV}/lib/*/site-packages/numpy/core/include
+        $ENV{CONDA_PREFIX}/lib/*/site-packages/numpy/core/include
         ENV PYTHON_INCLUDE_DIR
         /usr/local/lib/python2.7/dist-packages/numpy/core/include
         $ENV{PYTHON}/lib/site-packages/numpy/core/include


updated models hash

updated models hash


switch dashboard

switch dashboard

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


refs #5940 bump version of jemalloc whose warnings we can ignore

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

--- CTestCustom.cmake
+++ CTestCustom.cmake
@@ -233,7 +233,7 @@
   # don't complain about clang missing warnings from xz code
   "clang: warning: unknown warning option"
   # don't complain about warnings in jemalloc source
-  "jemalloc-3.2.0/src"
+  "jemalloc-3.3.0/src"
   "jemalloc/internal"
   # don't complain about ranlib or libtool on empty archive
   "has no symbols"


GCC gives even more noise to suppress

GCC gives even more noise to suppress

--- CTestCustom.cmake
+++ CTestCustom.cmake
@@ -1,4 +1,5 @@
 set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "expandandmerge.cpp:(41|64|76): warning: .+c.+ (is|may be) used uninitialized in this function")
-set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "gather.cpp:(39|40): warning: .+(ii|castedMask).+ (is|may be) used uninitialized in this function")
+set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "gather.cpp:(39|40|42|44): warning: .+(a|b|ii|castedMask).+ (is|may be) used uninitialized in this function")
 set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "load.cpp:(65|90): warning: .+b.+ (is|may be) used uninitialized in this function")
+set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "used uninitialized in this function")
 set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "warning is a GCC extension")


simplify use script: remove NODE_INCLUDE_DIR

issue https://github.com/smanders/externpro/issues/273

--- projects/use/usexp-node-config.cmake
+++ projects/use/usexp-node-config.cmake
@@ -1,6 +1,5 @@
 # NODE_FOUND - Node.js was found
 # NODE_VER - Node.js version
-# NODE_INCLUDE_DIR - the Node.js include directory
 # NODE_LIBRARIES - the Node.js libraries (MSW-only)
 # NODE_EXE - the Node.js executable
 set(prj node)
@@ -18,10 +17,7 @@
   set(ver @NODE_OLDVER@)
 endif()
 set(${PRJ}_VER "${ver} [@PROJECT_NAME@]")
-unset(${PRJ}_INCLUDE_DIR CACHE)
-find_path(${PRJ}_INCLUDE_DIR node/node.h PATHS ${XP_ROOTDIR}/include/node_${ver} NO_DEFAULT_PATH)
-list(APPEND ${PRJ}_INCLUDE_DIR ${XP_ROOTDIR}/include/node_${ver}/node) # for internal header includes
-set(reqVars ${PRJ}_VER ${PRJ}_INCLUDE_DIR)
+set(reqVars ${PRJ}_VER)
 if(MSVC)
   set(${PRJ}_LIBRARIES ${XP_ROOTDIR}/node_${ver}/lib/node.lib)
   list(APPEND reqVars ${PRJ}_LIBRARIES)
@@ -38,11 +34,10 @@
     add_library(xpro::node INTERFACE IMPORTED)
   endif()
 endif()
-if(${PRJ}_INCLUDE_DIR)
-  set_target_properties(xpro::node PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${${PRJ}_INCLUDE_DIR}"
-    )
-endif()
+set(includeDirs ${XP_ROOTDIR}/include/node_${ver} ${XP_ROOTDIR}/include/node_${ver}/node)
+set_target_properties(xpro::node PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${includeDirs}"
+  )
 set(${PRJ}_EXE ${XP_ROOTDIR}/node_${ver}/bin/node${CMAKE_EXECUTABLE_SUFFIX})
 list(APPEND reqVars ${PRJ}_EXE)
 include(FindPackageHandleStandardArgs)


BUG: By disabling ImageViewer superbuild, its build directory moved.

--- CMake/Superbuild/External_ImageViewer.cmake
+++ CMake/Superbuild/External_ImageViewer.cmake
@@ -84,4 +84,4 @@
   TubeTKMacroEmptyExternalProject( ${proj} "${${proj}_DEPENDENCIES}" )

 endif( NOT DEFINED ${proj}_DIR )
-list( APPEND TubeTK_EXTERNAL_PROJECTS_ARGS -D${proj}_DIR:PATH=${${proj}_DIR}/${proj}-build )
+list( APPEND TubeTK_EXTERNAL_PROJECTS_ARGS -D${proj}_DIR:PATH=${${proj}_DIR} )


Glob Unix binaries with lib prefix

Glob Unix binaries with lib prefix

--- CMakeExternals/Boost-install_manifest.cmake
+++ CMakeExternals/Boost-install_manifest.cmake
@@ -1,6 +1,6 @@
 message(STATUS "Creating install manifest")

-file(GLOB installed_binaries "lib/boost_*.*" "bin/boost_*.*")
+file(GLOB installed_binaries "lib/boost_*.*" "lib/libboost_*.*" "bin/boost_*.*")
 file(GLOB_RECURSE installed_headers "include/boost/*")

 set(install_manifest "src/Boost-build/install_manifest.txt")


Start switching GLStats to PackageConfig

--- FindGLStats.cmake
+++ FindGLStats.cmake
@@ -1,86 +0,0 @@
-#
-# Copyright 2011-2012 Stefan Eilemann <eile@eyescale.ch>
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions are met:
-#
-#  - Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-#  - Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  - Neither the name of Eyescale Software GmbH nor the names of its
-#    contributors may be used to endorse or promote products derived from this
-#    software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-#  POSSIBILITY OF SUCH DAMAGE.
-#
-#==================================
-#
-# Find GLStats. This module searches for the GLStats library
-#    See http://www.equalizergraphics.com/GLStats
-#
-#
-#==================================
-#
-# The following environment variables are respected for finding GLStats.
-# CMAKE_PREFIX_PATH can also be used for this (see find_library() CMake
-# documentation).
-#
-#    GLSTATS_ROOT
-#
-# This module defines the following output variables:
-#
-#    GLSTATS_FOUND - Was GLStats and all of the specified components found?
-#
-#    GLSTATS_VERSION - The version of GLStats which was found
-#
-#    GLSTATS_INCLUDE_DIRS - Where to find the headers
-#
-#    GLSTATS_LIBRARIES - The GLStats libraries
-#
-#    GLSTATS_COMPONENTS - A list of components found
-#
-#    GLSTATS_DEB_DEPENDENCIES - A list of dependencies for the CPack deb generator
-#
-# Components may be: core, cgl, glx, wgl, dns_sd
-#   For each component, the following variables are set. In addition, the
-#   relevent libraries are added to GLSTATS_LIBRARIES. The core component is
-#   implicit and always searched.
-#
-#   GLSTATS_${COMPONENT}_FOUND - Was the component found?
-#   GLSTATS_${COMPONENT}_LIBRARY - The component librarys
-#
-#==================================
-# Example Usage:
-#
-#  find_package(GLSTATS 1.0.0 dns_sd REQUIRED)
-#  include_directories(${GLSTATS_INCLUDE_DIRS})
-#
-#  add_executable(foo foo.cc)
-#  target_link_libraries(foo ${GLSTATS_LIBRARIES})
-#
-#==================================
-# Naming convention:
-#  Local variables of the form _glstats_foo
-#  Input variables of the form GLSTATS_FOO
-#  Output variables of the form GLSTATS_FOO
-#
-
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/FindGLStats)
-include(FindLibraryPackage)
-include(FindPackageHandleStandardArgs)
-
-find_library_package(GLStats)
-find_package_handle_standard_args(GLStats DEFAULT_MSG
-                                  GLSTATS_LIBRARIES GLSTATS_INCLUDE_DIRS)


CI: add trace (debug)

CI: add trace (debug)

--- CI/prepare_superbuild.cmake
+++ CI/prepare_superbuild.cmake
@@ -362,6 +362,9 @@

 # MacOS cleanup
 if(APPLE)
+  message("MacOS cleanup")
   file(REMOVE_RECURSE CTEST_INSTALL_DIRECTORY)
   file(REMOVE_RECURSE CI_PROJ_DIR)
-endif()
+else
+  message("not apple")
+endif()


BUG: BuildSystem: Remove duplicated else in ctkMacroSetupQt.cmake

Fixes #715

Suggested-by: Samuel John <64b2b6d12bfe4baae7dad3d018f8cbf6b0e7a044@samueljohn.de>

--- CMake/ctkMacroSetupQt.cmake
+++ CMake/ctkMacroSetupQt.cmake
@@ -72,9 +72,6 @@
     else()
       message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
     endif()
-
-  else()
-    message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
   endif()

   mark_as_superbuild(CTK_QT_VERSION)


Also include WRAP_SPECIAL classes in the exported classes.

The WRAP_SPECIAL classes might be useful to external wrapper
generators, so include them in the CLASSES list.  This change
is compatible with the current ParaView master.

Change-Id: I484a6a23ca37044354ca445f3a598b36eae8172a

--- CMake/vtkModuleMacros.cmake
+++ CMake/vtkModuleMacros.cmake
@@ -199,18 +199,23 @@
         get_source_file_property(_abstract ${src} ABSTRACT)
         get_source_file_property(_wrap_special ${src} WRAP_SPECIAL)

-        if(NOT _wrap_exclude)
+        if(_wrap_special OR NOT _wrap_exclude)
           list(APPEND vtk-module-CLASSES ${_cls})
-        endif()
-
-        if(_abstract)
-          set(vtk-module-ABSTRACT
-            "${vtk-module-ABSTRACT}set(${vtk-module}_CLASS_${_cls}_ABSTRACT 1)\n")
-        endif()
-
-        if(_wrap_special)
-          set(vtk-module-WRAP_SPECIAL
-            "${vtk-module-WRAP_SPECIAL}set(${vtk-module}_CLASS_${_cls}_WRAP_SPECIAL 1)\n")
+
+          if(_abstract)
+            set(vtk-module-ABSTRACT
+              "${vtk-module-ABSTRACT}set(${vtk-module}_CLASS_${_cls}_ABSTRACT 1)\n")
+          endif()
+
+          if(_wrap_exclude)
+            set(vtk-module-WRAP_EXCLUDE
+              "${vtk-module-WRAP_EXCLUDE}set(${vtk-module}_CLASS_${_cls}_WRAP_EXCLUDE 1)\n")
+          endif()
+
+          if(_wrap_special)
+            set(vtk-module-WRAP_SPECIAL
+              "${vtk-module-WRAP_SPECIAL}set(${vtk-module}_CLASS_${_cls}_WRAP_SPECIAL 1)\n")
+          endif()
         endif()
       endif()
     endif()


OptiX: always seem to need --cuda-path flag, even for cuda 9 (#979)

--- src/cmake/externalpackages.cmake
+++ src/cmake/externalpackages.cmake
@@ -240,16 +240,7 @@
         message (FATAL_ERROR "CUDA ${CUDA_VERSION} requires LLVM 6.0 or greater")
     endif ()

-    # TODO: When compiling for CUDA 9.0+ using clang, specifying the CUDA
-    #       path can result in multiply-defined symbol errors; for CUDA 8.0,
-    #       not defining it results in undefined symbols. It would be better
-    #       if there were a more robust and unified way to handle this, but
-    #       this will have to do for now.
-    if (${CUDA_VERSION_MAJOR} GREATER 8)
-        set (CUDA_LIB_FLAGS "")
-    else ()
-        set (CUDA_LIB_FLAGS "--cuda-path=${CUDA_TOOLKIT_ROOT_DIR}")
-    endif ()
+    set (CUDA_LIB_FLAGS "--cuda-path=${CUDA_TOOLKIT_ROOT_DIR}")
 endif ()

 # end CUDA setup


SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -47,8 +47,8 @@
 Comment[ar]=ابدأ محادثة بأيّ من متراسلي ت‌م أو غيّر حالة ت‌م
 Comment[ast]=Anicia una charra con cualesquiera de los tos contautos de MI o camuda'l to estáu
 Comment[bs]=Pokrenite ćaskanje s bilo kojim od vaših IM kontakta ili promijenite svoj IM status
-Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI
-Comment[ca@valencia]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI
+Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat a la MI
+Comment[ca@valencia]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat a la MI
 Comment[cs]=Začít rozhovor s kterýmkoliv vaším kontaktem v IM nebo změnit stav na IM
 Comment[da]=Start chat med en af dine IM-kontakter eller skift din IM-status
 Comment[de]=Chats mit ihren Kontakten starten oder Ihren IM-Status ändern


Fixed typo in config options for android.

--- cmake/ConfigOptionsAndroid.cmake
+++ cmake/ConfigOptionsAndroid.cmake
@@ -16,7 +16,7 @@
 # limitations under the License.

 set(JAVA_DEBUG_DEFAULT "off")
-if("${CMAKE_BUILD_TYPE STREQUAL "Debug")
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 	set(JAVA_DEBUG_DEFAULT "on")
 endif()


- Probably fixed unit tests for iOS builds, untested!

--- cmake/Modules/BuildTesting.cmake
+++ cmake/Modules/BuildTesting.cmake
@@ -35,7 +35,7 @@
             DESTINATION
             bin
             )
-    elseif(ANDROID)
+    elseif(ANDROID OR IOS)
         coffee_add_application_longerer(
             ${TARGET}
             ${TITLE} "me.birchtrees" 1
@@ -72,6 +72,7 @@
     if(IOS) # Crosscompiling setup, until we find an elegant solution
         message ( "Skipping unit test: ${TITLE}" )
         message ( "Please run the tests somehow!" )
+        return()
     elseif(EMSCRIPTEN)
         add_test (
             NAME ${TITLE}


CMake: remove debugging code from LibAddPlugin.cmake

--- cmake/Modules/LibAddPlugin.cmake
+++ cmake/Modules/LibAddPlugin.cmake
@@ -185,7 +185,6 @@
 		endif (ARG_CPP)

 		set_additional_compile_definitions (${testname})
-		message (STATUS "DEBUG ${PLUGIN_NAME} (${PLUGIN_SHORT_NAME}) [${testname}] = ${ADDITIONAL_COMPILE_DEFINITIONS}")

 		target_link_libraries (${testexename} ${ARG_LINK_LIBRARIES} ${ARG_TEST_LINK_LIBRARIES})
 		set_target_properties (${testexename}


Prefer --profiling over -profiling for emscripten.

--- cmake/emscripten.toolchain.cmake
+++ cmake/emscripten.toolchain.cmake
@@ -123,25 +123,25 @@
 set(CMAKE_CXX_FLAGS "${ORYOL_PLATFORM_DEFINES} ${EMSCRIPTEN_CONFIG_OPTIONS} -std=c++11 -stdlib=libc++ ${ORYOL_EMSC_EXCEPTION_FLAGS} -fstrict-aliasing -Wall -Wno-warn-absolute-paths -Wno-multichar -Wextra -Wno-unused-parameter -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-long-long -Wno-overloaded-virtual -Wno-deprecated-writable-strings -Wno-unused-volatile-lvalue")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "-O3 -g -D_DEBUG_ -D_DEBUG -DORYOL_DEBUG=1")
-set(CMAKE_CXX_FLAGS_PROFILING "-O3 -profiling")
+set(CMAKE_CXX_FLAGS_PROFILING "-O3 --profiling")

 # c compiler flags
 set(CMAKE_C_FLAGS "${ORYOL_PLATFORM_DEFINES} ${EMSCRIPTEN_CONFIG_OPTIONS} -fstrict-aliasing -Wall -Wno-warn-absolute-paths -Wextra -Wno-multichar -Wno-unused-parameter -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-long-long -Wno-overloaded-virtual -Wno-deprecated-writable-strings -Wno-unused-volatile-lvalue")
 set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
 set(CMAKE_C_FLAGS_DEBUG "-O3 -g -D_DEBUG_ -D_DEBUG -DORYOL_DEBUG=1")
-set(CMAKE_C_FLAGS_PROFILING "-O3 -profiling")
+set(CMAKE_C_FLAGS_PROFILING "-O3 --profiling")

 # linker flags
 set(CMAKE_EXE_LINKER_FLAGS "${EMSCRIPTEN_CONFIG_OPTIONS} --memory-init-file ${EMSCRIPTEN_USE_MEMORY_INIT_FILE} -s WARN_ON_UNDEFINED_SYMBOLS=1 -s TOTAL_MEMORY=${EMSCRIPTEN_TOTAL_MEMORY} -s DISABLE_EXCEPTION_CATCHING=${EMSCRIPTEN_DISABLE_EXCEPTION_CATCHING} -s NO_FILESYSTEM=${EMSCRIPTEN_NO_FILESYSTEM}")
 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT} --closure ${EMSCRIPTEN_USE_CLOSURE}")
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-O3 -g -s ASM_JS=1 -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE}")
-set(CMAKE_EXE_LINKER_FLAGS_PROFILING "-profiling -O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT}")
+set(CMAKE_EXE_LINKER_FLAGS_PROFILING "--profiling -O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT}")

 # dynamic lib linker flags
 set(CMAKE_SHARED_LINKER_FLAGS "-shared ${EMSCRIPTEN_CONFIG_OPTIONS} --memory-init-file 0 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s TOTAL_MEMORY=${EMSCRIPTEN_TOTAL_MEMORY_WORKER} -s BUILD_AS_WORKER=1 -s EXPORTED_FUNCTIONS=[\\\"_dowork\\\"] -s DISABLE_EXCEPTION_CATCHING=${EMSCRIPTEN_DISABLE_EXCEPTION_CATCHING} -s NO_FILESYSTEM=${EMSCRIPTEN_NO_FILESYSTEM}")
 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "-O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT} --closure ${EMSCRIPTEN_USE_CLOSURE}")
 set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-O3 -g -s ASM_JS=1 -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} --closure 0")
-set(CMAKE_SHARED_LINKER_FLAGS_PROFILING "-profiling -O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT}")
+set(CMAKE_SHARED_LINKER_FLAGS_PROFILING "--profiling -O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT}")

 # update cache variables for cmake gui
 set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Config Type" FORCE)


[cmake] Pass TARGETS_TO_BUILD through to host tools build

In r319620, the host build was changed to use Native for
TARGETS_TO_BUILD because passing semicolons through add_custom_command
is surprisingly difficult. However, Native really doesn't make any
sense here, and it only works because we don't technically do any
codegen in the host tools so pretty well anything will "work".

The problem here is that passing something other than the correct
value is very fragile - as evidence note how the llvm-config in the
host tools acts differently than the target one now, and misreports
the targets to build. Similarly, if there is any logic conditional on
the targets in tablegen (now or in the future), it will do the wrong
thing.

To fix this, we need to escape the semicolons in the targets string
and pass it through to the child cmake invocation.

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

--- cmake/modules/CrossCompile.cmake
+++ cmake/modules/CrossCompile.cmake
@@ -36,11 +36,16 @@
   add_custom_target(CREATE_LLVM_${target_name}
                     DEPENDS ${LLVM_${target_name}_BUILD})

+  # Escape semicolons in the targets list so that cmake doesn't expand
+  # them to spaces.
+  string(REPLACE ";" "$<SEMICOLON>" targets_to_build_arg
+         "${LLVM_TARGETS_TO_BUILD}")
+
   add_custom_command(OUTPUT ${LLVM_${target_name}_BUILD}/CMakeCache.txt
     COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
         ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR}
         -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE
-        -DLLVM_TARGETS_TO_BUILD=Native
+        -DLLVM_TARGETS_TO_BUILD="${targets_to_build_arg}"
         ${build_type_flags} ${linker_flag} ${external_clang_dir}
     WORKING_DIRECTORY ${LLVM_${target_name}_BUILD}
     DEPENDS CREATE_LLVM_${target_name}


glog: BUILD_TESTING=OFF

glog: BUILD_TESTING=OFF

--- cmake/projects/glog/hunter.cmake
+++ cmake/projects/glog/hunter.cmake
@@ -54,7 +54,7 @@
 )

 # explicitly remove dependency on gflags (only needed for tests)
-hunter_cmake_args(glog CMAKE_ARGS WITH_GFLAGS=OFF)
+hunter_cmake_args(glog CMAKE_ARGS WITH_GFLAGS=OFF BUILD_TESTING=OFF)

 hunter_pick_scheme(DEFAULT url_sha1_cmake)
 hunter_cacheable(glog)


fix openmp compile flags

fix openmp compile flags

--- cmake/vSMCExampleFunctions.cmake
+++ cmake/vSMCExampleFunctions.cmake
@@ -69,10 +69,10 @@
             TARGET_LINK_LIBRARIES (${exe} ${TBB_LINK_LIBRARIES})
         ENDIF (${arg} STREQUAL "TBB" AND TBB_FOUND)

-        IF (${arg} STREQUAL "OMP" AND VSMC_OPENMP_FOUND)
+        IF (${arg} STREQUAL "OMP" AND OPENMP_FOUND)
             SET (compile_flags "${compile_flags} ${OpenMP_CXX_FLAGS}")
             TARGET_LINK_LIBRARIES (${exe} ${OpenMP_LINK_LIBRARIES})
-        ENDIF (${arg} STREQUAL "OMP" AND VSMC_OPENMP_FOUND)
+        ENDIF (${arg} STREQUAL "OMP" AND OPENMP_FOUND)
     ENDFOREACH (arg ${ARGN})

     IF (compile_flags)


Store C++11 compiler flags in a cmake variable.

This allows us to extract them elsewhere in the build, so we
can make sure they get set before we run compiler checks (e.g.
CheckCXXSourceCompiles ignores flags set with set_definitions()
so we need to set them explicitly).

--- cmake_modules/IMPFindC++11.cmake
+++ cmake_modules/IMPFindC++11.cmake
@@ -8,16 +8,20 @@
   string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
 endif()

+# Put flags in a cmake variable so we can set them before running compiler
+# checks (elsewhere in the build)
+set(IMP_CXX11_FLAGS "" CACHE INTERNAL "Flags to enable C++11 support" FORCE)
+
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
 execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE
 		        GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 message(STATUS "GCC version: ${GCC_VERSION}")
 if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
 message(STATUS "Enabling g++ C++11 support")
-add_definitions("--std=c++11")
+set(IMP_CXX11_FLAGS "--std=c++11" CACHE INTERNAL "" FORCE)
 elseif (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
 message(STATUS "Enabling g++ C++0x support")
-add_definitions("--std=c++0x")
+set(IMP_CXX11_FLAGS "--std=c++0x" CACHE INTERNAL "" FORCE)
 endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   # c++11's std::move (which boost/CGAL use) doesn't work until
@@ -28,11 +32,15 @@
     message(STATUS "Disabling C++11 due to clang and older boost")
   else()
     message(STATUS "Enabling clang C++11 support")
-    add_definitions("--std=c++11")
+    set(IMP_CXX11_FLAGS "--std=c++11" CACHE INTERNAL "" FORCE)
   else()

   endif()
 else()
   message(STATUS "Unknown compiler, not sure what to do about C++11")
 endif()
-endif()+endif()
+
+if(DEFINED ${IMP_CXX11_FLAGS})
+  add_definitions(${IMP_CXX11_FLAGS})
+endif()


Updating subproject files

Updating subproject files

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -1,6 +1,6 @@
 # CTest/CDash configuration

-SET(CTEST_PROJECT_SUBPROJECTS libnetcdf ncgen ncdump nccopy)
+SET(CTEST_PROJECT_SUBPROJECTS netcdf ncgen ncdump nccopy)

 IF(USE_REMOTE_CDASH)
 	set(CTEST_PROJECT_NAME "NetCDF-C")


Fixed install path of dependency binaries in CMake script

--HG--
branch : v1-8
extra : source : 3747cf56206a447ab6b989b4e5e50b3304084a3b

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -22,30 +22,30 @@
 option(OGRE_COPY_DEPENDENCIES "Copy dependency libs to the build directory" TRUE)

 macro(install_debug INPUT)
-  if (EXISTS ${OGRE_DEP_DIR}/lib/debug/${INPUT})
-    if (IS_DIRECTORY ${OGRE_DEP_DIR}/lib/debug/${INPUT})
-      install(DIRECTORY ${OGRE_DEP_DIR}/lib/debug/${INPUT} DESTINATION lib/debug CONFIGURATIONS Debug)
+  if (EXISTS ${OGRE_DEP_DIR}/bin/debug/${INPUT})
+    if (IS_DIRECTORY ${OGRE_DEP_DIR}/bin/debug/${INPUT})
+      install(DIRECTORY ${OGRE_DEP_DIR}/bin/debug/${INPUT} DESTINATION lib/debug CONFIGURATIONS Debug)
     else ()
-      install(FILES ${OGRE_DEP_DIR}/lib/debug/${INPUT} DESTINATION lib/debug CONFIGURATIONS Debug)
+      install(FILES ${OGRE_DEP_DIR}/bin/debug/${INPUT} DESTINATION lib/debug CONFIGURATIONS Debug)
     endif ()
   else()
-    message(send_error "${OGRE_DEP_DIR}/lib/debug/${INPUT} did not exist, can't install!")
+    message(send_error "${OGRE_DEP_DIR}/bin/debug/${INPUT} did not exist, can't install!")
   endif ()
 endmacro()

 macro(install_release INPUT)
-  if (EXISTS ${OGRE_DEP_DIR}/lib/release/${INPUT})
-    if (IS_DIRECTORY ${OGRE_DEP_DIR}/lib/release/${INPUT})
-      install(DIRECTORY ${OGRE_DEP_DIR}/lib/release/${INPUT} DESTINATION lib/release CONFIGURATIONS Release None "")
-      install(DIRECTORY ${OGRE_DEP_DIR}/lib/release/${INPUT} DESTINATION lib/relwithdebinfo CONFIGURATIONS RelWithDebInfo)
-      install(DIRECTORY ${OGRE_DEP_DIR}/lib/release/${INPUT} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
+  if (EXISTS ${OGRE_DEP_DIR}/bin/release/${INPUT})
+    if (IS_DIRECTORY ${OGRE_DEP_DIR}/bin/release/${INPUT})
+      install(DIRECTORY ${OGRE_DEP_DIR}/bin/release/${INPUT} DESTINATION lib/release CONFIGURATIONS Release None "")
+      install(DIRECTORY ${OGRE_DEP_DIR}/bin/release/${INPUT} DESTINATION lib/relwithdebinfo CONFIGURATIONS RelWithDebInfo)
+      install(DIRECTORY ${OGRE_DEP_DIR}/bin/release/${INPUT} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
     else ()
-      install(FILES ${OGRE_DEP_DIR}/lib/release/${INPUT} DESTINATION lib/release CONFIGURATIONS Release None "")
-      install(FILES ${OGRE_DEP_DIR}/lib/release/${INPUT} DESTINATION lib/relwithdebinfo CONFIGURATIONS RelWithDebInfo)
-      install(FILES ${OGRE_DEP_DIR}/lib/release/${INPUT} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
+      install(FILES ${OGRE_DEP_DIR}/bin/release/${INPUT} DESTINATION lib/release CONFIGURATIONS Release None "")
+      install(FILES ${OGRE_DEP_DIR}/bin/release/${INPUT} DESTINATION lib/relwithdebinfo CONFIGURATIONS RelWithDebInfo)
+      install(FILES ${OGRE_DEP_DIR}/bin/release/${INPUT} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
     endif ()
   else()
-    message(send_error "${OGRE_DEP_DIR}/lib/release/${INPUT} did not exist, can't install!")
+    message(send_error "${OGRE_DEP_DIR}/bin/release/${INPUT} did not exist, can't install!")
   endif ()
 endmacro()


Slight improvement of distortosSet...Configuration() comments

--- cmake/distortos-utilities.cmake
+++ cmake/distortos-utilities.cmake
@@ -112,7 +112,7 @@
 endfunction()

 #
-# Implementation of `distortosSetConfiguration(BOOLEAN ...`. Do not use directly.
+# Implementation of `distortosSetConfiguration(BOOLEAN ...)`. Do not use directly.
 #

 function(distortosSetBooleanConfiguration name help)
@@ -150,7 +150,7 @@
 endfunction()

 #
-# Implementation of `distortosSetConfiguration(INTEGER ...`. Do not use directly.
+# Implementation of `distortosSetConfiguration(INTEGER ...)`. Do not use directly.
 #

 function(distortosSetIntegerConfiguration name help)
@@ -205,7 +205,7 @@
 endfunction()

 #
-# Implementation of `distortosSetConfiguration(STRING ...`. Do not use directly.
+# Implementation of `distortosSetConfiguration(STRING ...)`. Do not use directly.
 #

 function(distortosSetStringConfiguration name help)


Invoke the line directive tool from python

--- cmake/modules/SwiftSource.cmake
+++ cmake/modules/SwiftSource.cmake
@@ -454,7 +454,7 @@
   add_custom_command_target(
       dependency_target
       COMMAND
-        "${line_directive_tool}" "${source_files}" --
+        "${PYTHON_EXECUTABLE}" "${line_directive_tool}" "${source_files}" --
         "${swift_compiler_tool}" "${main_command}" ${swift_flags}
         ${output_option} ${embed_bitcode_option} "${source_files}"
       ${command_touch_standard_outputs}
@@ -485,7 +485,7 @@
     add_custom_command_target(
         module_dependency_target
         COMMAND
-          "${line_directive_tool}" "${source_files}" --
+          "${PYTHON_EXECUTABLE}" "${line_directive_tool}" "${source_files}" --
           "${swift_compiler_tool}" "-emit-module" "-o" "${module_file}" ${swift_flags}
           "${source_files}"
         ${command_touch_module_outputs}
@@ -502,7 +502,7 @@
     add_custom_command_target(
         sib_dependency_target
         COMMAND
-          "${line_directive_tool}" "${source_files}" --
+          "${PYTHON_EXECUTABLE}" "${line_directive_tool}" "${source_files}" --
           "${swift_compiler_tool}" "-emit-sib" "-o" "${sib_file}" ${swift_flags} -Onone
           "${source_files}"
         ${command_touch_sib_outputs}
@@ -518,7 +518,7 @@
     add_custom_command_target(
         sibopt_dependency_target
         COMMAND
-          "${line_directive_tool}" "${source_files}" --
+          "${PYTHON_EXECUTABLE}" "${line_directive_tool}" "${source_files}" --
           "${swift_compiler_tool}" "-emit-sib" "-o" "${sibopt_file}" ${swift_flags} -O
           "${source_files}"
         ${command_touch_sibopt_outputs}
@@ -535,7 +535,7 @@
     add_custom_command_target(
         sibgen_dependency_target
         COMMAND
-          "${line_directive_tool}" "${source_files}" --
+          "${PYTHON_EXECUTABLE}" "${line_directive_tool}" "${source_files}" --
           "${swift_compiler_tool}" "-emit-sibgen" "-o" "${sibgen_file}" ${swift_flags}
           "${source_files}"
         ${command_touch_sibgen_outputs}


adjust schism search paths

adjust schism search paths

--- cmake/modules/find_schism.cmake
+++ cmake/modules/find_schism.cmake
@@ -6,8 +6,8 @@
   ${GLOBAL_EXT_DIR}/include/schism
   ${SCHISM_INCLUDE_SEARCH_DIR}
   /opt/schism/current
-  ../../schism/include
-  ../../schism
+  ../schism/include
+  ../schism
 )

 SET(SCHISM_LIBRARY_SEARCH_DIRS
@@ -16,8 +16,8 @@
   ${SCHISM_LIBRARY_SEARCH_DIR}
   ../
   /opt/schism/current/lib/linux_x86
-  ../../schism/lib
-  ../../schism/lib/linux_x86
+  ../schism/lib
+  ../schism/lib/linux_x86
 )

 message(${GLOBAL_EXT_DIR})


Fix HTTP link

Fix HTTP link

[skip ci]

--- cmake/projects/x11/hunter.cmake
+++ cmake/projects/x11/hunter.cmake
@@ -8,7 +8,7 @@
 include(hunter_download)
 include(hunter_pick_scheme)

-# http://www.x.org/releases/X11R7.7/src/x11/
+# http://www.x.org/releases/X11R7.7/src/lib
 hunter_add_version(
     PACKAGE_NAME
     x11


Add CMake variable CMAKE_DL_LIBS to list for superbuild propagation

It has been reported that FreeBSD does not need libdl and is
incorrectly being used to link. This allows a user to set this
variable to override the CMake default.

Change-Id: I81f80140ed571101231e37aa14046cf8940fc0e1

--- SuperBuild/SuperBuild.cmake
+++ SuperBuild/SuperBuild.cmake
@@ -223,6 +223,7 @@

   CMAKE_PREFIX_PATH
   CMAKE_FRAMEWORK_PATH
+  CMAKE_DL_LIBS
   CMAKE_SYSTEM_PREFIX_PATH
   CMAKE_SYSTEM_INCLUDE_PATH
   CMAKE_SYSTEM_LIBRARY_PATH


FileWriter and factory integration

FileWriter and factory integration

--- Core/DataStructures/files.cmake
+++ Core/DataStructures/files.cmake
@@ -55,6 +55,7 @@
   mitkPicHelper.cpp
   mitkPixelType.cpp
   mitkPlaneGeometry.cpp
+  mitkPlaneOperation.cpp
   mitkPlaneLandmarkProjector.cpp
   mitkPointData.cpp
   mitkPointOperation.cpp


[Build] Fixed a check/test issue with CMake 2.6.

--- project_config_embeddable.cmake
+++ project_config_embeddable.cmake
@@ -977,7 +977,8 @@
     endforeach (_module_name)

     # Register all the module (CMake/CTest) test targets at once
-    add_custom_target (check DEPENDS ${_check_target_list})
+    add_custom_target (check)
+    add_dependencies (check ${_check_target_list})

     # Register, for reporting purpose, the list of modules to be tested
     set (PROJ_ALL_MOD_FOR_TST ${_test_suite_dir_list})


[t:4814] push nightly to one minute before midnight

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

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -5,7 +5,7 @@
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
 set(CTEST_PROJECT_NAME "tokudb")
-set(CTEST_NIGHTLY_START_TIME "23:30:00 EDT")
+set(CTEST_NIGHTLY_START_TIME "23:59:00 EDT")

 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "munchkin.leifwalsh.com")


Change continuous integration site back to the staging location.

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -13,5 +13,5 @@

 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "my.cdash.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=netcdf-c")
+set(CTEST_DROP_LOCATION "/submit.php?project=netcdf-staging")
 set(CTEST_DROP_SITE_CDASH TRUE)


removed ctestconfig

removed ctestconfig

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -1,13 +0,0 @@
-## This file should be placed in the root directory of your project.
-## Then modify the CMakeLists.txt file in the root directory of your
-## project to incorporate the testing dashboard.
-## # The following are required to uses Dart and the Cdash dashboard
-##   ENABLE_TESTING()
-##   INCLUDE(CTest)
-set(CTEST_PROJECT_NAME "ViennaData")
-set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
-
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "jwein2.iue.tuwien.ac.at:50000")
-set(CTEST_DROP_LOCATION "/CDash/submit.php?project=ViennaData")
-set(CTEST_DROP_SITE_CDASH TRUE)


disabling sponza CI testing

disabling sponza CI testing

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -2,4 +2,4 @@
 ## SPDX-License-Identifier: Apache-2.0

 set(CTEST_PROJECT_NAME "Embree")
-set(TEST_MODELS_HASH 2bb473d03af70f64a599077071d64fd13ace28e3)
+set(TEST_MODELS_HASH 27e887f955dc991b5b3369e663536792a2fc59c1)