CMake: add x86-64 feature levels

CMake: add x86-64 feature levels

Add x86-64 feature levels from https://gitlab.com/x86-psABIs/x86-64-ABI
See also https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels

Signed-off-by: Stephan Lachnit <02f37ba4c3a5bdeb31cf202876802e9c254d5236@debian.org>

--- cmake/OptimizeForArchitecture.cmake
+++ cmake/OptimizeForArchitecture.cmake
@@ -230,7 +230,7 @@
 \"haswell\", \"broadwell\", \"skylake\", \"skylake-xeon\", \"kaby-lake\", \"cannonlake\", \"icelake\", \"silvermont\", \
 \"goldmont\", \"knl\" (Knights Landing), \"atom\", \"k8\", \"k8-sse3\", \"barcelona\", \
 \"istanbul\", \"magny-cours\", \"bulldozer\", \"interlagos\", \"piledriver\", \
-\"AMD 14h\", \"AMD 16h\", \"zen\", \"zen3\".")
+\"AMD 14h\", \"AMD 16h\", \"zen\", \"zen3\", \"x86-64\", \"x86-64-v2\", \"x86-64-v3\", \"x86-64-v4\".")
    set(_force)
    if(NOT _last_target_arch STREQUAL "${TARGET_ARCHITECTURE}")
       message(STATUS "target changed from \"${_last_target_arch}\" to \"${TARGET_ARCHITECTURE}\"")
@@ -307,6 +307,25 @@
    macro(_goldmont)
       list(APPEND _march_flag_list "goldmont")
       _silvermont()
+   endmacro()
+   macro(_x86_64)
+      list(APPEND _march_flag_list "x86-64")
+      list(APPEND _march_flag_list "sse" "sse2")
+   endmacro()
+   macro(_x86_64_v2)
+      list(APPEND _march_flag_list "x86-64-v2")
+      _x86_64()
+      list(APPEND _march_flag_list "sse3" "sse4.1" "sse4.2" "ssse3")
+   endmacro()
+   macro(_x86_64_v3)
+      list(APPEND _march_flag_list "x86-64-v3")
+      _x86_64_v2()
+      list(APPEND _march_flag_list "avx" "avx2" "bmi" "bmi2" "f16c" "fma")
+   endmacro()
+   macro(_x86_64_v4)
+      list(APPEND _march_flag_list "x86-64-v4")
+      _x86_64_v3()
+      list(APPEND _march_flag_list "avx512f" "avx512bw" "avx512cd" "avx512dq" "avx512vl")
    endmacro()

    if(TARGET_ARCHITECTURE STREQUAL "core")
@@ -412,6 +431,14 @@
       list(APPEND _march_flag_list "barcelona")
       list(APPEND _march_flag_list "core2")
       list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "sse4a")
+   elseif(TARGET_ARCHITECTURE STREQUAL "x86-64")
+      _x86_64()
+   elseif(TARGET_ARCHITECTURE STREQUAL "x86-64-v2")
+      _x86_64_v2()
+   elseif(TARGET_ARCHITECTURE STREQUAL "x86-64-v3")
+      _x86_64_v3()
+   elseif(TARGET_ARCHITECTURE STREQUAL "x86-64-v4")
+      _x86_64_v4()
    elseif(TARGET_ARCHITECTURE STREQUAL "generic")
       list(APPEND _march_flag_list "generic")
    elseif(TARGET_ARCHITECTURE STREQUAL "none")


hunter_download: use 'hunter_find_licenses'

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -4,6 +4,7 @@
 include(CMakeParseArguments) # cmake_parse_arguments

 include(hunter_create_args_file)
+include(hunter_find_licenses)
 include(hunter_find_stamps)
 include(hunter_internal_error)
 include(hunter_jobs_number)
@@ -17,6 +18,7 @@
 include(hunter_test_string_not_empty)
 include(hunter_user_error)

+# Note: 'hunter_find_licenses' should be called before each return point
 function(hunter_download)
   set(one PACKAGE_NAME PACKAGE_COMPONENT PACKAGE_INTERNAL_DEPS_ID)
   set(multiple PACKAGE_DEPENDS_ON PACKAGE_UNRELOCATABLE_TEXT_FILES)
@@ -207,9 +209,7 @@
   endif()

   # license file variable
-  set(HUNTER_PACKAGE_LICENSE_FILE "${HUNTER_PACKAGE_INSTALL_PREFIX}/licenses/${HUNTER_PACKAGE_NAME}/LICENSE")
-  set(license_var "${HUNTER_PACKAGE_NAME}_LICENSE")
-  set(license_val "${HUNTER_INSTALL_PREFIX}/licenses/${HUNTER_PACKAGE_NAME}/LICENSE")
+  set(HUNTER_PACKAGE_LICENSE_DIR "${HUNTER_PACKAGE_INSTALL_PREFIX}/licenses/${HUNTER_PACKAGE_NAME}")

   set(${root_name} "${${root_name}}" PARENT_SCOPE)
   set(ENV{${root_name}} "${${root_name}}")
@@ -224,8 +224,6 @@
   string(REPLACE "-" "_" snake_case_root_name "${root_name}")
   set(${snake_case_root_name} "${${root_name}}" PARENT_SCOPE)
   set(ENV{${snake_case_root_name}} "${${root_name}}")
-
-  set(${license_var} ${license_val} PARENT_SCOPE)

   # temp toolchain file to set variables and include real toolchain
   set(HUNTER_DOWNLOAD_TOOLCHAIN "${HUNTER_PACKAGE_HOME_DIR}/toolchain.cmake")
@@ -258,6 +256,14 @@
     if(hunter_has_component)
       hunter_status_debug("Component: ${HUNTER_PACKAGE_COMPONENT}")
     endif()
+
+    # In:
+    # * HUNTER_INSTALL_PREFIX
+    # * HUNTER_PACKAGE_NAME
+    # Out:
+    # * ${HUNTER_PACKAGE_NAME}_LICENSES (parent scope)
+    hunter_find_licenses()
+
     return()
   endif()

@@ -279,6 +285,14 @@
     if(hunter_has_component)
       hunter_status_debug("Component: ${HUNTER_PACKAGE_COMPONENT}")
     endif()
+
+    # In:
+    # * HUNTER_INSTALL_PREFIX
+    # * HUNTER_PACKAGE_NAME
+    # Out:
+    # * ${HUNTER_PACKAGE_NAME}_LICENSES (parent scope)
+    hunter_find_licenses()
+
     return()
   endif()

@@ -293,6 +307,7 @@
   hunter_load_from_cache()

   if(HUNTER_CACHE_RUN)
+    # No need for licenses here (no 'hunter_find_licenses' call)
     return()
   endif()

@@ -301,6 +316,14 @@
     if(hunter_has_component)
       hunter_status_debug("Component: ${HUNTER_PACKAGE_COMPONENT}")
     endif()
+
+    # In:
+    # * HUNTER_INSTALL_PREFIX
+    # * HUNTER_PACKAGE_NAME
+    # Out:
+    # * ${HUNTER_PACKAGE_NAME}_LICENSES (parent scope)
+    hunter_find_licenses()
+
     return()
   endif()

@@ -551,4 +574,11 @@
   hunter_status_debug("Clean up done")

   file(WRITE "${HUNTER_PACKAGE_DONE_STAMP}" "")
+
+  # In:
+  # * HUNTER_INSTALL_PREFIX
+  # * HUNTER_PACKAGE_NAME
+  # Out:
+  # * ${HUNTER_PACKAGE_NAME}_LICENSES (parent scope)
+  hunter_find_licenses()
 endfunction()


qt: fix for cmake 2.8.9

qt: fix for cmake 2.8.9

Change-Id: I0541d1ceecd64c534ad2480250ec18e0b7bce487
Reviewed-on: http://gerrit.aldebaran.lan:8080/10819
Reviewed-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>
Tested-by: dmerejkowsky <1e4b13000fa8777df4cefd2fd8215187e3deb062@aldebaran-robotics.com>

--- cmake/qibuild/modules/qtutils.cmake
+++ cmake/qibuild/modules/qtutils.cmake
@@ -36,9 +36,13 @@
   flib(QT_${_suffix} OPTIMIZED NAMES "${_libame}" "${_libame}4"  PATH_SUFFIXES qt4)
   flib(QT_${_suffix} DEBUG     NAMES "${_libame}" "${_libame}d4" PATH_SUFFIXES qt4)

+  # we don't wand to find the headers in .Frameworks/Headers:
+  set(_back ${CMAKE_FIND_FRAMEWORK})
+  set(CMAKE_FIND_FRAMEWORK NEVER)
   #we want to be able to #include <QtLib>
   fpath(QT_${_suffix} ${_libame} PATH_SUFFIXES qt4 )

   #we want to be able to #include <QtLib/QtLib>
   fpath(QT_${_suffix} ${_libame} PATH_SUFFIXES ${_libame} qt4/${_libame})
+  set(CMAKE_FIND_FRAMEWORK ${_back})
 endfunction()


future.h is header-only

future.h is header-only

--- FindFuture.cmake
+++ FindFuture.cmake
@@ -1,4 +1,4 @@
-SET(_CPS_FUTURE_REQUIRED_VARS  CPS_FUTURE_INCLUDE_DIR CPS_FUTURE_LIBRARY )
+SET(_CPS_FUTURE_REQUIRED_VARS  CPS_FUTURE_INCLUDE_DIR)

 FIND_PATH(
 	CPS_FUTURE_INCLUDE_DIR
@@ -6,14 +6,7 @@
     HINTS ${CPS_FUTURE_DIR}/include
 )

-FIND_LIBRARY(
-	CPS_FUTURE_LIBRARY
-	NAMES cps-future
-    HINTS ${CPS_FUTURE_DIR}/lib
-)
-
 SET(CPS_FUTURE_PROCESS_INCLUDES CPS_FUTURE_INCLUDE_DIR)
-SET(CPS_FUTURE_PROCESS_LIBS CPS_FUTURE_LIBRARY)

 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(


Fix for TIFF (tentative).

Fix for TIFF (tentative).

--- VAD_TIFF.cmake
+++ VAD_TIFF.cmake
@@ -20,7 +20,7 @@
   endif()
   add_subdirectory("${VAD_EXTERNAL_ROOT}/TIFF" "${VAD_EXTERNAL_ROOT}/TIFF/build_external_dep")
   add_library(TIFF INTERFACE)
-  set_target_properties(TIFF PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${VAD_EXTERNAL_ROOT}/TIFF/libtiff")
+  set_target_properties(TIFF PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${VAD_EXTERNAL_ROOT}/TIFF/libtiff;${VAD_EXTERNAL_ROOT}/TIFF/build_external_dep/libtiff")
   target_link_libraries(TIFF INTERFACE tiff)
   # The TIFF live CMake auto-detects libraries such as ZLIB, LibLZMA and JPEG. If they are found, we will
   # add them to the TIFF interface.


Qt 5.10 OSX: Fix multimedia library name

--- cmake/Qt5Multimedia_QMultimediaDeclarativeModulePlugin.cmake
+++ cmake/Qt5Multimedia_QMultimediaDeclarativeModulePlugin.cmake
@@ -60,11 +60,19 @@
     )
   endif()

-  _qt_cmake_extra_helpers_add_interface_release_debug(
-      Qt5::QMultimediaDeclarativeModule
-      "${_qt_install_prefix}/lib/libQt5MultimediaQuick_p.a"
-      "${_qt_install_prefix}/lib/libQt5MultimediaQuick_p_debug.a"
-  )
+  if(Qt5Core_VERSION VERSION_LESS 5.10)
+    _qt_cmake_extra_helpers_add_interface_release_debug(
+        Qt5::QMultimediaDeclarativeModule
+        "${_qt_install_prefix}/lib/libQt5MultimediaQuick_p.a"
+        "${_qt_install_prefix}/lib/libQt5MultimediaQuick_p_debug.a"
+    )
+  else()
+    _qt_cmake_extra_helpers_add_interface_release_debug(
+        Qt5::QMultimediaDeclarativeModule
+        "${_qt_install_prefix}/lib/libQt5MultimediaQuick.a"
+        "${_qt_install_prefix}/lib/libQt5MultimediaQuick_debug.a"
+    )
+  endif()
 elseif(MSVC)
   add_library(Qt5::QMultimediaDeclarativeModule MODULE IMPORTED)


ENH: superbuild: add DYLD for OTB

ENH: superbuild: add DYLD for OTB

--- SuperBuild/CMake/External_otb.cmake
+++ SuperBuild/CMake/External_otb.cmake
@@ -123,6 +123,17 @@
     )
 endif()

+# issue with APPLE : the DYLD_LIBRARY_PATH is disabled everywhere but it is
+# necessary here
+if(APPLE)
+  set(OTB_SB_CMAKE_COMMAND
+    env
+    ${LDLIBVAR}=${CMAKE_INSTALL_PREFIX}/lib:$ENV{${LDLIBVAR}}
+    ${CMAKE_COMMAND})
+else()
+  set(OTB_SB_CMAKE_COMMAND ${SB_CMAKE_COMMAND})
+endif()
+
 ExternalProject_Add(${proj}
     DEPENDS ${${proj}_DEPENDENCIES}
     PREFIX ${proj}
@@ -154,7 +165,7 @@
       -DOTB_WRAP_PYTHON:BOOL=${OTB_WRAP_PYTHON}
       -DOTB_WRAP_JAVA:BOOL=${OTB_WRAP_JAVA}
       ${OTB_ADDITIONAL_CACHE}
-    CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+    CMAKE_COMMAND ${OTB_SB_CMAKE_COMMAND}
     )


Fix issue 374 (likely): turns out sleep(X) takes an integer in Perl => infloop startup times out

git-svn-id: fe3cd4388a6e5a968b09397a3d721fe124e8117a@335 5b54908e-ead4-fc18-b48a-0285e6dbc711

--- tests/runtest.cmake
+++ tests/runtest.cmake
@@ -99,14 +99,10 @@
 endif (NOT PERL)

 # use perl since /bin/sleep not on all platforms
-set(SLEEP_SHORT ${PERL} -e "sleep(0.2)")
-set(SLEEP_LONG ${PERL} -e "sleep(2)")
-if (WIN32)
-  set(TIMEOUT_SHORT "100")
-else (WIN32)
-  # somehow sleep is much much shorter
-  set(TIMEOUT_SHORT "500")
-endif (WIN32)
+# select(undef, undef, undef, X) sleeps for X seconds where X can be non-int.
+set(SLEEP_SHORT ${PERL} -e "select(undef, undef, undef, 0.1)")
+set(TIMEOUT_SHORT "100")  # *0.1 = 10 seconds
+set(SLEEP_LONG ${PERL} -e "select(undef, undef, undef, 2)")
 set(TIMEOUT_APP "120")

 # intra-arg space=@@ and inter-arg space=@


Fix qwt search procedure, to work properly on systems where native qwt library is installed with non-standard name (e.g. libqwt-qt4)

--- adm_local/cmake_files/FindQwt.cmake
+++ adm_local/cmake_files/FindQwt.cmake
@@ -41,13 +41,23 @@
   IF(CMAKE_BUILD_TYPE STREQUAL Debug)
     FIND_LIBRARY(QWT_LIBRARY qwtd)
   ENDIF()
+  FIND_LIBRARY(QWT_LIBRARY qwt)
 ELSE(WIN32)
-  # Give precedence to qwt-qt4 library:
+  # Give precedence to qwt-qt4 library.
+  # Note: on some platforms there can be several native qwt libraries linked against different
+  #       versions of Qt; for example /usr/lib/libqwt.so for qwt linked against Qt 3 and
+  #       /usr/lib/libqwt-qt4.so for qwt linked against Qt 4.
+  #       We need only qt4-based qwt library, so we search libqwt-qt4, then libqwt library
+  #       first ignoring system paths, then including system paths.
+  FIND_LIBRARY(QWT_LIBRARY qwt-qt4 PATH_SUFFIXES lib lib64 PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH)
+  FIND_LIBRARY(QWT_LIBRARY qwt-qt4 PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH)
+  FIND_LIBRARY(QWT_LIBRARY qwt PATH_SUFFIXES lib lib64 PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH)
+  FIND_LIBRARY(QWT_LIBRARY qwt PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH)
   FIND_LIBRARY(QWT_LIBRARY qwt-qt4 PATH_SUFFIXES lib lib64)
   FIND_LIBRARY(QWT_LIBRARY qwt-qt4)
   FIND_LIBRARY(QWT_LIBRARY qwt PATH_SUFFIXES lib lib64)
+  FIND_LIBRARY(QWT_LIBRARY qwt)
 ENDIF(WIN32)
-FIND_LIBRARY(QWT_LIBRARY qwt)

 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qwt REQUIRED_VARS QWT_INCLUDE_DIR QWT_LIBRARY)


Provide CMake configure option for MSVC to use safe functions.

--- cmake/Modules/CppUTestConfigurationOptions.cmake
+++ cmake/Modules/CppUTestConfigurationOptions.cmake
@@ -1,6 +1,10 @@
 if (MSVC)
     set(CPP_PLATFORM VisualCpp)
     include_directories(${CppUTestRootDirectory}/include/Platforms/${CPP_PLATFORM})
+    option(STDC_WANT_SECURE_LIB "Use MSVC safe functions" ON)
+    if(STDC_WANT_SECURE_LIB)
+      ADD_DEFINITIONS(-DSTDC_WANT_SECURE_LIB)
+    endif(STDC_WANT_SECURE_LIB)
 elseif (STD_C)
     set(CPP_PLATFORM Gcc)
 else (MSVC)


sanitize-leak is undetectable feature

sanitize-leak is undetectable feature

--- flags/sanitize_leak.cmake
+++ flags/sanitize_leak.cmake
@@ -14,3 +14,5 @@

 polly_add_cache_flag(CMAKE_C_FLAGS "-fsanitize=leak")
 polly_add_cache_flag(CMAKE_C_FLAGS "-g")
+
+list(APPEND HUNTER_TOOLCHAIN_UNDETECTABLE_ID "sanitize-leak")


Install module dependencies in separate dir and symlink.

--- functions.cmake
+++ functions.cmake
@@ -542,12 +542,17 @@
 endfunction()

 function(install_java_artifact_dependencies NAME)
-    install(DIRECTORY "target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar")
+    install(DIRECTORY "target/dependency/" DESTINATION lib/jars/${NAME} FILES_MATCHING PATTERN "*.jar")
+    install(CODE "execute_process(COMMAND bash -c \"cd $ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/lib/jars && ln -sf ${NAME}/*.jar .\")")
 endfunction()

 function(install_fat_java_artifact NAME)
     install(FILES "target/${NAME}-jar-with-dependencies.jar" DESTINATION lib/jars/)
 endfunction()
+
+function(install_symlink TARGET LINK)
+    install(CODE "execute_process(COMMAND ln -sf ${CMAKE_INSTALL_PREFIX}/${TARGET} $ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${LINK})")
+endfunction(install_symlink)

 function(add_auxilliary_modules)
     if(EXTRA_PROJECTS)
@@ -558,7 +563,3 @@
     endif()
 endfunction()

-function(install_symlink TARGET LINK)
-    install(CODE "execute_process(COMMAND ln -sf ${CMAKE_INSTALL_PREFIX}/${TARGET} $ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${LINK})")
-endfunction(install_symlink)
-


- Fix for Emscripten unit tests

- Fix for Emscripten unit tests

--- cmake/Modules/BuildFunctions.cmake
+++ cmake/Modules/BuildFunctions.cmake
@@ -414,7 +414,7 @@
     elseif(EMSCRIPTEN)
         add_test (
             NAME ${TITLE}
-            WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+            WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TARGET}.bundle
             COMMAND nodejs $<TARGET_FILE:${TARGET}>
             )
     else()


Fix check for VersitOrganizer

Fix check for VersitOrganizer

--- cmake/Modules/FindQtMobility.cmake
+++ cmake/Modules/FindQtMobility.cmake
@@ -139,7 +139,7 @@
     export_component(Versit)
     export_component(Sensors)
     # VersitOrganizer
-    if(${QT_MOBILITY_CONTACTS_FOUND} AND ${QT_MOBILITY_VERSIT_FOUND})
+    if(QT_MOBILITY_VERSIT_FOUND AND QT_MOBILITY_ORGANIZER_FOUND)
         SET(QT_MOBILITY_VERSITORGANIZER_FOUND 1)
         SET(QT_MOBILITY_VERSITORGANIZER_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/QtVersitOrganizer)
         SET(QT_MOBILITY_VERSITORGANIZER_LIBRARY QtVersitOrganizer)


cmake: correctly print CMAKE_SYSTEM_NAME

Trivial typo.

Signed-off-by: Emil Velikov <4c996f2f093ddd0585a556460b4cc3ba555546ef@gmail.com>
Reviewed-by: Chad Versace <a557f7f75bf28dc19ac99107f5cc7cd6b3fbdb1a@linux.intel.com>

--- cmake/Modules/WaffleDefineOS.cmake
+++ cmake/Modules/WaffleDefineOS.cmake
@@ -28,5 +28,5 @@
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
     set(waffle_on_mac true)
 else()
-    message(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_NAME=\"${CMAKE_SYSTEM_NAME|\"")
+    message(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_NAME=\"${CMAKE_SYSTEM_NAME}\"")
 endif()


Update hunter.cmake

Update hunter.cmake

--- cmake/projects/Buffer/hunter.cmake
+++ cmake/projects/Buffer/hunter.cmake
@@ -3,6 +3,17 @@
 include(hunter_pick_scheme)

 # List of versions here...
+hunter_add_version(
+    PACKAGE_NAME
+    Buffer
+    VERSION
+    "0.1.3"
+    URL
+    "https://github.com/designerror/buffer/archive/v0.1.4.tar.gz"
+    SHA1
+    6447587d1c88254246abcb77fb8018edd825b675
+)
+
 hunter_add_version(
     PACKAGE_NAME
     Buffer


Ensure output has no lib prefix, has a .pyd extension and is placed in the bin directory.

--- tools/cmake/ANHPythonBinding.cmake
+++ tools/cmake/ANHPythonBinding.cmake
@@ -18,10 +18,10 @@
 ########################
 #
 # include(ANHPYTHONLIBrary)
-#
+#
 # AddANHPythonBinding(Common
-#     MMOSERVER_DEPS
-#         Utils
+#     MMOSERVER_DEPS
+#         Utils
 # )
 #
 #
@@ -31,7 +31,7 @@
 # include(ANHPYTHONLIBrary)
 #
 # AddANHPythonBinding(ScriptEngine
-#     DEPENDS
+#     DEPENDS
 #         Utils
 #         Common
 #     SOURCES # disables source lookup and uses this list
@@ -41,8 +41,8 @@
 #     ADDITIONAL_SOURCE_DIRS
 #         ${CMAKE_CURRENT_SOURCE_DIR}/glue_files
 #     ADDITIONAL_INCLUDE_DIRS
-#         ${LUA_INCLUDE_DIR}
-#         ${NOISE_INCLUDE_DIR}
+#         ${LUA_INCLUDE_DIR}
+#         ${NOISE_INCLUDE_DIR}
 #         ${TOLUAPP_INCLUDE_DIR}
 #     DEBUG_LIBRARIES
 #         ${LUA_LIBRARY_DEBUG}
@@ -59,10 +59,10 @@

 FUNCTION(AddANHPythonBinding name)
     PARSE_ARGUMENTS(ANHPYTHONLIB "DEPENDS;SOURCES;ADDITIONAL_LIBRARY_DIRS;ADDITIONAL_INCLUDE_DIRS;ADDITIONAL_SOURCE_DIRS;DEBUG_LIBRARIES;OPTIMIZED_LIBRARIES" "" ${ARGN})
-
+
     set(base_name ${name})
     set(name ${name}_binding)
-
+
     LIST(LENGTH ANHPYTHONLIB_SOURCES __source_files_list_length)
     LIST(LENGTH ANHPYTHONLIB_DEBUG_LIBRARIES _debug_list_length)
     LIST(LENGTH ANHPYTHONLIB_OPTIMIZED_LIBRARIES _optimized_list_length)
@@ -70,44 +70,47 @@
     LIST(LENGTH ANHPYTHONLIB_ADDITIONAL_INCLUDE_DIRS _includes_list_length)
     LIST(LENGTH ANHPYTHONLIB_ADDITIONAL_LIBRARY_DIRS _librarydirs_list_length)
     LIST(LENGTH ANHPYTHONLIB_ADDITIONAL_SOURCE_DIRS _sources_list_length)
-
+
     # Grab all of the source files and all of the unit test files.
-    IF(__source_files_list_length EQUAL 0)
+    IF(__source_files_list_length EQUAL 0)
         # load up all of the source and header files for the project
         FILE(GLOB_RECURSE ANHPYTHONLIB_SOURCES *.cc *.cpp *.h)
-
+
         FOREACH(__source_file ${ANHPYTHONLIB_SOURCES})
             STRING(REGEX REPLACE "(${CMAKE_CURRENT_SOURCE_DIR}/)((.*/)*)(.*)" "\\2" __source_dir "${__source_file}")
             STRING(REGEX REPLACE "(${CMAKE_CURRENT_SOURCE_DIR}/${__source_dir})(.*)" "\\2" __source_filename "${__source_file}")
-
+
             STRING(REPLACE "/" "\\\\" __source_group "${__source_dir}")
             SOURCE_GROUP("${__source_group}" FILES ${__source_file})
         ENDFOREACH()
     ELSE()
         FOREACH(__source_file ${ANHPYTHONLIB_SOURCES})
             STRING(REGEX REPLACE "(${CMAKE_CURRENT_SOURCE_DIR}/${__source_dir})(.*)" "\\2" __source_filename "${__source_file}")
-
+
             STRING(SUBSTRING ${__source_filename} 0 5 __main_check)
             STRING(COMPARE EQUAL "main." "${__main_check}" __is_main)
             IF(__is_main)
                 LIST(REMOVE_ITEM ANHPYTHONLIB_SOURCES ${__source_file})
-            ENDIF()
+            ENDIF()
         ENDFOREACH()
     ENDIF()
-
+
     IF(_includes_list_length GREATER 0)
         INCLUDE_DIRECTORIES(${ANHPYTHONLIB_ADDITIONAL_INCLUDE_DIRS})
     ENDIF()
-
+
     IF(_librarydirs_list_length GREATER 0)
         LINK_DIRECTORIES(${ANHPYTHONLIB_ADDITIONAL_LIBRARY_DIRS})
     ENDIF()
-
+
     # Create the Common library
-    ADD_LIBRARY(${name} SHARED ${ANHPYTHONLIB_SOURCES})
+    ADD_LIBRARY(${name} SHARED ${ANHPYTHONLIB_SOURCES})
     SET_TARGET_PROPERTIES(${name}
-        PROPERTIES OUTPUT_NAME py_${base_name})
-
+        PROPERTIES OUTPUT_NAME py_${base_name}
+        LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+        PREFIX ""
+        SUFFIX ".pyd")
+
     IF(_project_deps_list_length GREATER 0)
         ADD_DEPENDENCIES(${name} ${ANHPYTHONLIB_DEPENDS})
 		TARGET_LINK_LIBRARIES(${name} ${ANHPYTHONLIB_DEPENDS})
@@ -116,31 +119,16 @@
     IF(_debug_list_length GREATER 0)
         FOREACH(debug_library ${ANHPYTHONLIB_DEBUG_LIBRARIES})
             if (NOT ${debug_library} MATCHES ".*NOTFOUND")
-                TARGET_LINK_LIBRARIES(${name} debug ${debug_library})
+                TARGET_LINK_LIBRARIES(${name} debug ${debug_library})
             endif()
         ENDFOREACH()
     ENDIF()
-
+
     IF(_optimized_list_length GREATER 0)
         FOREACH(optimized_library ${ANHPYTHONLIB_OPTIMIZED_LIBRARIES})
             if (NOT ${optimized_library} MATCHES ".*NOTFOUND")
-                TARGET_LINK_LIBRARIES(${name} optimized ${optimized_library})
+                TARGET_LINK_LIBRARIES(${name} optimized ${optimized_library})
             endif()
         ENDFOREACH()
     ENDIF()
-
-    IF(WIN32)
-        # Set the default output directory for binaries for convenience.
-        set(RUNTIME_OUTPUT_BASE_DIRECTORY "${CMAKE_BINARY_DIR}")
-
-        # Set the default output directory for binaries for convenience.
-        SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${RUNTIME_OUTPUT_BASE_DIRECTORY}/bin/${CMAKE_BUILD_TYPE}")
-
-		SET_TARGET_PROPERTIES(${name} PROPERTIES SUFFIX ".pyd")
-		SET_TARGET_PROPERTIES(${name} PROPERTIES DEBUG_POSTFIX "")
-
-		# After each executable project is built make sure the environment is
-		# properly set up (scripts, default configs, etc exist).
-	ENDIF()
-
 ENDFUNCTION()


Auto detect OpenVDB API for houdini-19+

Auto detect OpenVDB API for houdini-19+

During cmake configuration if Houdini_VERSION_MAJOR_MINOR is greater
than or equal to 19.0 it will extract the ABI version number from
`openvdb/version.h` shipped with Houdini.

If it fails it will use the similar fallback as before, except it will
use `OpenVDB_MAJOR_VERSION` instead of hardcoded `8`.

Signed-off-by: Fredrik Salomonsson <94092975b04047b37821994781a0b9ea8d41c3ff@d2.com>

--- cmake/OpenVDBHoudiniSetup.cmake
+++ cmake/OpenVDBHoudiniSetup.cmake
@@ -335,12 +335,31 @@
   set(OPENVDB_HOUDINI_ABI 6)
 elseif(Houdini_VERSION_MAJOR_MINOR VERSION_EQUAL 18.5)
   set(OPENVDB_HOUDINI_ABI 7)
-elseif(Houdini_VERSION_MAJOR_MINOR VERSION_EQUAL 19.0)
-  set(OPENVDB_HOUDINI_ABI 8)
 else()
-  message(WARNING "Unknown version of Houdini, assuming OpenVDB ABI=8, "
-    "but if this not correct, the CMake flag -DOPENVDB_HOUDINI_ABI=<N> can override this value.")
-  set(OPENVDB_HOUDINI_ABI 8)
+  find_file(_houdini_openvdb_version_file "openvdb/version.h"
+    PATHS ${HOUDINI_INCLUDE_DIR}
+    NO_DEFAULT_PATH
+    NO_PACKAGE_ROOT_PATH
+    NO_CMAKE_PATH
+    NO_CMAKE_ENVIRONMENT_PATH
+    NO_SYSTEM_ENVIRONMENT_PATH
+    NO_CMAKE_SYSTEM_PATH)
+  if(NOT ${_houdini_openvdb_version_file} EQUAL "_houdini_openvdb_version_file-NOTFOUND")
+    file(STRINGS ${_houdini_openvdb_version_file} _houdini_openvdb_version)
+    foreach(line ${_houdini_openvdb_version})
+      if(line MATCHES "^#define OPENVDB_ABI_VERSION_NUMBER ([0-9]+)$")
+        set(OPENVDB_HOUDINI_ABI ${CMAKE_MATCH_1})
+        break()
+      endif()
+    endforeach()
+    unset(_houdini_openvdb_version)
+  endif()
+  unset(_houdini_openvdb_version_file)
+  if(NOT OPENVDB_HOUDINI_ABI)
+    message(WARNING "Unknown version of Houdini, assuming OpenVDB ABI=${OpenVDB_MAJOR_VERSION}, "
+      "but if this not correct, the CMake flag -DOPENVDB_HOUDINI_ABI=<N> can override this value.")
+    set(OPENVDB_HOUDINI_ABI ${OpenVDB_MAJOR_VERSION})
+  endif()
 endif()

 # ------------------------------------------------------------------------


[CMake] Adding clang-headers to the Apple-stage2 distribution

This installs the clang headers as part of the install-distribution target.

git-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@268319 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/caches/Apple-stage2.cmake
+++ cmake/caches/Apple-stage2.cmake
@@ -54,6 +54,7 @@
   clang
   LTO
   clang-format
+  clang-headers
   ${LLVM_TOOLCHAIN_TOOLS}
   CACHE STRING "")


Fix variable

Fix variable

svn path=/trunk/KDE/kdenetwork/cmake/modules/FindDecibel.cmake; revision=642487

--- cmake/modules/FindDecibel.cmake
+++ cmake/modules/FindDecibel.cmake
@@ -44,13 +44,13 @@
 endif (DECIBEL_INCLUDES AND DECIBEL_LIBRARIES)

 if (DECIBEL_FOUND)
-  if (NOT DECIBEL_FIND_QUIETLY)
+  if (NOT Decibel_FIND_QUIETLY)
     message(STATUS "Found Decibel: ${DECIBEL_LIBRARIES}")
-  endif (NOT DECIBEL_FIND_QUIETLY)
+  endif (NOT Decibel_FIND_QUIETLY)
 else (DECIBEL_FOUND)
-  if (DECIBEL_FIND_REQUIRED)
+  if (Decibel_FIND_REQUIRED)
     message(SEND_ERROR "Could NOT find Decibel")
-  endif (DECIBEL_FIND_REQUIRED)
+  endif (Decibel_FIND_REQUIRED)
 endif (DECIBEL_FOUND)

 MARK_AS_ADVANCED(QT_TAPIOCA_INCLUDE_DIR QT_TAPIOCA_LIBRARY)


Fix the cmake module

Fix the cmake module

Signed-off-by: Corentin Chary <298d22bb5b8e08c296f77ec9e7162462cf47b8a1@iksaif.net>

--- cmake/modules/FindQWEBDAV.cmake
+++ cmake/modules/FindQWEBDAV.cmake
@@ -17,7 +17,7 @@
     # use pkg-config to get the values of QWEBDAV_INCLUDE_DIRS
     # and QWEBDAV_LIBRARY_DIRS to add as hints to the find commands.
     include (FindPkgConfig)
-    pkg_check_modules (QWEBDAV REQUIRED QWebdav >=0.5)
+    pkg_check_modules (QWEBDAV QWebdav >=0.5)
   endif (NOT WIN32)

   find_library (QWEBDAV_LIBRARIES
@@ -31,7 +31,7 @@

   find_path (QWEBDAV_INCLUDE_DIR
     NAMES
-    parser.h
+    qwebdav.h
     PATH_SUFFIXES
     qwebdav
     PATHS


Enable Tk and Itk by default now that we have shown by experiment that the
segfaults in these components of PLplot were caused by HAVE_PTHREAD ON
(which is now OFF by default for this reason).

svn path=/trunk/; revision=9852

--- cmake/modules/tcl-related.cmake
+++ cmake/modules/tcl-related.cmake
@@ -28,8 +28,8 @@
 else(DEFAULT_NO_BINDINGS)
   option(ENABLE_tcl "Enable Tcl bindings" ON)
   option(ENABLE_itcl "Enable incr Tcl interface code" ON)
-  option(ENABLE_tk "Enable Tk interface code" OFF)
-  option(ENABLE_itk "Enable incr TK interface code" OFF)
+  option(ENABLE_tk "Enable Tk interface code" ON)
+  option(ENABLE_itk "Enable incr TK interface code" ON)
 endif(DEFAULT_NO_BINDINGS)

 # Depending on these above options and system resources may also determine


make build type option

make build type option

--- cmake/muggle_cmake_common.cmake
+++ cmake/muggle_cmake_common.cmake
@@ -33,7 +33,7 @@
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

 # build share lib or static lib
-set(MUGGLE_BUILD_SHARED_LIB ON)
+option(MUGGLE_BUILD_SHARED_LIB ON)
 if (MUGGLE_BUILD_SHARED_LIB)
 	set(MUGGLE_LIB_TYPE SHARED)
 else()


Quick optimization: Only need to copy module dynamic libraries to MODULE_PATH with the exact version, since that's the only way they'll be loaded.

--- cmake_modules/ZorbaModule.cmake
+++ cmake_modules/ZorbaModule.cmake
@@ -206,15 +206,18 @@
       "${major_ver}.${minor_ver}.${patch_ver}")
     ADD_COPY_RULE ("${SOURCE_FILE}" "${output_dir}/${module_filename}"
       "${version_infix}" "${SOURCE_FILE}")
-
-    # Also copy the dynamic library from the location it was built.
-    IF (MODULE_LIB_NAME)
-      GET_TARGET_PROPERTY (lib_location "${MODULE_LIB_NAME}" LOCATION)
-      GET_FILENAME_COMPONENT (lib_filename "${lib_location}" NAME)
-      ADD_COPY_RULE ("${lib_location}" "${output_dir}/${lib_filename}"
-        "${version_infix}" "${MODULE_LIB_NAME}")
-    ENDIF (MODULE_LIB_NAME)
   ENDFOREACH (version_infix)
+
+  # Also copy the dynamic library from the location it was built.
+  # Because the dynamic library is only loaded after the .xq file, the
+  # exact module version is known; thus only one copy needs to be
+  # made.
+  IF (MODULE_LIB_NAME)
+    GET_TARGET_PROPERTY (lib_location "${MODULE_LIB_NAME}" LOCATION)
+    GET_FILENAME_COMPONENT (lib_filename "${lib_location}" NAME)
+    ADD_COPY_RULE ("${lib_location}" "${output_dir}/${lib_filename}"
+      "${MODULE_VERSION}" "${MODULE_LIB_NAME}")
+  ENDIF (MODULE_LIB_NAME)

   # Associate these custom commands with the "all" target via a custom
   # target. (I couldn't find any neater way to do this in CMake; you


-ENH: set the binary directory to release instead of bin, for consistency with other versions on the cluster

--- Testing/Dashboard/pxDashboard_BIGR_linux64_gcc.cmake
+++ Testing/Dashboard/pxDashboard_BIGR_linux64_gcc.cmake
@@ -20,9 +20,14 @@
 set( CTEST_SITE "BIGR.cluster" )
 set( CTEST_BUILD_NAME "Linux-64bit-gcc4.4.6" )
 set( CTEST_BUILD_FLAGS "-j3" ) # parallel build for makefiles
+set( CTEST_TEST_ARGS PARALLEL_LEVEL 3 ) # parallel testing
 set( CTEST_BUILD_CONFIGURATION Release )
 set( CTEST_CMAKE_GENERATOR "Unix Makefiles" )
 set( CTEST_DASHBOARD_ROOT "/cm/shared/apps/itktools/nightly" )
+
+# Overrule binary directory. Use 'release' instead of 'bin',
+# for consistency with other itktools verisons on the cluster2
+set( CTEST_BINARY_DIRECTORY ${CTEST_DASHBOARD_ROOT}/release )

 # default: automatically determined
 #set(CTEST_UPDATE_COMMAND /path/to/svn)


Fixed looking for thread

Fixed looking for thread

--- CMakeModules/KrisLibraryDependencies.cmake
+++ CMakeModules/KrisLibraryDependencies.cmake
@@ -26,7 +26,7 @@
   CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)

   include(CheckIncludeFileCXX REQUIRED)
-  CHECK_INCLUDE_FILE_CXX(thread HAVE_CPP_THREAD)
+  CHECK_INCLUDE_FILE_CXX(thread HAVE_CPP_THREAD "-std=c++11")

   if(HAVE_CPP_THREAD)
     SET(C11_ENABLED ON)


Extend SubProject

Extend SubProject

--- SubProject.cmake
+++ SubProject.cmake
@@ -6,31 +6,39 @@
 #--------------------------------------------------
 include_directories("${PROJECT_BINARY_DIR}/include")

-macro(add_subproject name)
- set(extra_args ${ARGN})
- list(LENGTH extra_args argc)
- if(argc GREATER 0)
-   list(GET extra_args 0 path)
- else()
+include(${CMAKE_CURRENT_LIST_DIR}/GitExternal.cmake)
+
+function(add_subproject name)
+  list(LENGTH ARGN argc)
+  if(argc GREATER 0)
+    list(GET ARGN 0 path)
+  else()
     set(path ${name})
- endif ()
-
- if(EXISTS "${PROJECT_SOURCE_DIR}/${path}/")
+  endif ()
+
+  if(EXISTS "${PROJECT_SOURCE_DIR}/${path}/")
     option("SUBPROJECT_${name}" "Build ${name} " ON)
     if(SUBPROJECT_${name})
-      # if the project needs to do anything special when configured as a sub project
-      # then it should check the variable ${PROJECT_NAME}_EXTERNALLY_CONFIGURED
+      # if the project needs to do anything special when configured as
+      # a sub project then it should check the variable
+      # ${PROJECT_NAME}_EXTERNALLY_CONFIGURED
       set(${name}_IS_SUBPROJECT ON)

       # set ${PROJECT}_DIR to the location of the new build dir for the project
-      if (NOT ${name}_DIR)
-        set(${name}_DIR "${PROJECT_BINARY_DIR}/${name}" CACHE PATH "Location of ${name} project" FORCE)
-        message("${name}_DIR has been set to ${PROJECT_BINARY_DIR}/${name}")
+      if (NOT ${name}_DIR)
+        set(${name}_DIR "${PROJECT_BINARY_DIR}/${name}" CACHE PATH
+          "Location of ${name} project" FORCE)
       endif()

-      # add the source sub directory to our build and set the binary dir to the build tree
-      add_subdirectory("${PROJECT_SOURCE_DIR}/${path}" "${PROJECT_BINARY_DIR}/${name}")
+      # add the source sub directory to our build and set the binary
+      # dir to the build tree
+      add_subdirectory("${PROJECT_SOURCE_DIR}/${path}"
+        "${PROJECT_BINARY_DIR}/${name}")
     endif()
   endif()
-endmacro(add_subproject)
+endfunction()

+function(add_git_subproject name url tag)
+  git_external(${name} ${url} ${tag})
+  add_subproject(${name})
+endfunction()


Suppress configure step in CTK-build target

Configuration was done twice since there is an extra
CTK-configure target on which CTK-build depends.

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -260,6 +260,7 @@
   SET(proj CTK-build)
   ExternalProject_Add(${proj}
     DOWNLOAD_COMMAND ""
+    CONFIGURE_COMMAND ""
     CMAKE_GENERATOR ${gen}
     SOURCE_DIR ${CTK_SOURCE_DIR}
     BINARY_DIR CTK-build


testing: build qs extension

testing: build qs extension

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -60,6 +60,11 @@
 option(BUILD_SHARED_LIBS "Build shared libraries" USE_SYSTEM_LIBS)

+if(NOT ( DEFINED "USE_SYSTEM_${extProjName}" AND "${USE_SYSTEM_${extProjName}}" ) )
+  message("--------------------------------FAIL--------------------------------")
+else()
+  message("--------------------------------PASS--------------------------------")
+endif()

 set(EXTERNAL_PROJECT_BUILD_TYPE "Release" CACHE STRING "Default build type for support libraries")


ENH: refs #0264. Version 1.8.3

ENH: refs #0264. Version 1.8.3

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -6,7 +6,7 @@
   BINARY_DIR CTK-build
   PREFIX CTK-cmake
   GIT_REPOSITORY "git://github.com/zachmullen/CTK.git"
-  GIT_TAG "v1.8.2"
+  GIT_TAG "v1.8.3"
   CMAKE_GENERATOR "${CMAKE_GENERATOR}"
   INSTALL_COMMAND ""
   CMAKE_ARGS


ENH: update for Tcl/Tk 8.5

ENH: update for Tcl/Tk 8.5

--- CMake/FindTCL.cmake
+++ CMake/FindTCL.cmake
@@ -166,7 +166,7 @@

 IF(TCL_INCLUDE_PATH AND TCL_LIBRARY)
   SET(TCL_FOUND 1)
-ENDIF(TCL_INCLUDE_PATH AND TCL_LIBRARY)
+ELSE(TCL_INCLUDE_PATH AND TCL_LIBRARY)
   SET(TCL_FOUND 0)
 ENDIF(TCL_INCLUDE_PATH AND TCL_LIBRARY)


cmake: Fix typo

cmake: Fix typo

--- CMake/Wayland.cmake
+++ CMake/Wayland.cmake
@@ -35,7 +35,7 @@
 # wayland_add_protocol_client(outfiles inputfile basename)
 function(WAYLAND_ADD_PROTOCOL_CLIENT _sources _protocol _basename)
     if(NOT WAYLAND_SCANNER_EXECUTABLE)
-        message(FATAL "The wayland-scanner executable has nto been found on your system. You must install it.")
+        message(FATAL "The wayland-scanner executable has not been found on your system. You must install it.")
     endif()

     get_filename_component(_infile ${_protocol} ABSOLUTE)
@@ -57,7 +57,7 @@
 # wayland_add_protocol_server(outfiles inputfile basename)
 function(WAYLAND_ADD_PROTOCOL_SERVER _sources _protocol _basename)
     if(NOT WAYLAND_SCANNER_EXECUTABLE)
-        message(FATAL "The wayland-scanner executable has nto been found on your system. You must install it.")
+        message(FATAL "The wayland-scanner executable has not been found on your system. You must install it.")
     endif()

     get_filename_component(_infile ${_protocol} ABSOLUTE)


Remove unused CMake file

Remove unused CMake file

--- library/CMake/MidasPHPCopy.cmake
+++ library/CMake/MidasPHPCopy.cmake
@@ -1,64 +0,0 @@
-#=============================================================================
-# MIDAS Server
-# Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
-# All rights reserved.
-# More information http://www.kitware.com
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0.txt
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-#----------------------------------------------------------------------------
-# Copying the server php files
-file(COPY
-  ${SOURCE_DIR}/midas
-  DESTINATION
-  ${BINARY_DIR}
-  FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-  GROUP_READ GROUP_WRITE GROUP_EXECUTE
-  WORLD_READ WORLD_WRITE WORLD_EXECUTE
-  DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-  GROUP_READ GROUP_WRITE GROUP_EXECUTE
-  WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-file(COPY
-  ${SOURCE_DIR}/cake
-  DESTINATION
-  ${BINARY_DIR})
-file(COPY
-  ${SOURCE_DIR}/docs
-  DESTINATION
-  ${BINARY_DIR})
-file(COPY
-  ${SOURCE_DIR}/models
-  DESTINATION
-  ${BINARY_DIR})
-file(COPY
-  ${SOURCE_DIR}/vendors
-  DESTINATION
-  ${BINARY_DIR})
-file(COPY
-  ${SOURCE_DIR}/index.php
-  DESTINATION
-  ${BINARY_DIR})
-file(COPY
-  ${SOURCE_DIR}/crossdomain.xml
-  DESTINATION
-  ${BINARY_DIR})
-file(COPY
-  ${SOURCE_DIR}/.htaccess
-  DESTINATION
-  ${BINARY_DIR})
-file(MAKE_DIRECTORY
-  ${Midas_BASE_DIRECTORY}/assetstore
-  ${Midas_BASE_DIRECTORY}/temp
-  ${Midas_BASE_DIRECTORY}/cache
-  ${Midas_BASE_DIRECTORY}/backup)


fix regex to split service files into request and response

--- rosidl_cmake/cmake/rosidl_generate_interfaces.cmake
+++ rosidl_cmake/cmake/rosidl_generate_interfaces.cmake
@@ -83,8 +83,8 @@
     # generate request and response messages for services
     if("${_extension}" STREQUAL ".srv")
       file(READ "${_idl_file}" _service_content)
-      string(REGEX REPLACE "(.*\n)---\n.*" "\\1" _request_content "${_service_content}")
-      string(REGEX REPLACE ".*\n---\n(.*)" "\\1" _response_content "${_service_content}")
+      string(REGEX REPLACE "^((.*\n)|)---(\n.*)?$" "\\1" _request_content "${_service_content}")
+      string(REGEX REPLACE "^((.*\n)|)---(\n(.*)|())$" "\\4" _response_content "${_service_content}")
       get_filename_component(_name "${_idl_file}" NAME_WE)
       set(_request_file "${CMAKE_CURRENT_BINARY_DIR}/msg/${_name}Request.msg")
 #      set(_request_with_header_file "${CMAKE_CURRENT_BINARY_DIR}/msg/${_name}RequestWithHeader.msg")


[cmake] Use separate doctrees to prevent races between Sphinx instances

Use separate doctrees between different Sphinx builders in order to
prevent race condition issues due to multiple Sphinx instances accessing
the same doctree cache in parallel.

Bug: https://llvm.org/bugs/show_bug.cgi?id=23781

Differential Revision: https://reviews.llvm.org/D23755

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

--- cmake/modules/AddSphinxTarget.cmake
+++ cmake/modules/AddSphinxTarget.cmake
@@ -6,7 +6,7 @@
 # ``project`` should be the project name
 function (add_sphinx_target builder project)
   set(SPHINX_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${builder}")
-  set(SPHINX_DOC_TREE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
+  set(SPHINX_DOC_TREE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-${builder}")
   set(SPHINX_TARGET_NAME docs-${project}-${builder})

   if (SPHINX_WARNINGS_AS_ERRORS)


[cmake] always output compile command databases in dependend projects

--- cmake/modules/DuneStuffMacros.cmake
+++ cmake/modules/DuneStuffMacros.cmake
@@ -53,6 +53,7 @@
 "  HAS_STD_BEGIN_END
 )

+SET( CMAKE_EXPORT_COMPILE_COMMANDS "ON" )

 SET( CMAKE_CXX_FLAGS_RELEASE
   "-DDNDEBUG -O2 -fPIC " )


fix hdmarker VAD

fix hdmarker VAD

--- external/vigra_cmake/VAD_hdmarker.cmake
+++ external/vigra_cmake/VAD_hdmarker.cmake
@@ -15,8 +15,8 @@

   vad_deps(${ARGN})

-  if (NOT OpenCV_FOUND AND NOT Ceres_FOUND)
-    message("hdmarker: OpenCV or Ceres missing!")
+  if (NOT OPENCV_FOUND AND NOT CERES_FOUND)
+    message(FATAL_ERROR "hdmarker: OpenCV or Ceres missing!")
     return()
   endif()


CommonInstall: Allow CMAKE_BINARY_DIR as opt target

--- CommonInstall.cmake
+++ CommonInstall.cmake
@@ -2,18 +2,19 @@

 # Uses a compatible subset of the install() syntax, but can install
 # files while preserving their relative directory, and additionally
-# installing them into the PROJECT_BINARY_DIR for compatibility with
-# superprojects. Files with an absolute filename are installed
-# directly into the DESTINATION, that is, their directory is not
-# preserved. If RELATIVE is set, directories are ignored on all files.
-
+# installing them into the PROJECT_BINARY_DIR or CMAKE_BINARY_DIR for
+# compatibility with superprojects. Files with an absolute filename
+# are installed directly into the DESTINATION, that is, their
+# directory is not preserved. If RELATIVE is set, directories are
+# ignored on all files.
+#
 # Usage: common_install(FILES <files> [COMPONENT <name>] [DESTINATION <prefix>]
-#                       [RELATIVE])
+#                      [RELATIVE] [CMAKE_BINARY_DIR])

 include(CMakeParseArguments)

 function(COMMON_INSTALL)
-  set(OPT_NAMES RELATIVE)
+  set(OPT_NAMES RELATIVE CMAKE_BINARY_DIR)
   set(ARG_NAMES COMPONENT DESTINATION)
   set(ARGS_NAMES FILES)
   cmake_parse_arguments(THIS "${OPT_NAMES}" "${ARG_NAMES}" "${ARGS_NAMES}"
@@ -24,6 +25,10 @@
   endif()
   if(NOT THIS_DESTINATION)
     set(THIS_DESTINATION ".")
+  endif()
+  set(THIS_BINARY_DIR "${PROJECT_BINARY_DIR}")
+  if(THIS_CMAKE_BINARY_DIR)
+    set(THIS_BINARY_DIR "${CMAKE_BINARY_DIR}")
   endif()

   foreach(FILE ${THIS_FILES})
@@ -37,6 +42,6 @@
     install(FILES ${FILE} DESTINATION ${THIS_DESTINATION}/${DIR}
       ${THIS_COMPONENT})
     configure_file(${FILE}
-      ${PROJECT_BINARY_DIR}/${THIS_DESTINATION}/${DIR}/${BASENAME} @COPYONLY)
+      ${THIS_BINARY_DIR}/${THIS_DESTINATION}/${DIR}/${BASENAME} @COPYONLY)
   endforeach()
 endfunction()


added library prefix for atb find script

--- console/cmake/FindAntTweakBar.cmake
+++ console/cmake/FindAntTweakBar.cmake
@@ -9,10 +9,10 @@
 #

 # setup of the lib name to search for
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	set(lib_NAME "AntTweakBar64")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND WIN32)
+  set(lib_NAME "AntTweakBar64")
 else()
-	set(lib_NAME "AntTweakBar")
+  set(lib_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}AntTweakBar")
 endif()

 # setup of system search paths


Fix inconsistent indentation.

Fix inconsistent indentation.

--- CMake/RealmCore.cmake
+++ CMake/RealmCore.cmake
@@ -55,7 +55,7 @@
 set(MAKE_FLAGS "REALM_HAVE_CONFIG=1")

 if(SANITIZER_FLAGS)
-  set(MAKE_FLAGS ${MAKE_FLAGS} "EXTRA_CFLAGS=${SANITIZER_FLAGS}" "EXTRA_LDFLAGS=${SANITIZER_FLAGS}")
+    set(MAKE_FLAGS ${MAKE_FLAGS} "EXTRA_CFLAGS=${SANITIZER_FLAGS}" "EXTRA_LDFLAGS=${SANITIZER_FLAGS}")
 endif()

 ProcessorCount(NUM_JOBS)
@@ -68,25 +68,25 @@
 endif()

 function(use_realm_core enable_sync core_prefix sync_prefix)
-  if(core_prefix)
-    build_existing_realm_core(${core_prefix})
-    if(sync_prefix)
-      build_existing_realm_sync(${sync_prefix})
-    endif()
-  elseif(enable_sync)
-    # FIXME: Support building against prebuilt sync binaries.
-    clone_and_build_realm_core("v${REALM_CORE_VERSION}")
-    clone_and_build_realm_sync("v${REALM_SYNC_VERSION}")
-  else()
-    if(APPLE OR REALM_PLATFORM STREQUAL "Android")
-      download_realm_core(${REALM_CORE_VERSION})
+    if(core_prefix)
+        build_existing_realm_core(${core_prefix})
+        if(sync_prefix)
+            build_existing_realm_sync(${sync_prefix})
+        endif()
+    elseif(enable_sync)
+        # FIXME: Support building against prebuilt sync binaries.
+        clone_and_build_realm_core("v${REALM_CORE_VERSION}")
+        clone_and_build_realm_sync("v${REALM_SYNC_VERSION}")
     else()
-      clone_and_build_realm_core("v${REALM_CORE_VERSION}")
-    endif()
-  endif()
-
-  set(REALM_CORE_INCLUDE_DIR ${REALM_CORE_INCLUDE_DIR} PARENT_SCOPE)
-  set(REALM_SYNC_INCLUDE_DIR ${REALM_SYNC_INCLUDE_DIR} PARENT_SCOPE)
+        if(APPLE OR REALM_PLATFORM STREQUAL "Android")
+            download_realm_core(${REALM_CORE_VERSION})
+        else()
+            clone_and_build_realm_core("v${REALM_CORE_VERSION}")
+        endif()
+    endif()
+
+    set(REALM_CORE_INCLUDE_DIR ${REALM_CORE_INCLUDE_DIR} PARENT_SCOPE)
+    set(REALM_SYNC_INCLUDE_DIR ${REALM_SYNC_INCLUDE_DIR} PARENT_SCOPE)
 endfunction()

 function(download_realm_tarball url target libraries)


BUG: add ITKBridgeNumPy dependency to load all templates

Fixes #301

--- itk-module.cmake
+++ itk-module.cmake
@@ -11,6 +11,12 @@
   ITKIOXML
   )

+if(ITK_WRAP_PYTHON)
+  set(RTK_BRIDGE_DEPENDS
+  ITKBridgeNumPy
+  )
+endif()
+
 set(RTK_DEPENDS
   ITKCommon
   ITKConvolution
@@ -20,6 +26,7 @@
   ITKSmoothing
   ITKImageNoise
   ${RTK_IO_DEPENDS}
+  ${RTK_BRIDGE_DEPENDS}
   )

 # -----------------------------------------


Revert "Use Eigen+MKL"
Does not seem to be stable for cholesky

This reverts commit 434c8446ee7dab44d174677cae0325b92a5f96fa.

Conflicts:
	lib/smurff-cpp/cmake/scripts/DependenciesConfig.cmake

--- lib/smurff-cpp/cmake/scripts/DependenciesConfig.cmake
+++ lib/smurff-cpp/cmake/scripts/DependenciesConfig.cmake
@@ -74,7 +74,6 @@
   find_library (MKL_LIBRARIES "mkl_rt" HINTS ENV LD_LIBRARY_PATH REQUIRED)
   find_PATH (MKL_INCLUDE_DIR "mkl.h" HINTS ENV CPATH REQUIRED)
   include_directories(${MKL_INCLUDE_DIR})
-  add_definitions(-DEIGEN_USE_MKL_ALL )

   # since we mix OpenMP and mkl we need to link this
   if(${OPENMP_FOUND})
@@ -109,6 +108,7 @@

   message(STATUS EIGEN3: ${EIGEN3_INCLUDE_DIR})

+  add_definitions(-DEIGEN_DONT_PARALLELIZE)
 endmacro(configure_eigen)

 macro(configure_boost)


Remove dead dep configure macros from cmake/ConfigurePackages.cmake.

--- cmake/ConfigurePackages.cmake
+++ cmake/ConfigurePackages.cmake
@@ -41,21 +41,6 @@

     sagase_configure_report (BOOST)
 endmacro (configure_boost)
-
-macro (configure_poco)
-    sagase_configure_package (POCO
-        NAMES Poco PoCo poco
-        COMPONENTS Poco PocoFoundation PocoNet PocoUtil PocoXML
-        PREFIXES ${ENV_TUNDRA_DEP_PATH})
-
-    # POCO autolinks on MSVC
-    if (MSVC)
-        set (POCO_LIBRARIES "")
-        set (POCO_DEBUG_LIBRARIES "")
-    endif ()
-
-    sagase_configure_report (POCO)
-endmacro (configure_poco)

 macro (configure_qt4)
     sagase_configure_package (QT4
@@ -119,8 +104,7 @@
     endif ()

     # FindPythonLibs.cmake prefers the system-wide Python, which does not
-    # include debug libraries, so we force to NAALI_DEP_PATH.
-
+    # include debug libraries, so we force to TUNDRA_DEP_PATH.
     if (MSVC)
         set (PYTHON_LIBRARY_DIRS ${ENV_TUNDRA_DEP_PATH}/Python/lib)
         set (PYTHON_INCLUDE_DIRS ${ENV_TUNDRA_DEP_PATH}/Python/include)
@@ -230,129 +214,6 @@

     sagase_configure_report (QT_PROPERTY_BROWSER)
 endmacro (configure_qtpropertybrowser)
-
-macro (configure_xmlrpc)
-    if (APPLE)
-        sagase_configure_package (XMLRPC
-            NAMES xmlrpc xmlrpcepi xmlrpc-epi
-            COMPONENTS xmlrpc xmlrpcepi xmlrpc-epi xmlrpcepid iconv
-            PREFIXES ${ENV_TUNDRA_DEP_PATH}
-                ${ENV_TUNDRA_DEP_PATH}/xmlrpc-epi/src
-                ${ENV_TUNDRA_DEP_PATH}/xmlrpc-epi/Debug
-                ${ENV_TUNDRA_DEP_PATH}/xmlrpc-epi/Release)
-    else()
-        sagase_configure_package (XMLRPC
-            NAMES xmlrpc xmlrpcepi xmlrpc-epi
-            COMPONENTS xmlrpc xmlrpcepi xmlrpc-epi xmlrpcepid
-            PREFIXES ${ENV_TUNDRA_DEP_PATH}
-                ${ENV_TUNDRA_DEP_PATH}/xmlrpc-epi/src
-                ${ENV_TUNDRA_DEP_PATH}/xmlrpc-epi/Debug
-        ${ENV_TUNDRA_DEP_PATH}/xmlrpc-epi/Release)
-    endif()
-
-    if (MSVC)
-        set (XMLRPC_LIBRARIES xmlrpcepi)
-        set (XMLRPC_DEBUG_LIBRARIES xmlrpcepid)
-    endif()
-
-    sagase_configure_report (XMLRPC)
-endmacro (configure_xmlrpc)
-
-macro (configure_curl)
-    sagase_configure_package (CURL
-        NAMES Curl curl libcurl
-        COMPONENTS curl libcurl_imp libcurld_imp
-        PREFIXES ${ENV_TUNDRA_DEP_PATH}
-        ${ENV_TUNDRA_DEP_PATH}/libcurl/lib/DLL-Debug
-        ${ENV_TUNDRA_DEP_PATH}/libcurl/lib/DLL-Release)
-
-    if (MSVC)
-        set (CURL_LIBRARIES libcurl_imp)
-        set (CURL_DEBUG_LIBRARIES libcurld_imp)
-    endif()
-
-    if (APPLE)
-        set (CURL_LIBRARIES curl)
-    endif()
-
-    sagase_configure_report (CURL)
-endmacro (configure_curl)
-
-macro (configure_openjpeg)
-    sagase_configure_package (OPENJPEG
-        NAMES OpenJpeg OpenJPEG openjpeg
-        COMPONENTS OpenJpeg OpenJPEG openjpeg
-        PREFIXES ${ENV_TUNDRA_DEP_PATH}
-        ${ENV_TUNDRA_DEP_PATH}/OpenJpeg/libopenjpeg
-        ${ENV_TUNDRA_DEP_PATH}/OpenJpeg/Debug
-        ${ENV_TUNDRA_DEP_PATH}/OpenJpeg/Release)
-
-    sagase_configure_report (OPENJPEG)
-endmacro (configure_openjpeg)
-
-macro (configure_telepathy_qt4)
-    sagase_configure_package (TELEPATHY_QT4
-        NAMES QtTelepathy Telepathy-QT4 telepathy-qt4 TelepathyQt4 telepathy-1.0
-        COMPONENTS QtTelepathyCore QtTelepathyCommon QtTelepathyClient telepathy-qt4 telepathy-qt4-farsight connection # connection added here to help sagase to find include folder with connection.h file
-        PREFIXES ${ENV_TUNDRA_DEP_PATH} )
-    sagase_configure_report (TELEPATHY_QT4)
-endmacro (configure_telepathy_qt4)
-
-macro (configure_gstreamer)
-    sagase_configure_package (GSTREAMER
-        NAMES gstreamer gst gstreamer-0.10
-        COMPONENTS gstreamer gstfarsight gstinterfaces gst # gst added to help sagese to find include folder with gst.h file
-        PREFIXES ${ENV_TUNDRA_DEP_PATH})
-    sagase_configure_report (GSTREAMER)
-endmacro (configure_gstreamer)
-
-macro (configure_dbus)
-    sagase_configure_package (DBUS
-        NAMES dbus dbus-1
-        COMPONENTS dbus-1 dbus # dbus added to help sagese to find include folder with dbus.h file
-        PREFIXES ${ENV_TUNDRA_DEP_PATH})
-    sagase_configure_report (DBUS)
-endmacro (configure_dbus)
-
-macro (configure_glib)
-    sagase_configure_package (GLIB
-        NAMES glib-2.0 glib Glib
-        COMPONENTS glib-2.0 gobject-2.0 glib # glib added to help sagese to find include folder with glib.h file
-        PREFIXES ${ENV_TUNDRA_DEP_PATH})
-    sagase_configure_report (GLIB)
-endmacro (configure_glib)
-
-macro (configure_telepathy_glib)
-    sagase_configure_package (TELEPATHY_GLIB
-        NAMES telepathy-glib Telepathy-Glib
-        COMPONENTS telepathy-glib connection # connection added to help sagese to find include folder with connection.h file
-        PREFIXES ${ENV_TUNDRA_DEP_PATH})
-    sagase_configure_report (TELEPATHY_GLIB)
-endmacro (configure_telepathy_glib)
-
-macro (configure_telepathy_farsight)
-    sagase_configure_package (TELEPATHY_FARSIGHT
-        NAMES telepathy-farsight Telepathy-Farsight
-        COMPONENTS telepathy-farsight stream # stream added to help sagese to find include folder with stream.h file
-        PREFIXES ${ENV_TUNDRA_DEP_PATH})
-    sagase_configure_report (TELEPATHY_FARSIGHT)
-endmacro (configure_telepathy_farsight)
-
-macro (configure_farsight2)
-    sagase_configure_package (FARSIGHT2
-        NAMES farsight2 farsight2-0.10
-        COMPONENTS gstfarsight fs-interfaces # fs-interfaces added to help sagese to find include folder with fs-interfaces.h file
-        PREFIXES ${ENV_TUNDRA_DEP_PATH}/farsight2)
-    sagase_configure_report (FARSIGHT2)
-endmacro (configure_farsight2)
-
-macro (configure_dbus_glib)
-    sagase_configure_package (DBUS_GLIB
-        NAMES dbus-glib dbus
-        COMPONENTS dbus-glib
-        PREFIXES ${ENV_TUNDRA_DEP_PATH}/dbus-glib)
-    sagase_configure_report (DBUS_GLIB)
-endmacro (configure_dbus_glib)

 macro (configure_openal)
     sagase_configure_package(OPENAL
@@ -433,10 +294,7 @@
     # remove 'NOTFOUND' entry which makes to linking impossible
     if (MSVC)
         list(REMOVE_ITEM OPENSSL_LIBRARIES debug optimized SSL_EAY_RELEASE-NOTFOUND LIB_EAY_RELEASE-NOTFOUND SSL_EAY_DEBUG-NOTFOUND LIB_EAY_DEBUG-NOTFOUND NOTFOUND)
-    message(----------)
-    message(${OPENSSL_LIBRARIES})
-    message(----------)
-    endif ()
+    endif ()
     sagase_configure_report (OPENSSL)
 endmacro (configure_openssl)

@@ -450,7 +308,6 @@
           set (PROTOBUF_INCLUDE_DIRS ${ENV_TUNDRA_DEP_PATH}/protobuf/include)
     endif ()
     sagase_configure_report (PROTOBUF)
-
 endmacro (configure_protobuf)

 macro (configure_celt)
@@ -521,6 +378,11 @@
 endmacro()

 macro(use_package_assimp)
+    # todo: fix this hardcoded thing to a more robust one
+    # make the include and lib consistent with normal projects 'assimp_release_Win32'
+    # magic subfolders are not good...
+    message("** Configuring ASSIMP")
+    message(STATUS "todo: fix use_package_assimp() from hardcoded one to more robust using sagase.")
     if (WIN32)
         if ("$ENV{ASSIMP_DIR}" STREQUAL "")
            set(ASSIMP_DIR ${ENV_TUNDRA_DEP_PATH}/assimp)


we need to depend on flann_cpp not on flann, as we're using FLANN's C++ interface

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

--- cmake/Modules/FindFlann.cmake
+++ cmake/Modules/FindFlann.cmake
@@ -14,7 +14,7 @@
 find_path(FLANN_INCLUDE_DIR flann/flann.hpp
     HINTS ${PC_FLANN_INCLUDEDIR} ${PC_FLANN_INCLUDE_DIRS})

-find_library(FLANN_LIBRARY flann
+find_library(FLANN_LIBRARY flann_cpp
     HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS})

 set(FLANN_INCLUDE_DIRS ${FLANN_INCLUDE_DIR})


Use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR for includes (#267)

Allows including the project using `add_subdirectory` command.

`CMAKE_SOURCE_DIR` always resolves to the top level project, breaking includes.

--- cmake/OpenCensusHelpers.cmake
+++ cmake/OpenCensusHelpers.cmake
@@ -47,11 +47,11 @@
   if(ARG_SRCS)
     add_library(${_NAME} ${ARG_SRCS})
     target_link_libraries(${_NAME} PUBLIC ${ARG_DEPS})
-    target_include_directories(${_NAME} PUBLIC ${CMAKE_SOURCE_DIR})
+    target_include_directories(${_NAME} PUBLIC ${PROJECT_SOURCE_DIR})
   else()
     add_library(${_NAME} INTERFACE)
     target_link_libraries(${_NAME} INTERFACE ${ARG_DEPS})
-    target_include_directories(${_NAME} INTERFACE ${CMAKE_SOURCE_DIR})
+    target_include_directories(${_NAME} INTERFACE ${PROJECT_SOURCE_DIR})
   endif()
   if(ARG_PUBLIC)
     add_library(${PROJECT_NAME}::${NAME} ALIAS ${_NAME})


compiler-warnings: windows: enable -Werror, disable -Wformat

--- cmake/compiler-warnings.cmake
+++ cmake/compiler-warnings.cmake
@@ -1,14 +1,16 @@
 include(CheckCXXCompilerFlagAndEnableIt)

-if(UNIX OR APPLE)
-  # want -Werror to be enabled automatically for me.
-  # but on windows platform, there are warnings still
-  add_definitions(-Werror)
-endif()
+# want -Werror to be enabled automatically for me.
+add_definitions(-Werror)

 CHECK_CXX_COMPILER_FLAG_AND_ENABLE_IT(-Wall)

 CHECK_CXX_COMPILER_FLAG_AND_ENABLE_IT(-Wformat=2)
+
+if(NOT (UNIX OR APPLE))
+  # on windows, resuts in bogus false-positive varnings
+  add_definitions(-Wno-format)
+endif()

 # cleanup this once we no longer need to support gcc-4.9
 # disabled for now, see https://github.com/darktable-org/rawspeed/issues/32


cmake: remove unused FindQJSON.cmake

cmake: remove unused FindQJSON.cmake

--- cmake/modules/FindQJSON.cmake
+++ cmake/modules/FindQJSON.cmake
@@ -1,59 +0,0 @@
-# Find QJSON - JSON handling library for Qt
-#
-# This module defines
-#  QJSON_FOUND - whether the qsjon library was found
-#  QJSON_LIBRARIES - the qjson library
-#  QJSON_INCLUDE_DIR - the include path of the qjson library
-#
-
-if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-
-  # Already in cache
-  set (QJSON_FOUND TRUE)
-
-else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-
-  if (NOT WIN32)
-    set (_pc_qjson_string "QJson")
-    if (QJSON_FIND_VERSION_EXACT)
-      set (_pc_qjson_string "${_pc_qjson_string}=")
-    else (QJSON_FIND_VERSION_EXACT)
-      set (_pc_qjson_string "${_pc_qjson_string}>=")
-    endif (QJSON_FIND_VERSION_EXACT)
-    if (QJSON_FIND_VERSION_COUNT GREATER 0)
-      set (_pc_qjson_string "${_pc_qjson_string}${QJSON_FIND_VERSION}")
-    else (QJSON_FIND_VERSION_COUNT GREATER 0)
-      set (_pc_qjson_string "${_pc_qjson_string}0.5")
-    endif (QJSON_FIND_VERSION_COUNT GREATER 0)
-    # use pkg-config to get the values of QJSON_INCLUDE_DIRS
-    # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
-    include (FindPkgConfig)
-    pkg_check_modules (PC_QJSON ${_pc_qjson_string})
-    set (QJSON_VERSION "${PC_QJSON_VERSION}")
-  endif (NOT WIN32)
-
-  find_library (QJSON_LIBRARIES
-    NAMES
-    qjson
-    PATHS
-    ${PC_QJSON_LIBRARY_DIRS}
-    ${LIB_INSTALL_DIR}
-    ${KDE4_LIB_DIR}
-  )
-
-  find_path (QJSON_INCLUDE_DIR
-    NAMES
-    qjson/parser.h
-    PATHS
-    ${PC_QJSON_INCLUDE_DIRS}
-    ${INCLUDE_INSTALL_DIR}
-    ${KDE4_INCLUDE_DIR}
-  )
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(QJSON
-                                    REQUIRED_VARS QJSON_LIBRARIES QJSON_INCLUDE_DIR
-                                    VERSION_VAR QJSON_VERSION
-  )
-
-endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)


Suppress error directive in cppcheck

Suppress error directive in cppcheck

--- CppcheckTargets.cmake
+++ CppcheckTargets.cmake
@@ -45,7 +45,8 @@
   if(CPPCHECK_FOUND)
     set(_cppcheck_args -I ${CMAKE_SOURCE_DIR}
       --error-exitcode=2 --inline-suppr
-      --suppress=unmatchedSuppression ${CPPCHECK_EXTRA_ARGS})
+      --suppress=unmatchedSuppression --suppress=preprocessorErrorDirective
+      ${CPPCHECK_EXTRA_ARGS})
     set(_input ${ARGN})
     list(FIND _input UNUSED_FUNCTIONS _unused_func)
     if("${_unused_func}" GREATER "-1")
@@ -143,7 +144,8 @@
   if(CPPCHECK_FOUND)
     set(_cppcheck_args -I ${CMAKE_SOURCE_DIR}
       --error-exitcode=2 --inline-suppr
-      --suppress=unmatchedSuppression ${CPPCHECK_EXTRA_ARGS})
+      --suppress=unmatchedSuppression --suppress=preprocessorErrorDirective
+      ${CPPCHECK_EXTRA_ARGS})

     list(FIND ARGN UNUSED_FUNCTIONS _unused_func)
     if("${_unused_func}" GREATER "-1")


Linking against the interface library also for the static variant

--- Code/cmake/Modules/RDKitUtils.cmake
+++ Code/cmake/Modules/RDKitUtils.cmake
@@ -38,7 +38,8 @@
   CDR(RDKLIB_SOURCES ${RDKLIB_DEFAULT_ARGS})
   if(MSVC)
     add_library(${RDKLIB_NAME} ${RDKLIB_SOURCES})
-    target_link_libraries(${RDKLIB_NAME} ${Boost_SYSTEM_LIBRARY} )
+    target_link_libraries(${RDKLIB_NAME} PUBLIC rdkit_base)
+    target_link_libraries(${RDKLIB_NAME} PUBLIC ${Boost_SYSTEM_LIBRARY} )
     INSTALL(TARGETS ${RDKLIB_NAME} EXPORT ${RDKit_EXPORTED_TARGETS}
             DESTINATION ${RDKit_LibDir}/${RDKLIB_DEST}
             COMPONENT dev )
@@ -48,11 +49,13 @@
     # boundaries. As of now (June 2010), this doesn't work
     # with g++ unless libraries are shared.
       add_library(${RDKLIB_NAME} SHARED ${RDKLIB_SOURCES})
+      target_link_libraries(${RDKLIB_NAME} PUBLIC rdkit_base)
       INSTALL(TARGETS ${RDKLIB_NAME} EXPORT ${RDKit_EXPORTED_TARGETS}
               DESTINATION ${RDKit_LibDir}/${RDKLIB_DEST}
               COMPONENT runtime )
       if(RDK_INSTALL_STATIC_LIBS)
         add_library(${RDKLIB_NAME}_static ${RDKLIB_SOURCES})
+        target_link_libraries(${RDKLIB_NAME}_static PUBLIC rdkit_base)
         INSTALL(TARGETS ${RDKLIB_NAME}_static EXPORT ${RDKit_EXPORTED_TARGETS}
                 DESTINATION ${RDKit_LibDir}/${RDKLIB_DEST}
                 COMPONENT dev )
@@ -78,7 +81,6 @@
                         ARCHIVE_OUTPUT_DIRECTORY ${RDK_ARCHIVE_OUTPUT_DIRECTORY}
                         RUNTIME_OUTPUT_DIRECTORY ${RDK_RUNTIME_OUTPUT_DIRECTORY}
                         LIBRARY_OUTPUT_DIRECTORY ${RDK_LIBRARY_OUTPUT_DIRECTORY})
-  target_link_libraries(${RDKLIB_NAME} PUBLIC rdkit_base)
 endmacro(rdkit_library)

 macro(rdkit_headers)


update FindVc to correctly find as

update FindVc to correctly find as

--- cmake/FindVc.cmake
+++ cmake/FindVc.cmake
@@ -9,6 +9,8 @@
 #
 # Additionally it will set some defines to match the capabilities of your
 # compiler/assembler
+
+include (MacroEnsureVersion)

 if(NOT DEFINED VC_INSTALL_PREFIX OR NOT VC_INSTALL_PREFIX)
    # we have to search for Vc ourself
@@ -24,11 +26,16 @@
    set(VC_FOUND true)

    if(CMAKE_COMPILER_IS_GNUCXX)
-      find_program(_binutils_as as)
+      exec_program(${CMAKE_C_COMPILER} ARGS -print-prog-name=as OUTPUT_VARIABLE _binutils_as)
       if(NOT _binutils_as)
-         message(WARNING "Could not find 'as', the assembler normally used by GCC. Hoping everything will work out...")
+         message(WARNING "Could not find 'as', the assembler used by GCC. Hoping everything will work out...")
       else(NOT _binutils_as)
-         exec_program(${_binutils_as} ARGS --version OUTPUT_VARIABLE _as_version)
+         if(APPLE)
+            # it's not really binutils, but it'll give us the assembler version which is what we want
+            exec_program(${_binutils_as} ARGS -v /dev/null OUTPUT_VARIABLE _as_version)
+         else(APPLE)
+            exec_program(${_binutils_as} ARGS --version OUTPUT_VARIABLE _as_version)
+         endif(APPLE)
          string(REGEX REPLACE "\\([^\\)]*\\)" "" _as_version "${_as_version}")
          string(REGEX MATCH "[1-9]\\.[0-9]+(\\.[0-9]+)?" _as_version "${_as_version}")
          macro_ensure_version("2.18.93" "${_as_version}" _as_good)
@@ -37,6 +44,7 @@
             add_definitions(-DVC_NO_XGETBV) # old assembler doesn't know the xgetbv instruction
          endif(NOT _as_good)
       endif(NOT _binutils_as)
+      mark_as_advanced(_binutils_as)
    elseif(MSVC)
       # MSVC does not support inline assembly on 64 bit! :(
       # searching the help for xgetbv doesn't turn up anything. So just fall back to not supporting AVX on Windows :(


Add defaults for SBGEMV kernels

Add defaults for SBGEMV kernels

--- cmake/kernel.cmake
+++ cmake/kernel.cmake
@@ -134,6 +134,8 @@
   set(SHSWAPKERNEL ../arm/swap.c)
   set(TOBF16KERNEL ../x86_64/tobf16.c)
   set(BF16TOKERNEL ../x86_64/bf16to.c)
+  set(SBGEMVNKERNEL ../x86_64/sbgemv_n.c)
+  set(SBGEMVTKERNEL ../x86_64/sbgemv_t.c)
 endif ()
 endmacro ()


CMake/VS: Fix 64 bit detection include cleanups

[ ] May break build
[ ] Breaks existing applications
[x] Bugfix
[ ] New Feature
[ ] Cleanup
[ ] Optimization
[ ] Documentation

--- copyScript.cmake
+++ copyScript.cmake
@@ -8,11 +8,14 @@
         set(COPY_TARGET_RELEASE_TYPE Release CACHE STRING "Release configuration to copy (Release, RelWithDebInfo, MinSizeRel)")
     endif(NOT COPY_TARGET_RELEASE_TYPE)

-    if(CMAKE_SIZEOF_VOID_P MATCHES "8")
+    if(NOT CMAKE_GENERATOR)
+        message(FATAL_ERROR "CMAKE_GENERATOR not set")
+    endif()
+    if("${CMAKE_GENERATOR}" MATCHES "Win64")
         set(PLATFORM_TYPE "x64\\")
-    else(CMAKE_SIZEOF_VOID_P MATCHES "8")
+    else()
         set(PLATFORM_TYPE "Win32\\")
-    endif(CMAKE_SIZEOF_VOID_P MATCHES "8")
+    endif()

     set(WIN_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
     FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR} WIN_BIN_DIR)


Build: fix iOS build

Build: fix iOS build

--- GenerateConfigH.cmake
+++ GenerateConfigH.cmake
@@ -3,7 +3,11 @@
 include(CheckCxxHashset)
 include(CheckCxxHashmap)

-check_include_files("pthread.h" HAVE_PTHREAD)
+if(IOS)
+	SET(HAVE_PTHREAD 1)
+else()
+	check_include_files("pthread.h" HAVE_PTHREAD)
+endif()

 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   include(CheckIncludeFileCXX)


ERR: Accidently committed my LocalUserOptions file

--- Examples/GUI/Win32/vtkMFC/LocalUserOptions.cmake
+++ Examples/GUI/Win32/vtkMFC/LocalUserOptions.cmake
@@ -1,3 +0,0 @@
-SET(VTK_BINARY_PATH "$ENV{WORKSPACE}/cmakebuild/vtkmsvc" CACHE string "This is where I keep it")
-SET(USE_VTK_FILE "${VTK_BINARY_PATH}/UseVTK.cmake")
-SET(WE_ARE_HERE "dummy")


Do not set CMAKE_MODULE_PATH in a cmake find module since it can break

--- core/cmake/FindMulaCore.cmake
+++ core/cmake/FindMulaCore.cmake
@@ -32,8 +32,6 @@
     NAMES
     include/mula
 )
-
-set(CMAKE_MODULE_PATH ${MULA_INSTALL_PREFIX}/share/mula/cmake)

 find_package(Qt4 ${_mulaCoreReq})


remove Clang warnings with unused arch arguments.

This is duplicating code from compiler flag checking that was once
added (then reverted to CMake) as the problem seem to be on the
clang side as detailed in:
http://public.kitware.com/Bug/view.php?id=13194

I also tried to remove a similar warning with pthreads but there
is also an issue on the clang side:
https://llvm.org/bugs/show_bug.cgi?id=7798

Change-Id: I5b0061f0f71e49b493c5ee0c98f70533c28164bd

--- cmake/cpu.cmake
+++ cmake/cpu.cmake
@@ -88,6 +88,23 @@
         unset(HAS_COMPILE_FLAG CACHE)
         check_c_compiler_flag(${SIMD_COMPILE_FLAG} HAS_COMPILE_FLAG)
         if(HAS_COMPILE_FLAG)
+          # Do one more check for Clang to circumvent CMake issue 13194.
+          if(COMMAND check_compiler_flag_common_patterns)
+            # Only in CMake 3.0 and above.
+            check_compiler_flag_common_patterns(COMMON_PATTERNS)
+          else()
+            set(COMMON_PATTERNS)
+          endif()
+          set(CMAKE_REQUIRED_DEFINITIONS ${SIMD_COMPILE_FLAG})
+          check_c_source_compiles("int main(void) {return 0;}" FLAG2
+            FAIL_REGEX "warning: argument unused during compilation:"
+            ${COMMON_PATTERNS}
+          )
+          if(NOT FLAG2)
+            unset(HAS_COMPILE_FLAG CACHE)
+          endif()
+        endif()
+        if(HAS_COMPILE_FLAG)
           set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SIMD_COMPILE_FLAG}")
         endif()
       endif()


Restore RUN_SERIAL specs

Restore RUN_SERIAL specs

--- testing/adios2/engine/staging-common/TestSupp.cmake
+++ testing/adios2/engine/staging-common/TestSupp.cmake
@@ -120,10 +120,10 @@
 # Test if writer will survive readers departing unexpectedly
 set (KillReadersSerialized.3x2_CMD "run_test.py --test_protocol kill_readers  -nw 3 -nr 2 --max_readers 1 --warg=RendezvousReaderCount=0,WENGINE_PARAMS --rarg=--ignore_time_gap")
 set (KillReadersSerialized.3x2_TIMEOUT "300")
-#set (KillReadersSerialized.3x2_PROPERTIES "RUN_SERIAL;1")
+set (KillReadersSerialized.3x2_PROPERTIES "RUN_SERIAL;1")
 set (KillReaders3Max.3x6_CMD "run_test.py --test_protocol kill_readers  -nw 3 -nr 2 --max_readers 3 --warg=RendezvousReaderCount=0,WENGINE_PARAMS --rarg=--ignore_time_gap")
 set (KillReaders3Max.3x6_TIMEOUT "300")
-#set (KillReaders3Max.3x6_PROPERTIES "RUN_SERIAL;1")
+set (KillReaders3Max.3x6_PROPERTIES "RUN_SERIAL;1")

 set (KillWriter_2x2_CMD "run_test.py --test_protocol kill_writer   -nw 2 -nr 2 --interval 10 --warg=RendezvousReaderCount=1,WENGINE_PARAMS --rarg=--expect_writer_failure --rarg=--num_steps --rarg=1000")
 set (KillWriterTimeout_2x2_CMD "run_test.py --test_protocol kill_writer -nw 2 -nr 2 --interval 10 --warg=RendezvousReaderCount=1,WENGINE_PARAMS --rarg=--expect_writer_failure --rarg=--num_steps --rarg=1000 --rarg=--non_blocking")
@@ -131,23 +131,23 @@
 set (PreciousTimestep.3x2_CMD "run_test.py --test_protocol kill_readers  -nw 3 -nr 2 --max_readers 2 --warg=FirstTimestepPrecious=True,RendezvousReaderCount=0,WENGINE_PARAMS --rarg=--ignore_time_gap --rarg=--precious_first")

 set (PreciousTimestep.3x2_TIMEOUT "300")
-#set (PreciousTimestep.3x2_PROPERTIES "RUN_SERIAL;1")
+set (PreciousTimestep.3x2_PROPERTIES "RUN_SERIAL;1")

 set (PreciousTimestepDiscard.3x2_CMD "run_test.py --test_protocol kill_readers  -nw 3 -nr 2 --max_readers 2 --warg=FirstTimestepPrecious=On,RendezvousReaderCount=0,QueueLimit=3,QueueFullPolicy=discard,WENGINE_PARAMS --rarg=--ignore_time_gap --rarg=--precious_first --rarg=--discard --warg=--ms_delay --warg=500")
 set (PreciousTimestepDiscard.3x2_TIMEOUT "300")
-#set (PreciousTimestepDiscard.3x2_PROPERTIES "RUN_SERIAL;1")
+set (PreciousTimestepDiscard.3x2_PROPERTIES "RUN_SERIAL;1")

 # Readers using BeginStep with timeout.  Here we run the writer with a longer delay to make the reader timeout
 set (TimeoutReader.1x1_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --rarg=--non_blocking --warg=--ms_delay --warg=2000")
 set (TimeoutReader.1x1_TIMEOUT "60")
-#set (TimeoutReader.1x1_PROPERTIES "RUN_SERIAL;1")
+set (TimeoutReader.1x1_PROPERTIES "RUN_SERIAL;1")

 # Readers using LatestAvailable   Writer runs faster than reader, so we expect misses
 set (LatestReader.1x1_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --warg=--ms_delay --warg=250 --rarg=--latest --rarg=--long_first_delay")
-#set (LatestReader.1x1_PROPERTIES "RUN_SERIAL;1")
+set (LatestReader.1x1_PROPERTIES "RUN_SERIAL;1")

 set (LatestReaderHold.1x1_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --warg=--ms_delay --warg=250 --rarg=--latest --rarg=--long_first_delay --rarg=--delay_while_holding")
-#set (LatestReaderHold.1x1_PROPERTIES "RUN_SERIAL;1")
+set (LatestReaderHold.1x1_PROPERTIES "RUN_SERIAL;1")

 # A faster writer and a queue policy that will cause timesteps to be discarded
 set (DiscardWriter.1x1_CMD "run_test.py --test_protocol one_client -nw 1 -nr 1 --warg=--engine_params --warg=QueueLimit=1,QueueFullPolicy=discard,WENGINE_PARAMS --warg=--ms_delay --warg=250 --rarg=--discard")


Changing remote queue submission URL to http:.

--- test/remote/RunRemoteTest.cmake
+++ test/remote/RunRemoteTest.cmake
@@ -34,7 +34,7 @@
 set (svn "${SVN_EXECUTABLE}")

 # SVN path for submissions
-set (svn_path "svn://zorbatest.lambda.nu/zorbatest/remotequeue")
+set (svn_path "http://zorbatest.lambda.nu:8080/svn/zorbatest/remotequeue")

 # Figure out what directory we're running in
 get_filename_component (cwd ${CMAKE_CURRENT_LIST_FILE} PATH)


include/clang/Config/config.h.cmake: Reorder and reword to follow (generated) llvm/Config/config.h.in.

git-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@137415 91177308-0d34-0410-b5e6-96231b3b80d8

--- include/clang/Config/config.h.cmake
+++ include/clang/Config/config.h.cmake
@@ -1,3 +1,6 @@
+/* Bug report URL. */
+#define BUG_REPORT_URL "${BUG_REPORT_URL}"
+
 /* Relative directory for resource files */
 #define CLANG_RESOURCE_DIR "${CLANG_RESOURCE_DIR}"

@@ -13,8 +16,5 @@
 /* Directory with the libstdc++ headers. */
 #define CXX_INCLUDE_ROOT "${CXX_INCLUDE_ROOT}"

-/* Directories clang will search for headers. */
+/* Directories clang will search for headers */
 #define C_INCLUDE_DIRS "${C_INCLUDE_DIRS}"
-
-/* Define default bug reporting URL. */
-#define BUG_REPORT_URL "${BUG_REPORT_URL}"


extend the timeout to 25 minutes, some of the higher cert test cases take longer than 15 minutes to finish

--- reg_tests/CTestList.cmake
+++ reg_tests/CTestList.cmake
@@ -7,8 +7,8 @@
   add_test(
     ${testname} python ${CMAKE_CURRENT_SOURCE_DIR}/executeRegressionTestCase.py ${testname} ${CMAKE_BINARY_DIR}/glue-codes/fast/openfast ${CMAKE_SOURCE_DIR} ${TOLERANCE} ${CMAKE_SYSTEM_NAME} ${CMAKE_Fortran_COMPILER_ID}
   )
-  # limit each test to ~15 minutes: 1000s
-  set_tests_properties(${testname} PROPERTIES TIMEOUT 1000 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" LABELS "regression")
+  # limit each test to 25 minutes: 1500s
+  set_tests_properties(${testname} PROPERTIES TIMEOUT 1500 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" LABELS "regression")
 endfunction(add_test_r)

 #===============================================================================


CMake output of bundle filename as non-blocking STATUS message

--- Superbuild/Projects/veloview.bundle.common.cmake
+++ Superbuild/Projects/veloview.bundle.common.cmake
@@ -45,4 +45,4 @@
   set(CPACK_PACKAGE_FILE_NAME
       "${CPACK_PACKAGE_NAME}-${VV_VERSION_FULL}-${package_suffix}")
 endif()
-message("Bundled package name will be: ${CPACK_PACKAGE_FILE_NAME}" )
+message(STATUS "Bundled package name will be: ${CPACK_PACKAGE_FILE_NAME}" )


correct output for version mismatch in conan_check #131 (#132)

--- conan.cmake
+++ conan.cmake
@@ -520,9 +520,9 @@
         string(REGEX MATCH ".*Conan version ([0-9]+\.[0-9]+\.[0-9]+)" FOO
             "${CONAN_VERSION_OUTPUT}")
         if(${CMAKE_MATCH_1} VERSION_LESS ${CONAN_VERSION})
-            message(FATAL_ERROR "Conan outdated. Installed: ${CONAN_VERSION}, \
-                required: ${CONAN_VERSION_REQUIRED}. Consider updating via 'pip \
-                install conan --upgrade'.")
+            message(FATAL_ERROR "Conan outdated. Installed: ${CMAKE_MATCH_1}, \
+                required: ${CONAN_VERSION}. Consider updating via 'pip \
+                install conan==${CONAN_VERSION}'.")
         endif()
     endif()
 endmacro()


fix osx compilation

fix osx compilation

--- Toolchain-macos.cmake
+++ Toolchain-macos.cmake
@@ -2,6 +2,9 @@
 SET(CMAKE_FIND_ROOT_PATH
   /usr/local
 )
+
+SET(CMAKE_C_COMPILER gcc-4.8)
+SET(CMAKE_CXX_COMPILER g++-4.8)

 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search


Fix RS_CANONICAL_HOST definition

Fix RS_CANONICAL_HOST definition

--- config.h.cmake
+++ config.h.cmake
@@ -115,7 +115,7 @@
 #define PACKAGE "${PROJECT_NAME}"

 /* Canonical GNU hostname */
-#cmakedefine RS_CANONICAL_HOST "${SITE_NAME}"
+#define RS_CANONICAL_HOST "${SITE_NAME}"

 /* The size of `long', as computed by sizeof. */
 #cmakedefine SIZEOF_LONG ${SIZEOF_LONG}


SVN_SILENT made messages (.desktop file)

--- plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake
+++ plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Custom account configuration user interface for accounts using the sipe connection manager.
+Comment[bs]=Korisnički interfejs za konfiguraciju korisničkih naloga koristeći sipzmenadžer konekcja.
 Comment[ca]=Interfície d'usuari de configuració de compte personalitzat per comptes que utilitzen el gestor de connexions Sipe.
 Comment[cs]=Vlastní uživatelské rozhraní nastavení účtů pro účty používající správce spojení sipe.
 Comment[de]=Eigene Benutzeroberfläche zum Einrichten von Zugängen, die die Sipe-Verbindungsverwaltung verwenden.
@@ -19,6 +20,7 @@
 Comment[x-test]=xxCustom account configuration user interface for accounts using the sipe connection manager.xx
 Icon=blockdevice
 Name=Sipe Account Configuration User Interface
+Name[bs]=Korisnički interfejs za konfiguraciju korisničkih naloga Sipe
 Name[ca]=Interfície d'usuari de configuració de compte de Sipe
 Name[cs]=Uživatelské rozhraní nastavení účtu Sipe
 Name[de]=Benutzeroberfläche zur Einrichtung von Sipe-Zugängen


tests: Fix ctest default script

tests: Fix ctest default script

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

--- tests/ctest-default.cmake
+++ tests/ctest-default.cmake
@@ -62,10 +62,10 @@
 ctest_configure(BUILD ${CTEST_BINARY_DIRECTORY})
 ctest_build(BUILD ${CTEST_BINARY_DIRECTORY})
 ctest_test(BUILD ${CTEST_BINARY_DIRECTORY})
-if (WITH_MEMCHECK AND CTEST_COVERAGE_COMMAND)
+if (WITH_COVERAGE)
   ctest_coverage(BUILD ${CTEST_BINARY_DIRECTORY})
-endif (WITH_MEMCHECK AND CTEST_COVERAGE_COMMAND)
-if (WITH_MEMCHECK AND CTEST_MEMORYCHECK_COMMAND)
+endif ()
+if (WITH_MEMCHECK)
   ctest_memcheck(BUILD ${CTEST_BINARY_DIRECTORY})
-endif (WITH_MEMCHECK AND CTEST_MEMORYCHECK_COMMAND)
+endif ()
 ctest_submit()


fix ctest makeopts

fix ctest makeopts

The argument after TARGET is the target to build and we abused it to
specify build flags. This fails on windows. With cmake 3.3 there is an
argument FLAGS <flags>, but older versions grab CTEST_BUILD_FLAGS, so
this is where we put the flags now.

--- tests/run_testsuite.cmake
+++ tests/run_testsuite.cmake
@@ -472,7 +472,8 @@
   # Only run the build stage if configure was successful:

   MESSAGE("-- Running CTEST_BUILD()")
-  CTEST_BUILD(TARGET ${MAKEOPTS} NUMBER_ERRORS _res)
+  SET(CTEST_BUILD_FLAGS "${MAKEOPTS}")
+  CTEST_BUILD(NUMBER_ERRORS _res)

   IF("${_res}" STREQUAL "0")
     # Only run tests if the build was successful:


STYLE: remove debug status message in CMake/FindFLTK.cmake

--- CMake/FindFLTK.cmake
+++ CMake/FindFLTK.cmake
@@ -329,7 +329,7 @@
   SET (FLTK_LIBRARY ${FLTK_LIBRARIES})
 ENDIF(FLTK_FOUND)

-MESSAGE(STATUS "In (otb)FindFLTK.cmake FLTK_INCLUDE_DIR = ${FLTK_INCLUDE_DIR}")
-MESSAGE(STATUS "In (otb)FindFLTK.cmake FLTK_LIBRARIES = ${FLTK_LIBRARIES}")
-MESSAGE(STATUS "In (otb)FindFLTK.cmake FLTK_FLUID_EXECUTABLE = ${FLTK_FLUID_EXECUTABLE}")
-MESSAGE(STATUS "In (otb)FindFLTK.cmake FLTK_WRAP_UI = ${FLTK_WRAP_UI}")
+#MESSAGE(STATUS "In (otb)FindFLTK.cmake FLTK_INCLUDE_DIR = ${FLTK_INCLUDE_DIR}")
+#MESSAGE(STATUS "In (otb)FindFLTK.cmake FLTK_LIBRARIES = ${FLTK_LIBRARIES}")
+#MESSAGE(STATUS "In (otb)FindFLTK.cmake FLTK_FLUID_EXECUTABLE = ${FLTK_FLUID_EXECUTABLE}")
+#MESSAGE(STATUS "In (otb)FindFLTK.cmake FLTK_WRAP_UI = ${FLTK_WRAP_UI}")


Removed package dependencies

Removed package dependencies

--- CMake/Packages.cmake
+++ CMake/Packages.cmake
@@ -14,12 +14,18 @@
     set(PACKAGE_TYPE "deb")
     set(PACKAGE_ITERATION "1.ubuntu")
     set(PACKAGE_DEPENDENCIES
-      "libc6 (>=2.15)"
       "zlib1g"
       "libbz2-1.0"
-      "libapt-pkg4.12"
       "libreadline6"
     )
+    if(NOT OSQUERY_BUILD_DISTRO STREQUAL "lucid")
+      set(PACKAGE_ITERATION "1.ubuntu10")
+      set(PACKAGE_DEPENDENCIES
+        "${PACKAGE_DEPENDENCIES}"
+        "libc6 (>=2.15)"
+        "libapt-pkg4.12"
+      )
+    endif()
     if(OSQUERY_BUILD_DISTRO STREQUAL "precise")
       set(PACKAGE_ITERATION "1.ubuntu12")
       set(PACKAGE_DEPENDENCIES


disabled logging by default

disabled logging by default

--- CMake/logtrace.cmake
+++ CMake/logtrace.cmake
@@ -12,7 +12,7 @@
 # enable logging in general
  -DPKFXLOG
 # all logging enabled
- -DSKV_LOGGING_ALL=1
+# -DSKV_LOGGING_ALL=1

 # general detailed logging
 # -DSKV_DISTRIBUTION_MANAGER_LOG=1
@@ -30,7 +30,7 @@
 # -DSKV_SERVER_ACTIVE_BCAST_COMMAND_SM_LOG=1
 # -DSKV_SERVER_BUFFER_AND_COMMAND_LOG=1
 # -DSKV_SERVER_CLEANUP_LOG=1
- -DSKV_SERVER_CLIENT_CONN_EST_LOG=1
+# -DSKV_SERVER_CLIENT_CONN_EST_LOG=1
 # -DSKV_SERVER_COMMAND_DISPATCH_LOG=1
 # -DSKV_SERVER_COMMAND_POLLING_LOG=1
 # -DSKV_SERVER_COMMAND_TRANSIT_LOG=1
@@ -92,6 +92,10 @@
 # logging in tests
 # activate inner-loop logging for test programm
 # -DSKV_TEST_LOG=1
+
+
+
+
 )

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


ql: cmake: don't install lib files for for ql-pp3e and ql-eos-s3

Signed-off-by: Paweł Czarnecki <be3a62494a976d1435cc0900bd9adf3fa1029787@antmicro.com>

--- quicklogic/common/cmake/quicklogic_install.cmake
+++ quicklogic/common/cmake/quicklogic_install.cmake
@@ -209,9 +209,13 @@
           DESTINATION "share/symbiflow/arch/${DEVICE}_${PACKAGE}"
           RENAME "arch_${DEVICE}_${PACKAGE}.xml")

-  # install lib files
-  install(DIRECTORY ${QLF_FPGA_DATABASE_DIR}/${FAMILY}/lib/
-          DESTINATION "share/symbiflow/arch/${DEVICE}_${PACKAGE}/lib")
+  if(NOT "${DEVICE}" STREQUAL "ql-pp3e" AND NOT "${DEVICE}" STREQUAL "ql-eos-s3")
+	  # install lib files
+	  install(DIRECTORY ${QLF_FPGA_DATABASE_DIR}/${FAMILY}/lib/
+		  DESTINATION "share/symbiflow/arch/${DEVICE}_${PACKAGE}/lib")
+  else()
+	  message(status ": workaround: skipping lib install for ${DEVICE} device")
+  endif()

   # Install device-specific cells sim and cells map files
   get_target_property(CELLS_SIM ${DEVICE_TYPE} CELLS_SIM)


Rename zend_path to PHP_ZEND_DIR

Rename zend_path to PHP_ZEND_DIR

--- library/cmake/Modules/FindPHP.cmake
+++ library/cmake/Modules/FindPHP.cmake
@@ -101,11 +101,11 @@
 set(PHP_ZEND_COMPONENT_FOUND FALSE)
 set(PHP_ZEND_COMPONENT_ACCPETED TRUE)
 if(PHP_USE_ZEND_COMPONENT)
-	FIND_PATH(zend_path
+	FIND_PATH(PHP_ZEND_DIR
 		NAMES "zend.h"
 		PATHS ${PHP_INCLUDE_DIRS}
 	)
-	if(zend_path)
+	if(PHP_ZEND_DIR)
 		set(PHP_ZEND_COMPONENT_FOUND TRUE)
 	else()
 		set(PHP_ZEND_COMPONENT_ACCPETED FALSE)


Better documentation

Better documentation

--- modules/custom_color_messages.cmake
+++ modules/custom_color_messages.cmake
@@ -1,4 +1,24 @@
-# http://stackoverflow.com/a/19578320
+#.rst:
+#
+# Colorize CMake output.
+# Code was found on StackOverflow: http://stackoverflow.com/a/19578320
+#
+# Usage within CMake code
+#   message("This is normal")
+#   message("${Red}This is Red${ColourReset}")
+#   message("${Green}This is Green${ColourReset}")
+#   message("${Yellow}This is Yellow${ColourReset}")
+#   message("${Blue}This is Blue${ColourReset}")
+#   message("${Magenta}This is Magenta${ColourReset}")
+#   message("${Cyan}This is Cyan${ColourReset}")
+#   message("${White}This is White${ColourReset}")
+#   message("${BoldRed}This is BoldRed${ColourReset}")
+#   message("${BoldGreen}This is BoldGreen${ColourReset}")
+#   message("${BoldYellow}This is BoldYellow${ColourReset}")
+#   message("${BoldBlue}This is BoldBlue${ColourReset}")
+#   message("${BoldMagenta}This is BoldMagenta${ColourReset}")
+#   message("${BoldCyan}This is BoldCyan${ColourReset}")
+#   message("${BoldWhite}This is BoldWhite\n\n${ColourReset}")

 if(NOT WIN32)
   string(ASCII 27 Esc)
@@ -19,19 +39,3 @@
   set(BoldCyan    "${Esc}[1;36m")
   set(BoldWhite   "${Esc}[1;37m")
 endif()
-
-#message("This is normal")
-#message("${Red}This is Red${ColourReset}")
-#message("${Green}This is Green${ColourReset}")
-#message("${Yellow}This is Yellow${ColourReset}")
-#message("${Blue}This is Blue${ColourReset}")
-#message("${Magenta}This is Magenta${ColourReset}")
-#message("${Cyan}This is Cyan${ColourReset}")
-#message("${White}This is White${ColourReset}")
-#message("${BoldRed}This is BoldRed${ColourReset}")
-#message("${BoldGreen}This is BoldGreen${ColourReset}")
-#message("${BoldYellow}This is BoldYellow${ColourReset}")
-#message("${BoldBlue}This is BoldBlue${ColourReset}")
-#message("${BoldMagenta}This is BoldMagenta${ColourReset}")
-#message("${BoldCyan}This is BoldCyan${ColourReset}")
-#message("${BoldWhite}This is BoldWhite\n\n${ColourReset}")


Adding a hint for OpenSSL (macOS)

Adding a hint for OpenSSL (macOS)

--- cpp-driver/cmake/modules/FindOpenSSL.cmake
+++ cpp-driver/cmake/modules/FindOpenSSL.cmake
@@ -77,6 +77,7 @@
   unset(_programfiles)
 else ()
   set(_OPENSSL_ROOT_HINTS
+    /usr/local/opt/openssl
     ${OPENSSL_ROOT_DIR}
     ENV OPENSSL_ROOT_DIR
     )


Use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR

--- conan.cmake
+++ conan.cmake
@@ -191,7 +191,7 @@

     execute_process(COMMAND ${conan_command} ${conan_args}
                      RESULT_VARIABLE return_code
-                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+                     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

     if(NOT "${return_code}" STREQUAL "0")
       message(FATAL_ERROR "Conan install failed='${return_code}'")
@@ -214,9 +214,9 @@
 function(conan_cmake_generate_conanfile)
   # Generate, writing in disk a conanfile.txt with the requires, options, and imports
   # specified as arguments
-  # This will be considered as temporary file, generated in CMAKE_BINARY_DIR
+  # This will be considered as temporary file, generated in CMAKE_CURRENT_BINARY_DIR
   parse_arguments(${ARGV})
-  set(_FN "${CMAKE_BINARY_DIR}/conanfile.txt")
+  set(_FN "${CMAKE_CURRENT_BINARY_DIR}/conanfile.txt")

   file(WRITE ${_FN} "[generators]\ncmake\n\n[requires]\n")
   foreach(ARG ${ARGUMENTS_REQUIRES})
@@ -243,11 +243,11 @@
     endif()
     # Checks for the existence of conanbuildinfo.cmake, and loads it
     # important that it is macro, so variables defined at parent scope
-    if(EXISTS "${CMAKE_BINARY_DIR}/${_CONANBUILDINFO}")
+    if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${_CONANBUILDINFO}")
       message(STATUS "Conan: Loading ${_CONANBUILDINFO}")
-      include(${CMAKE_BINARY_DIR}/${_CONANBUILDINFO})
-    else()
-      message(FATAL_ERROR "${_CONANBUILDINFO} doesn't exist in ${CMAKE_BINARY_DIR}")
+      include(${CMAKE_CURRENT_BINARY_DIR}/${_CONANBUILDINFO})
+    else()
+      message(FATAL_ERROR "${_CONANBUILDINFO} doesn't exist in ${CMAKE_CURRENT_BINARY_DIR}")
     endif()
 endmacro()


properly enable incermental linking on release builds, remove non working "/IGNORE:4099" the linker itself ignores /IGNORE:4099

--- indra/cmake/00-Common.cmake
+++ indra/cmake/00-Common.cmake
@@ -51,7 +51,10 @@
   set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 /Oi /Ot /GF /Gy /arch:SSE2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
       CACHE STRING "C++ compiler release options" FORCE)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE /INCREMENTAL /IGNORE:4099")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE"
+      CACHE STRING "Flags used by the linker during all builds" FORCE)
+  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:YES"
+      CACHE STRING "Flags used by the linker during release builds" FORCE)

   set(CMAKE_CXX_STANDARD_LIBRARIES "")


Add an additional hint for opencascade

Add an additional hint for opencascade

--- cmake/modules/FindOPENCASCADE.cmake
+++ cmake/modules/FindOPENCASCADE.cmake
@@ -34,6 +34,7 @@
 SET_IF_EMPTY(OPENCASCADE_DIR "$ENV{OPENCASCADE_DIR}")
 SET_IF_EMPTY(OPENCASCADE_DIR "$ENV{OCC_DIR}")
 SET_IF_EMPTY(OPENCASCADE_DIR "$ENV{OCE_DIR}")
+SET_IF_EMPTY(OPENCASCADE_DIR "$ENV{CASROOT}")

 DEAL_II_FIND_PATH(OPENCASCADE_INCLUDE_DIR Standard_Version.hxx


[cmake] Remove stdlib-experimental from the default install components.

These are mostly private stdlib APIs. It doesn't really make sense to install
private stdlib APIs by default.

--- cmake/modules/SwiftComponents.cmake
+++ cmake/modules/SwiftComponents.cmake
@@ -84,6 +84,7 @@
 else()
   list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-xpc-service")
 endif()
+list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "stdlib-experimental")

 macro(swift_configure_components)
   # Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D


Always allow builds of submodules

Always allow builds of submodules

--- cmake/modules/hunter_download.cmake
+++ cmake/modules/hunter_download.cmake
@@ -467,6 +467,18 @@
     set(allow_builds FALSE)
   endif()

+  # Always allow builds of submodules
+  get_property(submodule_projects GLOBAL PROPERTY HUNTER_SUBMODULE_PROJECTS)
+  if(submodule_projects)
+    list(FIND submodule_projects "${HUNTER_PACKAGE_NAME}" submodule_found)
+    if(NOT submodule_found EQUAL -1)
+      set(allow_builds TRUE)
+      if(hunter_has_component)
+        hunter_internal_error("Submodule with components")
+      endif()
+    endif()
+  endif()
+
   if(NOT allow_builds AND HUNTER_PACKAGE_SCHEME_INSTALL)
     hunter_fatal_error(
         "Building package from source is disabled (dir: ${HUNTER_PACKAGE_HOME_DIR})"


stopping cxxopts tests/examples from being built by defualt; should fix circle build

--- cmake/mtao_fetch_dependencies.cmake
+++ cmake/mtao_fetch_dependencies.cmake
@@ -100,6 +100,8 @@
 endif()

+option(CXXOPTS_BUILD_EXAMPLES "Set to ON to build cxxopts examples" OFF)
+option(CXXOPTS_BUILD_TESTS "Set to ON to build cxxopts tests" OFF)
 find_package(cxxopts 2.2.0 QUIET)
 if(NOT cxxopts_FOUND)
     fetch_dep(cxxopts https://github.com/jarro2783/cxxopts v2.2.0 ON)


Added OpenSSL versions 1.1.1h and 1.1.1i (#326)

* Added hunter versions for OpenSSL 1.1.1h and 1.1.1i

* Changed URLs for OpenSSL 1.1.1i and 1.1.1h to Github archive URLs

--- cmake/projects/OpenSSL/hunter.cmake
+++ cmake/projects/OpenSSL/hunter.cmake
@@ -86,6 +86,28 @@
     "https://github.com/cpp-pm/openssl/archive/v1.1.1g-p0.tar.gz"
     SHA1
     fb3bc6467d37f7536f5ff7a1ea25552cee899275
+)
+
+hunter_add_version(
+    PACKAGE_NAME
+    OpenSSL
+    VERSION
+    "1.1.1h"
+    URL
+    "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1h.tar.gz"
+    SHA1
+    e581875cc63a29a2e9ae6924f5e65fd79dd3fc2e
+)
+
+hunter_add_version(
+    PACKAGE_NAME
+    OpenSSL
+    VERSION
+    "1.1.1i"
+    URL
+    "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz"
+    SHA1
+    b1fcae20e23561f3ad02c61c80ba10d8790e3034
 )

 hunter_add_version(


[cmake] kernel requires linking to BLAS and LAPACK

Fixes #238.

--- cmake/siconos_find_common_dep.cmake
+++ cmake/siconos_find_common_dep.cmake
@@ -6,8 +6,8 @@

 # --- Blas Lapack ---
 # include(BlasLapackSetup)
-compile_with(BLAS REQUIRED SICONOS_COMPONENTS numerics externals)
-compile_with(LAPACK REQUIRED SICONOS_COMPONENTS numerics externals)
+compile_with(BLAS REQUIRED SICONOS_COMPONENTS kernel numerics externals)
+compile_with(LAPACK REQUIRED SICONOS_COMPONENTS kernel numerics externals)
 if(NOT BLAS_INCLUDE_DIRS)
   message(FATAL_ERROR "cannot find blas include directories")
 endif()


Resolve a cache invalidation issue

Resolve a cache invalidation issue

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

--- deal.II/cmake/configure/configure_1_lapack.cmake
+++ deal.II/cmake/configure/configure_1_lapack.cmake
@@ -18,20 +18,6 @@

 MACRO(FEATURE_LAPACK_FIND_EXTERNAL var)
   FIND_PACKAGE(LAPACK)
-
-  #
-  # Well, in case of static archives we have to manually pick up the
-  # complete link interface. *sigh*
-  #
-  # Do this unconditionally for the most common case:
-  # TODO: Non-GNU setups...
-  #
-  IF(NOT m_lib MATCHES "-NOTFOUND")
-    LIST(APPEND LAPACK_LIBRARIES ${m_lib})
-  ENDIF()
-
-  ENABLE_IF_LINKS(LAPACK_LINKER_FLAGS "-lgfortran")
-  ENABLE_IF_LINKS(LAPACK_LINKER_FLAGS "-lquadmath")

   IF(LAPACK_FOUND)
     MARK_AS_ADVANCED(
@@ -85,6 +71,14 @@
   ENDFOREACH()
 ENDMACRO()

+#
+# Resolve a cache invalidation problem by searching for this flag
+# unconditionally. It is used in FEATURE_LAPACK_CONFIGURE_EXTERNAL
+# depending on cached variables.
+#
+ENABLE_IF_LINKS(_dummy "-lgfortran")
+ENABLE_IF_LINKS(_dummy "-lquadmath")
+

 MACRO(FEATURE_LAPACK_CONFIGURE_EXTERNAL)
   #
@@ -105,9 +99,24 @@
     LIST(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES})
   ENDIF()

+
+  #
+  # Well, in case of static archives we have to manually pick up the
+  # complete link interface. *sigh*
+  #
+  # Do this unconditionally for the most common case:
+  # TODO: Non-GNU setups...
+  #
+  IF(NOT m_lib MATCHES "-NOTFOUND")
+    LIST(APPEND LAPACK_LIBRARIES ${m_lib})
+  ENDIF()
+
+  ENABLE_IF_LINKS(LAPACK_LINKER_FLAGS "-lgfortran")
+  ENABLE_IF_LINKS(LAPACK_LINKER_FLAGS "-lquadmath")
+
+
   ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${LAPACK_LINKER_FLAGS}")
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${LAPACK_LIBRARIES})
-

   CHECK_FOR_LAPACK_FUNCTIONS()
 ENDMACRO()


Allow setting libstdc++/libstdc++11 via cmake command line (#15)

--- conan.cmake
+++ conan.cmake
@@ -107,6 +107,18 @@

 function(conan_cmake_detect_gnu_libcxx result)
+    # Allow -D_GLIBCXX_USE_CXX11_ABI=ON/OFF as argument to cmake
+    if(DEFINED _GLIBCXX_USE_CXX11_ABI)
+        if(_GLIBCXX_USE_CXX11_ABI)
+            set(${result} libstdc++11 PARENT_SCOPE)
+            return()
+        else()
+            set(${result} libstdc++ PARENT_SCOPE)
+            return()
+        endif()
+    endif()
+
+    # Check if there's any add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
     get_directory_property(defines DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS)
     foreach(define ${defines})
         if(define STREQUAL "_GLIBCXX_USE_CXX11_ABI=0")
@@ -114,6 +126,8 @@
             return()
         endif()
     endforeach()
+
+    # Use C++11 stdlib as default if gcc is 5.1+
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.1")
       set(${result} libstdc++ PARENT_SCOPE)
     else()


Fix comments on FindPythonh5py.cmake

Fix comments on FindPythonh5py.cmake

--- FindPythonh5py.cmake
+++ FindPythonh5py.cmake
@@ -1,7 +1,5 @@
-# Find the Python nose package.
-# Will set PYTHONNOSE_FOUND and PYTHONNOSE_VERSION as appropriate
+# Find the Python h5py package.
+# Will set PYTHONH5PY_FOUND and PYTHONH5PY_VERSION as appropriate

 include(FindPythonModule)
 find_python_module("h5py")
-
-


CMake: make sure that C++14, C++17 or C++20 can also be set for MSVC


More verbose error message in ctkScriptWrapPythonQt_Light

--- CMake/ctkScriptWrapPythonQt_Light.cmake
+++ CMake/ctkScriptWrapPythonQt_Light.cmake
@@ -107,7 +107,7 @@
 # Check for non-existing ${var}
 FOREACH(var QT_QMAKE_EXECUTABLE OUTPUT_DIR PYTHON_EXECUTABLE PYTHON_LIBRARY_PATH)
   IF(NOT EXISTS ${${var}})
-    MESSAGE(SEND_ERROR "Failed to find ${var} when calling ctkScriptWrapPythonQt")
+    MESSAGE(SEND_ERROR "Failed to find ${var}=\"${${var}}\" when calling ctkScriptWrapPythonQt")
   ENDIF()
 ENDFOREACH()


don't include files without BSD license

don't include files without BSD license

--- CMakeModules/CPackSettings.cmake
+++ CMakeModules/CPackSettings.cmake
@@ -47,7 +47,9 @@
     ".registered$"
     "download.md$"
     "mainpage.md$"
-    "binding_generator.py$")
+    "binding_generator.py$"
+    "gen_validatorv31.js"
+    "/php/")
 set(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
 set(CPACK_GENERATOR "TGZ")


--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Instant Messaging
 Name[cs]=Instant Messaging
+Name[fi]=Pikaviestintä
 Name[it]=Messaggistica istantanea
 Name[nl]=Instant Messaging
+Name[pt]=Mensagens Instantâneas
 Name[pt_BR]=Mensagens instantâneas
 Name[sl]=Hipno sporočanje
 Name[sv]=Direktmeddelandekontakter
@@ -10,8 +12,10 @@
 Name[x-test]=xxInstant Messagingxx
 Comment=Start a chat with any of your IM contacts or change your IM status
 Comment[cs]=Začít rozhovor s kterýmkoliv vaším kontaktem v IM nebo změnit stav na IM
+Comment[fi]=Aloita keskustelu muun pikaviestinkäyttäjän kanssa tai vaihda pikaviestintilaasi
 Comment[it]=Avvia una chat con un tuo contatto di MI oppure cambia il tuo stato di MI
 Comment[nl]=Begin een chat met een van uw IM-contactpersonen of wijzig uw IM-status
+Comment[pt]=Iniciar uma conversa com qualquer um dos seus contactos MI ou mudar o seu estado
 Comment[pt_BR]=Inicia um bate-papo com um dos seus contatos de MI ou altera o seu status
 Comment[sl]=Začnite klepet s katerimkoli izmed vaših stikov hipnega sporočanja ali spremenite vaše stanje
 Comment[sv]=Börja chatta med någon direktmeddelandekontakt eller ändra din direktmeddelandestatus


--- plasma-runner-ktp-contact.desktop.cmake
+++ plasma-runner-ktp-contact.desktop.cmake
@@ -9,6 +9,7 @@
 Name[kk]=Лезде хабарласу
 Name[nl]=Instant Messaging
 Name[pt_BR]=Mensagens instantâneas
+Name[sk]=Priama komunikácia
 Name[sv]=Direktmeddelanden
 Name[uk]=Миттєвий обмін повідомленнями
 Name[x-test]=xxInstant Messagingxx
@@ -22,6 +23,7 @@
 Comment[kk]=Кез-келген лезде хабарласу контактыңызбен чат-әңгімені бастау не күй-жайын өзгерту
 Comment[nl]=Begin een chat met een van uw IM-contactpersonen of wijzig uw IM-status
 Comment[pt_BR]=Inicia um bate-papo com um dos seus contatos de MI ou altera o seu status
+Comment[sk]=Spustiť rozhovor s nejakým z vašich IM kontaktov alebo zmeniť váš IM stav
 Comment[sv]=Börja chatta med någon direktmeddelandekontakt eller ändra din direktmeddelandestatus
 Comment[uk]=Почати спілкування з будь-яким з ваших контактів або змінити ваш запис стану у системах обміну повідомленнями
 Comment[x-test]=xxStart a chat with any of your IM contacts or change your IM statusxx


Fix legend location for flags.

Fix legend location for flags.

--- cmake/BuildFlags.cmake
+++ cmake/BuildFlags.cmake
@@ -1,10 +1,11 @@
 add_library(cse_common_interface INTERFACE)
+
+  # '*' indicates CMake default option
+  # '+' indicates default compiler behavior

   #================#
   # Compiler flags #
   #================#
-  # '*' indicates CMake default option
-  # '+' indicates default compiler behavior

 target_compile_options(cse_common_interface INTERFACE
   # MSVC common compiler flags


fix adios1 include dir path in cmake

fix adios1 include dir path in cmake

--- cmake/FindADIOS1.cmake
+++ cmake/FindADIOS1.cmake
@@ -161,7 +161,10 @@
 # we found something in ADIOS1_ROOT_DIR and adios_config works #################
 if(ADIOS1_FOUND)
     # ADIOS headers
-    list(APPEND ADIOS1_INCLUDE_DIRS ${ADIOS1_ROOT_DIR}/include)
+    find_path(ADIOS1_INCLUDE_DIRS adios.h
+      HINTS ${ADIOS1_ROOT_DIR}/include
+      NO_DEFAULT_PATHS
+    )

     # check for compiled in dependencies, recomve ";" in ADIOS1_LINKFLAGS (from cmake build)
     string(REGEX REPLACE ";" " " ADIOS1_LINKFLAGS "${ADIOS1_LINKFLAGS}")