ctest: Fixed git URL.

ctest: Fixed git URL.

--- tests/ctest-default.cmake
+++ tests/ctest-default.cmake
@@ -22,7 +22,7 @@
 set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE ${CTEST_SOURCE_DIRECTORY}/tests/valgrind.supp)

 if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
-  set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} clone git://git.libssh.org/projects/libssh/libssh.git ${CTEST_SOURCE_DIRECTORY}")
+  set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} clone git://git.libssh.org/projects/libssh.git ${CTEST_SOURCE_DIRECTORY}")
 endif()

 set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")


install dir update

install dir update

--- src/CMake/UseCyclus.cmake
+++ src/CMake/UseCyclus.cmake
@@ -117,7 +117,7 @@
   # install library
   install(
     TARGETS ${lib_root}
-    LIBRARY DESTINATION cyclus/lib${lib_root}
+    LIBRARY DESTINATION lib/cyclus/lib${lib_root}
     COMPONENT ${lib_root}
     )
   SET(


[cmake] Fixed wrong library path for MinGW/MSYS Makefiles generator

--- .cmake/Modules/Subprojects.cmake
+++ .cmake/Modules/Subprojects.cmake
@@ -78,7 +78,11 @@

   if (WIN32)
     set ("${_NAME}_SHARED_LIB" "${install_prefix}/lib/${_NAME}.dll" PARENT_SCOPE)
-    set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/${_NAME}.lib" PARENT_SCOPE)
+    if (ARGS_GENERATOR MATCHES "(MSYS|MinGW) Makefiles")
+      set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/lib${_NAME}.a" PARENT_SCOPE)
+    else ()
+      set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/${_NAME}.lib" PARENT_SCOPE)
+    endif ()
   elseif (APPLE)
     set ("${_NAME}_SHARED_LIB" "${install_prefix}/lib/lib${_NAME}.dylib" PARENT_SCOPE)
     set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/lib${_NAME}.a" PARENT_SCOPE)


SuperBuild: libkml : disable wrappings, disable patch

--- SuperBuild/CMake/External_libkml.cmake
+++ SuperBuild/CMake/External_libkml.cmake
@@ -34,12 +34,15 @@
     INSTALL_DIR ${SB_INSTALL_PREFIX}
       DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
     DEPENDS ${${proj}_DEPENDENCIES}
-    PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory  ${CMAKE_SOURCE_DIR}/patches/${proj} ${LIBKML_SB_SRC}
+    #PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory  ${CMAKE_SOURCE_DIR}/patches/${proj} ${LIBKML_SB_SRC}
     CMAKE_CACHE_ARGS
       -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX}
       -DCMAKE_BUILD_TYPE:STRING=Release
       -DBUILD_SHARED_LIBS:BOOL=ON
       -DCMAKE_PREFIX_PATH:STRING=${SB_INSTALL_PREFIX};${CMAKE_PREFIX_PATH}
+      -DWITH_JAVA:BOOL=OFF
+      -DWITH_PYTHON:BOOL=OFF
+      -DWITH_SWIG:BOOL=OFF
       ${LIBKML_SB_CONFIG}
     CMAKE_COMMAND ${SB_CMAKE_COMMAND}
     )


Build:

Build:

* Fixed: Wasn't chomping extra whitespace from the end of the script-retrieved CUDA compute capability

--- cmake/Modules/HandleCUDAComputeCapability.cmake
+++ cmake/Modules/HandleCUDAComputeCapability.cmake
@@ -16,7 +16,8 @@
         set(CUDA_TARGET_COMPUTE_CAPABILITY $ENV{CUDA_SM})
 endif("$ENV{CUDA_SM}" STREQUAL "")

-execute_process(COMMAND bash -c "echo -n $(echo ${CUDA_TARGET_COMPUTE_CAPABILITY}) | sed 's/^\\([0-9]\\)\\([0-9]\\)/\\1.\\2/;' | xargs echo -n" OUTPUT_VARIABLE FORMATTED_COMPUTE_CAPABILITY)
+execute_process(COMMAND bash -c "echo -n $(echo ${CUDA_TARGET_COMPUTE_CAPABILITY})" OUTPUT_VARIABLE CUDA_TARGET_COMPUTE_CAPABILITY)
+execute_process(COMMAND bash -c "echo ${CUDA_TARGET_COMPUTE_CAPABILITY} | sed 's/^\\([0-9]\\)\\([0-9]\\)/\\1.\\2/;' | xargs echo -n" OUTPUT_VARIABLE FORMATTED_COMPUTE_CAPABILITY)

 message("Building for Compute Capability ${FORMATTED_COMPUTE_CAPABILITY}.")


Revert library

Revert library

--- cmake/Qt5Multimedia_QMultimediaDeclarativeModulePlugin.cmake
+++ cmake/Qt5Multimedia_QMultimediaDeclarativeModulePlugin.cmake
@@ -58,11 +58,11 @@
     )
   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"
-  #)
+  _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"
+  )
 endif()

 _qt_cmake_extra_helpers_add_source(


Added custom dependency on auto-load modules.

--- CMake/mitkMacroCreateExecutable.cmake
+++ CMake/mitkMacroCreateExecutable.cmake
@@ -66,6 +66,11 @@
                      ${_EXEC_OPTIONS}
                     )

+  # Add meta dependencies (e.g. on auto-load modules from depending modules)
+  if(ALL_META_DEPENDENCIES)
+    add_dependencies(${EXEC_NAME} ${ALL_META_DEPENDENCIES})
+  endif()
+
   # Create batch files for Windows platforms
   if(WIN32)
     set(_batch_file_in "${CMAKE_CURRENT_SOURCE_DIR}/${EXEC_NAME}.bat.in")


Use CMake variable to execute cmake command

Using the hard coded "cmake" command causes build failure when the
executable is not in the path.

--- CMake/sitkProjectLanguageCommon.cmake
+++ CMake/sitkProjectLanguageCommon.cmake
@@ -47,7 +47,7 @@
 endif()

 if(NOT TARGET dist)
-  add_custom_target( dist cmake -E echo "Finished generating wrapped packages for distribution..." )
+  add_custom_target( dist ${CMAKE_COMMAND} -E echo "Finished generating wrapped package for distribution..." )
 endif()

 # TODO these should be moved into UseSimpleITK


added static links for libflac, libogg, and libvorbis for VCPKG and windows

--- msvc/x64-windows-csound.cmake
+++ msvc/x64-windows-csound.cmake
@@ -1,7 +1,7 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)

-if(PORT STREQUAL "libsndfile")
+if(${PORT} MATCHES "libflac|libogg|libvorbis|libsndfile" )
 	set(VCPKG_LIBRARY_LINKAGE static)
 else()
 	set(VCPKG_LIBRARY_LINKAGE dynamic)


Fix MinGW installation directory when cross-compiling on Linux host.

--- Source/CMake/Toolchains/mingw.toolchain.cmake
+++ Source/CMake/Toolchains/mingw.toolchain.cmake
@@ -51,3 +51,8 @@
 set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# setup install destination prefix path only when cross-compiling
+if (CMAKE_CROSSCOMPILING)
+    set (CMAKE_INSTALL_PREFIX "${MINGW_SYSROOT}/usr/local" CACHE PATH "Install path prefix, prepended onto install directories.")
+endif ()


curl ready for multiple version support, cont'd

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

--- projects/curl.cmake
+++ projects/curl.cmake
@@ -37,7 +37,7 @@
     build_cmakexp(cmTgts)
   endif()
   foreach(ver ${CURL_VERSIONS})
-    xpBuildDeps(depTgts ${PRO_CURL})
+    xpBuildDeps(depTgts ${PRO_CURL_${ver}})
     list(APPEND depTgts ${cmTgts})
     set(XP_CONFIGURE
       -DCURL_VER=${ver}


ctest for stable

ctest for stable

git-svn-id: 6b1c4fe79111c0bc0cce83313250759594f8984b@4259 e128ff1e-fa79-4151-a8cb-522299a2c450

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

-set(CTEST_PROJECT_NAME "Gismo")
+set(CTEST_PROJECT_NAME "Gismo-stable")
 set(CTEST_NIGHTLY_START_TIME "00:00:01 UTC")

 set(CTEST_DROP_METHOD "https")
@@ -15,5 +15,5 @@
 "CURLOPT_SSL_VERIFYPEER_OFF"
 "CURLOPT_SSL_VERIFYHOST_OFF" )
 set(CTEST_DROP_SITE "cdash.ricam.oeaw.ac.at")
-set(CTEST_DROP_LOCATION "/submit.php?project=Gismo")
+set(CTEST_DROP_LOCATION "/submit.php?project=Gismo-stable")
 set(CTEST_DROP_SITE_CDASH TRUE)


Update to point at new CDash.

Update to point at new CDash.

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 SET (CTEST_DROP_METHOD http)
-SET (CTEST_PROJECT_NAME "zorba")
+SET (CTEST_PROJECT_NAME "Zorba")
 SET (CTEST_NIGHTLY_START_TIME "00:00:00 GMT")
-SET (CTEST_DROP_SITE "dbisdart.inf.ethz.ch")
-SET (CTEST_DROP_LOCATION "/cdash/submit.php?project=zorba")
+SET (CTEST_DROP_SITE "zorbatest.lambda.nu:8080")
+SET (CTEST_DROP_LOCATION "/cdash/submit.php?project=Zorba")
 SET (CTEST_DROP_SITE_CDASH TRUE)
 SET (CTEST_CUSTOM_WARNING_EXCEPTION
     ${CTEST_CUSTOM_WARNING_EXCEPTION}
     "Warning: GNU Bison.*"
     "Warning: using repository file.*"
     "Warning: urning: GNU Flex.*")
-# SET (CTEST_COMPRESS_SUBMISSION ON)
+SET (CTEST_COMPRESS_SUBMISSION ON)


fixes error in depend notation in jinja2

--- jinja.cmake
+++ jinja.cmake
@@ -22,7 +22,7 @@

 message ("Installing ${jinja_NAME} into FlyEM build area: ${BUILDEM_DIR} ...")
 ExternalProject_Add(${jinja_NAME}
-    DEPENDS             ${python_NAME} ${setuptools}
+    DEPENDS             ${python_NAME} ${setuptools_NAME}
     PREFIX              ${BUILDEM_DIR}
     URL                 ${jinja_URL}
     URL_MD5             ${jinja_MD5}


build(cmake/modules): upgrade driver version to `f7029e`

Signed-off-by: Leonardo Grasso <b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@leonardograsso.com>

--- cmake/modules/falcosecurity-libs.cmake
+++ cmake/modules/falcosecurity-libs.cmake
@@ -20,8 +20,8 @@
 # default below In case you want to test against another falcosecurity/libs version just pass the variable - ie., `cmake
 # -DFALCOSECURITY_LIBS_VERSION=dev ..`
 if(NOT FALCOSECURITY_LIBS_VERSION)
-  set(FALCOSECURITY_LIBS_VERSION "17f5df52a7d9ed6bb12d3b1768460def8439936d")
-  set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=34a2a466f1e5045591f102de2bc812d9b4f0d5874094cc73b97a7970fb2a3a18")
+  set(FALCOSECURITY_LIBS_VERSION "f7029e2522cc4c81841817abeeeaa515ed944b6c")
+  set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=63e602c05db142465211e2d151d0ccd08fdb613fe85dd3603c8298bc0108823a")
 endif()

 # cd /path/to/build && cmake /path/to/source


Always dereference symlinks if possible.

--- build-aux/butil.cmake
+++ build-aux/butil.cmake
@@ -1232,9 +1232,6 @@
           message(FATAL_ERROR "butil_auto_install(): specified windows lib ${winlib} does not exist.")
         endif()

-        get_filename_component(basename "${winlib}" NAME)
-        set(output "${CMAKE_BINARY_DIR}/${basename}")
-
         if (arg_HARDLINK_AUX_DLLS)
           find_program(LN_EXE ln)
           find_program(READLINK_EXE readlink)
@@ -1242,7 +1239,6 @@
           mark_as_advanced(LN_EXE READLINK_EXE)

           if (NOT READLINK_EXE)
-            message("butil_auto_install(): warning: readlink is not found.  Will copy windows dlls to bindir instead.")
             set(arg_HARDLINK_AUX_DLLS FALSE)
           endif()

@@ -1252,7 +1248,8 @@
           endif()
         endif()

-        if (arg_HARDLINK_AUX_DLLS)
+        # Always readlink if we can.  That way the names are right.
+        if (READLINK_EXE)
           execute_process(
             COMMAND "${READLINK_EXE}" "-f" "${winlib}"
             OUTPUT_VARIABLE realpath
@@ -1265,11 +1262,21 @@
           endif()

           set(winlib ${realpath})
+        else()
+          message("butil_auto_install(): warning: readlink is not found.  If DLLS are symlinks, then packages might contain the wrong DLLname!")
+        endif()
+
+        # Calculate this here so that we get the right dll name if the cross
+        # compile environment is full of symlinks :)
+        get_filename_component(basename "${winlib}" NAME)
+        set(output "${CMAKE_BINARY_DIR}/${basename}")
+
+        if (arg_HARDLINK_AUX_DLLS)
           # Don't rename it, or the link will be wrong.
-          set(command "${LN_EXE}" "${winlib}" "WORKING_DIRECTORY" "${CMAKE_BINARY_DIR}")
+          set(command "${LN_EXE}" "${winlib}")
           set(action "Hard link")
         else()
-          # This *does* dereference symlinks.
+          # This *does* dereference symlinks however the
           set(command "${CMAKE_COMMAND}" -E copy_if_different "${winlib}" "${CMAKE_BINARY_DIR}")
           set(action "Copy")
         endif()
@@ -1278,6 +1285,7 @@
           OUTPUT  "${output}"
           DEPENDS "${winlib}"
           COMMAND ${command}
+          WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
           COMMENT "${action} ${basename} to the binary dir."
           VERBATIM
         )


cmake: Cache results of CXX flag tests.

cmake: Cache results of CXX flag tests.

Avoid re-testing to improve cmake build and regen speed.

Change-Id: I8e2fe6601036cc7d176cdc3738616261a2da408b

--- build/cxx_flags.cmake
+++ build/cxx_flags.cmake
@@ -9,16 +9,32 @@

 include(CheckCXXCompilerFlag)

+# String used to cache failed CXX flags.
+set(LIBWEBM_FAILED_CXX_FLAGS)
+
+# Checks C++ compiler for support of $cxx_flag. Adds $cxx_flag to
+# $CMAKE_CXX_FLAGS when the compile test passes. Caches $c_flag in
+# $LIBWEBM_FAILED_CXX_FLAGS when the test fails.
 function (add_cxx_flag_if_supported cxx_flag)
-  unset(FLAG_SUPPORTED CACHE)
-  message("Checking compiler flag support for: " ${cxx_flag})
-  CHECK_CXX_COMPILER_FLAG("${cxx_flag}" FLAG_SUPPORTED)
-  if (FLAG_SUPPORTED)
-    set(CMAKE_CXX_FLAGS "${cxx_flag} ${CMAKE_CXX_FLAGS}" CACHE STRING "" FORCE)
+  unset(CXX_FLAG_FOUND CACHE)
+  string(FIND "${CMAKE_CXX_FLAGS}" "${cxx_flag}" CXX_FLAG_FOUND)
+  unset(CXX_FLAG_FAILED CACHE)
+  string(FIND "${LIBWEBM_FAILED_CXX_FLAGS}" "${cxx_flag}" CXX_FLAG_FAILED)
+
+  if (${CXX_FLAG_FOUND} EQUAL -1 AND ${CXX_FLAG_FAILED} EQUAL -1)
+    unset(CXX_FLAG_SUPPORTED CACHE)
+    message("Checking CXX compiler flag support for: " ${cxx_flag})
+    check_cxx_compiler_flag("${cxx_flag}" CXX_FLAG_SUPPORTED)
+    if (CXX_FLAG_SUPPORTED)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cxx_flag}" CACHE STRING ""
+          FORCE)
+    else ()
+      set(LIBWEBM_FAILED_CXX_FLAGS "${LIBWEBM_FAILED_CXX_FLAGS} ${cxx_flag}"
+          CACHE STRING "" FORCE)
+    endif ()
   endif ()
 endfunction ()

-# Set warning levels.
 if (MSVC)
   add_cxx_flag_if_supported("/W4")
   # Disable MSVC warnings that suggest making code non-portable.
@@ -29,9 +45,9 @@
 else ()
   add_cxx_flag_if_supported("-Wall")
   add_cxx_flag_if_supported("-Wextra")
+  add_cxx_flag_if_supported("-Wnarrowing")
   add_cxx_flag_if_supported("-Wno-deprecated")
   add_cxx_flag_if_supported("-Wshorten-64-to-32")
-  add_cxx_flag_if_supported("-Wnarrowing")
   if (ENABLE_WERROR)
     add_cxx_flag_if_supported("-Werror")
   endif ()


[Config][CMake] Updated reporting message for Python

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -479,9 +479,9 @@
   unset (_required_version)
   if (${ARGC} GREATER 0)
     set (_required_version ${ARGV0})
-    message (STATUS "Requires PythonLibs-${_required_version}")
+    message (STATUS "Requires Python with version ${_required_version}; however just Python3 is considered here")
   else (${ARGC} GREATER 0)
-    message (STATUS "Requires PythonLibs without specifying any version")
+    message (STATUS "Requires Python3; any version will do")
   endif (${ARGC} GREATER 0)

   # The first check searches for the libraries and include paths.


cmake: fixed a typo

cmake: fixed a typo

--- CMakeModules/FindGSL.cmake
+++ CMakeModules/FindGSL.cmake
@@ -32,7 +32,7 @@
   foreach (LIB ${PC_GSL_LIBRARIES})
     find_library(GSL_${LIB} NAMES ${LIB} HINTS ${PC_GSL_LIBRARY_DIRS} )
     list(APPEND GSL_LIBRARY ${GSL_${LIB}})
-    unset(${GSL_${LIB}} CACHE)
+    unset(GSL_${LIB} CACHE)
   endforeach(LIB)
 endif (NOT BUILD_SHARED_LIBS)


BUG: Correct include path for boost 1.72

--- SuperBuild/CMake/External_boost.cmake
+++ SuperBuild/CMake/External_boost.cmake
@@ -106,7 +106,7 @@
 #HINT: avoid all uses of  _SB_* in External_<project>.cmake
 # and depend on much saner CMAKE_PREFIX_PATH for cmake projects.
 if(MSVC)
-  set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include/boost-1_69)
+  set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include/boost-1_72)
 else()
   set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
 endif()


update project name references in cmake config

--- cmake/ElmConfig.cmake
+++ cmake/ElmConfig.cmake
@@ -7,50 +7,50 @@
 #    In your project's CMakeLists.txt, add these lines:
 #
 #    FIND_PACKAGE(SEM REQUIRED)
-#	 include_directories(${SEM_INCLUDE_DIRS})
-#    TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${SEM_LIBS})
+#	 include_directories(${ELM_INCLUDE_DIRS})
+#    TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${ELM_LIBS})
 #
 #    Searching for specific SEM modules not supported yet.
 #
-#    If the packages is found then SEM_FOUND is set to TRUE/ON.
+#    If the packages is found then ELM_FOUND is set to TRUE/ON.
 #
 #    This file will define the following variables:
-#      - SEM_LIBS                     : The list of libraries to link against.
-#      - SEM_LIB_DIR                  : The directory(es) where lib files are. Calling LINK_DIRECTORIES
+#      - ELM_LIBS                     : The list of libraries to link against.
+#      - ELM_LIB_DIR                  : The directory(es) where lib files are. Calling LINK_DIRECTORIES
 #                                          with this path is NOT needed.
-#      - SEM_INCLUDE_DIRS             : The SEM include directories.
+#      - ELM_INCLUDE_DIRS             : The SEM include directories.
 #
 #		TODO: define and expose version variables
-#      - SEM_VERSION                  : The version of this package build. Example: "2.4.0"
-#      - SEM_VERSION_MAJOR            : Major version part of SEM_VERSION. Example: "2"
-#      - SEM_VERSION_MINOR            : Minor version part of SEM_VERSION. Example: "4"
-#      - SEM_VERSION_PATCH            : Patch version part of SEM_VERSION. Example: "0"
+#      - ELM_VERSION                  : The version of this package build. Example: "2.4.0"
+#      - ELM_VERSION_MAJOR            : Major version part of ELM_VERSION. Example: "2"
+#      - ELM_VERSION_MINOR            : Minor version part of ELM_VERSION. Example: "4"
+#      - ELM_VERSION_PATCH            : Patch version part of ELM_VERSION. Example: "0"
 #
 # ===================================================================================
 #

 cmake_minimum_required(VERSION 2.8.7)

-set(SEM_FOUND FALSE)
+set(ELM_FOUND FALSE)

 # Compute paths
-get_filename_component(SEM_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)
+get_filename_component(ELM_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)

-get_filename_component(PARENT_DIR ${SEM_CMAKE_DIR} PATH)
+get_filename_component(PARENT_DIR ${ELM_CMAKE_DIR} PATH)

 message(STATUS "PARENT_DIR= ${PARENT_DIR}")
 # Are we in install prefix or in a build directory?
 if(EXISTS ${PARENT_DIR}/modules AND IS_DIRECTORY ${PARENT_DIR}/modules)

 	# install prefix
-	set(SEM_INCLUDE_DIRS ${PARENT_DIR}/modules)
-	set(SEM_LIB_DIR ${PARENT_DIR}/lib)
+	set(ELM_INCLUDE_DIRS ${PARENT_DIR}/modules)
+	set(ELM_LIB_DIR ${PARENT_DIR}/lib)

 elseif(EXISTS ${PARENT_DIR}/../include AND IS_DIRECTORY ${PARENT_DIR}/../include)

 	#build directory
-	set(SEM_INCLUDE_DIRS ${PARENT_DIR}/../include)
-	set(SEM_LIB_DIR ${PARENT_DIR}/../lib)
+	set(ELM_INCLUDE_DIRS ${PARENT_DIR}/../include)
+	set(ELM_LIB_DIR ${PARENT_DIR}/../lib)

 else()

@@ -58,17 +58,17 @@

 endif()

-file(GLOB SEM_LIBS "${SEM_LIB_DIR}/*.a")
+file(GLOB ELM_LIBS "${ELM_LIB_DIR}/*.a")

 # verify it's not an empty lib directory
-list(LENGTH SEM_LIBS SEM_NB_LIBS)
+list(LENGTH ELM_LIBS ELM_NB_LIBS)

-if(${SEM_NB_LIBS})
-	set(SEM_FOUND TRUE)
-else(${SEM_NB_LIBS})
-	set(SEM_FOUND FALSE)
-    message (FATAL_ERROR "Identified ${SEM_NB_LIBS} sem libs.")
-endif(${SEM_NB_LIBS})
+if(${ELM_NB_LIBS})
+	set(ELM_FOUND TRUE)
+else(${ELM_NB_LIBS})
+	set(ELM_FOUND FALSE)
+    message (FATAL_ERROR "Identified ${ELM_NB_LIBS} sem libs.")
+endif(${ELM_NB_LIBS})

 # TODO: instead of duplicating, order them from depdendent to independent
-list(APPEND ${SEM_LIBS} ${SEM_LIBS})
+list(APPEND ${ELM_LIBS} ${ELM_LIBS})


test_pep293 rename to test_string in Python 2.7.12

Upstream renamed the test in:

* python/cpython@ad6ad3f5 (Issue #27185: Rename test_pep292.py to
  test_string_merged.py.)

followed by:

* python/cpython@8d56828fff (Issue #27185: Rename test_string_merged.py
  back to test_string.py.)

--- cmake/UnitTests.cmake
+++ cmake/UnitTests.cmake
@@ -264,7 +264,12 @@
 list(APPEND unittests "test_peepholer")
 list(APPEND unittests "test_pep247")
 list(APPEND unittests "test_pep277")
-list(APPEND unittests "test_pep292")
+if(PY_VERSION_PATCH LESS 12)
+  list(APPEND unittests "test_pep292")
+else()
+  list(APPEND unittests "test_string")
+else()
+endif()
 list(APPEND unittests "test_pep352")
 list(APPEND unittests "test_pickle")
 list(APPEND unittests "test_pickletools")


Sort test list alphabetically

Sort test list alphabetically

--- cmake/UnitTests.cmake
+++ cmake/UnitTests.cmake
@@ -3,7 +3,7 @@
 set(cmd "exec(\"")
 set(cmd "${cmd}import glob\\n")
 set(cmd "${cmd}import os\\n")
-set(cmd "${cmd}filenames = glob.glob('./${PYTHONHOME}/test/test_*.py')\\n")
+set(cmd "${cmd}filenames = sorted(glob.glob('./${PYTHONHOME}/test/test_*.py'))\\n")
 set(cmd "${cmd}for filename in filenames:\\n")
 set(cmd "${cmd}  print('list(APPEND unittests \\\"%s\\\")' % os.path.splitext(os.path.basename(filename))[0])\\n")
 set(cmd "${cmd}print('Discovered %d tests' % len(filenames))\\n")
@@ -20,397 +20,397 @@
 # The following list has been generated and *manually* copied below building
 # the 'list_unittests' target.

-list(APPEND unittests "test_site")
-list(APPEND unittests "test_tcl")
-list(APPEND unittests "test_logging")
+list(APPEND unittests "test_abc")
+list(APPEND unittests "test_abstract_numbers")
+list(APPEND unittests "test_aepack")
+list(APPEND unittests "test_aifc")
+list(APPEND unittests "test_al")
+list(APPEND unittests "test___all__")
+list(APPEND unittests "test_anydbm")
+list(APPEND unittests "test_applesingle")
+list(APPEND unittests "test_argparse")
+list(APPEND unittests "test_array")
+list(APPEND unittests "test_ascii_formatd")
+list(APPEND unittests "test_ast")
+list(APPEND unittests "test_asynchat")
+list(APPEND unittests "test_asyncore")
+list(APPEND unittests "test_atexit")
+list(APPEND unittests "test_audioop")
+list(APPEND unittests "test_augassign")
+list(APPEND unittests "test_base64")
+list(APPEND unittests "test_bastion")
+list(APPEND unittests "test_bigaddrspace")
+list(APPEND unittests "test_bigmem")
+list(APPEND unittests "test_binascii")
+list(APPEND unittests "test_binhex")
 list(APPEND unittests "test_binop")
-list(APPEND unittests "test_xrange")
-list(APPEND unittests "test_ossaudiodev")
-list(APPEND unittests "test_macos")
-list(APPEND unittests "test_str")
-list(APPEND unittests "test_ftplib")
-list(APPEND unittests "test_file")
-list(APPEND unittests "test_htmlparser")
+list(APPEND unittests "test_bisect")
+list(APPEND unittests "test_bool")
+list(APPEND unittests "test_bsddb")
+list(APPEND unittests "test_bsddb185")
+list(APPEND unittests "test_bsddb3")
+list(APPEND unittests "test_buffer")
+list(APPEND unittests "test_bufio")
+list(APPEND unittests "test_builtin")
+list(APPEND unittests "test_bytes")
+list(APPEND unittests "test_bz2")
+list(APPEND unittests "test_calendar")
 list(APPEND unittests "test_call")
+list(APPEND unittests "test_capi")
+list(APPEND unittests "test_cd")
+list(APPEND unittests "test_cfgparser")
+list(APPEND unittests "test_cgi")
+list(APPEND unittests "test_charmapcodec")
+list(APPEND unittests "test_cl")
+list(APPEND unittests "test_class")
+list(APPEND unittests "test_cmath")
+list(APPEND unittests "test_cmd")
+list(APPEND unittests "test_cmd_line")
+list(APPEND unittests "test_cmd_line_script")
+list(APPEND unittests "test_code")
+list(APPEND unittests "test_codeccallbacks")
+list(APPEND unittests "test_codecencodings_cn")
+list(APPEND unittests "test_codecencodings_hk")
+list(APPEND unittests "test_codecencodings_iso2022")
+list(APPEND unittests "test_codecencodings_jp")
+list(APPEND unittests "test_codecencodings_kr")
+list(APPEND unittests "test_codecencodings_tw")
+list(APPEND unittests "test_codecmaps_cn")
+list(APPEND unittests "test_codecmaps_hk")
+list(APPEND unittests "test_codecmaps_jp")
+list(APPEND unittests "test_codecmaps_kr")
+list(APPEND unittests "test_codecmaps_tw")
+list(APPEND unittests "test_codecs")
+list(APPEND unittests "test_codeop")
+list(APPEND unittests "test_coding")
+list(APPEND unittests "test_coercion")
+list(APPEND unittests "test_collections")
+list(APPEND unittests "test_colorsys")
+list(APPEND unittests "test_commands")
+list(APPEND unittests "test_compare")
+list(APPEND unittests "test_compile")
+list(APPEND unittests "test_compileall")
+list(APPEND unittests "test_compiler")
+list(APPEND unittests "test_complex")
+list(APPEND unittests "test_complex_args")
+list(APPEND unittests "test_contains")
+list(APPEND unittests "test_contextlib")
+list(APPEND unittests "test_cookie")
+list(APPEND unittests "test_cookielib")
+list(APPEND unittests "test_copy")
 list(APPEND unittests "test_copy_reg")
-list(APPEND unittests "test_array")
-list(APPEND unittests "test_macostools")
-list(APPEND unittests "test_pep292")
-list(APPEND unittests "test_timeout")
-list(APPEND unittests "test_strftime")
-list(APPEND unittests "test_kqueue")
-list(APPEND unittests "test_tarfile")
-list(APPEND unittests "test_strptime")
-list(APPEND unittests "test_sys")
-list(APPEND unittests "test_operator")
-list(APPEND unittests "test_gzip")
-list(APPEND unittests "test_augassign")
-list(APPEND unittests "test_mutex")
-list(APPEND unittests "test_peepholer")
-list(APPEND unittests "test_getargs2")
-list(APPEND unittests "test_extcall")
-list(APPEND unittests "test_rlcompleter")
-list(APPEND unittests "test_popen2")
-list(APPEND unittests "test_al")
-list(APPEND unittests "test_ntpath")
-list(APPEND unittests "test_readline")
-list(APPEND unittests "test_StringIO")
-list(APPEND unittests "test_grp")
-list(APPEND unittests "test_getopt")
-list(APPEND unittests "test_codecmaps_kr")
-list(APPEND unittests "test_zipfile64")
-list(APPEND unittests "test_wave")
-list(APPEND unittests "test_shlex")
-list(APPEND unittests "test_module")
-list(APPEND unittests "test_types")
-list(APPEND unittests "test_set")
-list(APPEND unittests "test_traceback")
-list(APPEND unittests "test_sax")
-list(APPEND unittests "test_unittest")
+list(APPEND unittests "test_cpickle")
+list(APPEND unittests "test_cprofile")
+list(APPEND unittests "test_crypt")
+list(APPEND unittests "test_csv")
+list(APPEND unittests "test_ctypes")
+list(APPEND unittests "test_curses")
+list(APPEND unittests "test_datetime")
+list(APPEND unittests "test_dbm")
+list(APPEND unittests "test_decimal")
+list(APPEND unittests "test_decorators")
+list(APPEND unittests "test_defaultdict")
+list(APPEND unittests "test_deque")
+list(APPEND unittests "test_descr")
+list(APPEND unittests "test_descrtut")
+list(APPEND unittests "test_dict")
+list(APPEND unittests "test_dictcomps")
+list(APPEND unittests "test_dictviews")
 list(APPEND unittests "test_difflib")
-list(APPEND unittests "test_curses")
-list(APPEND unittests "test_multiprocessing")
-list(APPEND unittests "test_unicode")
-list(APPEND unittests "test_runpy")
-list(APPEND unittests "test_cd")
-list(APPEND unittests "test_float")
-list(APPEND unittests "test_sqlite")
-list(APPEND unittests "test_ttk_textonly")
-list(APPEND unittests "test_random")
-list(APPEND unittests "test_getargs")
-list(APPEND unittests "test_slice")
-list(APPEND unittests "test_imgfile")
-list(APPEND unittests "test_urllibnet")
-list(APPEND unittests "test_tk")
-list(APPEND unittests "test_openpty")
-list(APPEND unittests "test_email")
-list(APPEND unittests "test_gdb")
-list(APPEND unittests "test_os")
-list(APPEND unittests "test_int")
-list(APPEND unittests "test_bastion")
-list(APPEND unittests "test_exception_variations")
-list(APPEND unittests "test_sundry")
-list(APPEND unittests "test_pow")
-list(APPEND unittests "test_wait3")
-list(APPEND unittests "test_posixpath")
-list(APPEND unittests "test_struct")
-list(APPEND unittests "test_unary")
-list(APPEND unittests "test_bigmem")
-list(APPEND unittests "test_md5")
-list(APPEND unittests "test_eof")
-list(APPEND unittests "test_zipfile")
-list(APPEND unittests "test_sha")
-list(APPEND unittests "test_quopri")
-list(APPEND unittests "test_marshal")
-list(APPEND unittests "test_netrc")
-list(APPEND unittests "test_codeccallbacks")
-list(APPEND unittests "test_support")
-list(APPEND unittests "test_largefile")
-list(APPEND unittests "test_cmath")
-list(APPEND unittests "test_future5")
 list(APPEND unittests "test_dircache")
-list(APPEND unittests "test_parser")
-list(APPEND unittests "test_base64")
-list(APPEND unittests "test_compiler")
-list(APPEND unittests "test_email_codecs")
-list(APPEND unittests "test_queue")
-list(APPEND unittests "test_dictviews")
-list(APPEND unittests "test_trace")
-list(APPEND unittests "test_aepack")
-list(APPEND unittests "test_urllib2")
+list(APPEND unittests "test_dis")
+list(APPEND unittests "test_distutils")
 list(APPEND unittests "test_dl")
-list(APPEND unittests "test_gdbm")
-list(APPEND unittests "test_hotshot")
-list(APPEND unittests "test_compileall")
-list(APPEND unittests "test_nis")
-list(APPEND unittests "test_isinstance")
-list(APPEND unittests "test_tokenize")
-list(APPEND unittests "test_resource")
-list(APPEND unittests "test_pprint")
-list(APPEND unittests "test_popen")
-list(APPEND unittests "test_property")
-list(APPEND unittests "test_sunaudiodev")
-list(APPEND unittests "test_pyexpat")
-list(APPEND unittests "test_xdrlib")
-list(APPEND unittests "test_datetime")
-list(APPEND unittests "test_file2k")
-list(APPEND unittests "test_lib2to3")
-list(APPEND unittests "test_pep277")
-list(APPEND unittests "test_msilib")
-list(APPEND unittests "test_uu")
-list(APPEND unittests "test_undocumented_details")
-list(APPEND unittests "test_cookielib")
-list(APPEND unittests "test_dummy_threading")
-list(APPEND unittests "test_pep263")
-list(APPEND unittests "test_softspace")
-list(APPEND unittests "test_crypt")
-list(APPEND unittests "test_cfgparser")
-list(APPEND unittests "test_capi")
-list(APPEND unittests "test_py3kwarn")
-list(APPEND unittests "test_generators")
-list(APPEND unittests "test_docxmlrpc")
-list(APPEND unittests "test_xmllib")
-list(APPEND unittests "test___all__")
-list(APPEND unittests "test_cookie")
-list(APPEND unittests "test_memoryview")
-list(APPEND unittests "test_hmac")
-list(APPEND unittests "test_global")
-list(APPEND unittests "test_future4")
-list(APPEND unittests "test_posix")
-list(APPEND unittests "test_structmembers")
-list(APPEND unittests "test_linecache")
-list(APPEND unittests "test_unicodedata")
-list(APPEND unittests "test_startfile")
-list(APPEND unittests "test__locale")
-list(APPEND unittests "test_telnetlib")
-list(APPEND unittests "test_pickle")
-list(APPEND unittests "test_old_mailbox")
-list(APPEND unittests "test_hashlib")
-list(APPEND unittests "test_weakset")
-list(APPEND unittests "test_fileio")
-list(APPEND unittests "test_dict")
-list(APPEND unittests "test_zipimport")
-list(APPEND unittests "test_pkgimport")
-list(APPEND unittests "test_mmap")
-list(APPEND unittests "test_decimal")
-list(APPEND unittests "test_winreg")
-list(APPEND unittests "test_ucn")
-list(APPEND unittests "test_sysconfig")
-list(APPEND unittests "test_commands")
-list(APPEND unittests "test_buffer")
-list(APPEND unittests "test_gc")
-list(APPEND unittests "test_threaded_import")
-list(APPEND unittests "test_macpath")
-list(APPEND unittests "test_exceptions")
-list(APPEND unittests "test_bool")
-list(APPEND unittests "test_asynchat")
-list(APPEND unittests "test_contextlib")
-list(APPEND unittests "test_scope")
-list(APPEND unittests "test_calendar")
-list(APPEND unittests "test_setcomps")
-list(APPEND unittests "test_multibytecodec_support")
-list(APPEND unittests "test_bsddb185")
-list(APPEND unittests "test_symtable")
-list(APPEND unittests "test_importlib")
-list(APPEND unittests "test_fpformat")
-list(APPEND unittests "test_sort")
-list(APPEND unittests "test_whichdb")
-list(APPEND unittests "test_select")
-list(APPEND unittests "test_mimetools")
-list(APPEND unittests "test_unicode_file")
-list(APPEND unittests "test_abstract_numbers")
-list(APPEND unittests "test_codecencodings_iso2022")
-list(APPEND unittests "test_pep247")
-list(APPEND unittests "test_mimetypes")
-list(APPEND unittests "test_memoryio")
-list(APPEND unittests "test_descrtut")
-list(APPEND unittests "test_httplib")
-list(APPEND unittests "test_codecmaps_hk")
-list(APPEND unittests "test_long")
-list(APPEND unittests "test_math")
-list(APPEND unittests "test_threading_local")
-list(APPEND unittests "test_audioop")
-list(APPEND unittests "test_gettext")
-list(APPEND unittests "test_warnings")
-list(APPEND unittests "test_future3")
-list(APPEND unittests "test_MimeWriter")
-list(APPEND unittests "test_xml_etree_c")
-list(APPEND unittests "test_codecencodings_hk")
-list(APPEND unittests "test_email_renamed")
-list(APPEND unittests "test_ascii_formatd")
-list(APPEND unittests "test_richcmp")
 list(APPEND unittests "test_doctest")
 list(APPEND unittests "test_doctest2")
-list(APPEND unittests "test_anydbm")
+list(APPEND unittests "test_docxmlrpc")
+list(APPEND unittests "test_dumbdbm")
+list(APPEND unittests "test_dummy_thread")
+list(APPEND unittests "test_dummy_threading")
+list(APPEND unittests "test_email")
+list(APPEND unittests "test_email_codecs")
+list(APPEND unittests "test_email_renamed")
+list(APPEND unittests "test_enumerate")
+list(APPEND unittests "test_eof")
+list(APPEND unittests "test_epoll")
+list(APPEND unittests "test_errno")
+list(APPEND unittests "test_exceptions")
+list(APPEND unittests "test_exception_variations")
+list(APPEND unittests "test_extcall")
+list(APPEND unittests "test_fcntl")
+list(APPEND unittests "test_file")
+list(APPEND unittests "test_file2k")
+list(APPEND unittests "test_filecmp")
+list(APPEND unittests "test_fileinput")
+list(APPEND unittests "test_fileio")
+list(APPEND unittests "test_float")
+list(APPEND unittests "test_fnmatch")
+list(APPEND unittests "test_fork1")
+list(APPEND unittests "test_format")
+list(APPEND unittests "test_fpformat")
+list(APPEND unittests "test_fractions")
+list(APPEND unittests "test_frozen")
+list(APPEND unittests "test_ftplib")
+list(APPEND unittests "test_funcattrs")
+list(APPEND unittests "test_functools")
+list(APPEND unittests "test___future__")
+list(APPEND unittests "test_future")
+list(APPEND unittests "test_future1")
+list(APPEND unittests "test_future2")
+list(APPEND unittests "test_future3")
+list(APPEND unittests "test_future4")
+list(APPEND unittests "test_future5")
+list(APPEND unittests "test_future_builtins")
+list(APPEND unittests "test_gc")
+list(APPEND unittests "test_gdb")
+list(APPEND unittests "test_gdbm")
+list(APPEND unittests "test_generators")
+list(APPEND unittests "test_genericpath")
+list(APPEND unittests "test_genexps")
+list(APPEND unittests "test_getargs")
+list(APPEND unittests "test_getargs2")
+list(APPEND unittests "test_getopt")
+list(APPEND unittests "test_gettext")
+list(APPEND unittests "test_gl")
+list(APPEND unittests "test_glob")
+list(APPEND unittests "test_global")
+list(APPEND unittests "test_grammar")
+list(APPEND unittests "test_grp")
+list(APPEND unittests "test_gzip")
+list(APPEND unittests "test_hash")
+list(APPEND unittests "test_hashlib")
+list(APPEND unittests "test_heapq")
+list(APPEND unittests "test_hmac")
+list(APPEND unittests "test_hotshot")
+list(APPEND unittests "test_htmllib")
+list(APPEND unittests "test_htmlparser")
+list(APPEND unittests "test_httplib")
+list(APPEND unittests "test_httpservers")
+list(APPEND unittests "test_imageop")
+list(APPEND unittests "test_imaplib")
+list(APPEND unittests "test_imgfile")
+list(APPEND unittests "test_imp")
+list(APPEND unittests "test_import")
+list(APPEND unittests "test_importhooks")
+list(APPEND unittests "test_importlib")
+list(APPEND unittests "test_index")
+list(APPEND unittests "test_inspect")
+list(APPEND unittests "test_int")
+list(APPEND unittests "test_int_literal")
+list(APPEND unittests "test_io")
+list(APPEND unittests "test_ioctl")
+list(APPEND unittests "test_isinstance")
+list(APPEND unittests "test_iter")
+list(APPEND unittests "test_iterlen")
+list(APPEND unittests "test_itertools")
+list(APPEND unittests "test_json")
+list(APPEND unittests "test_kqueue")
+list(APPEND unittests "test_largefile")
+list(APPEND unittests "test_lib2to3")
+list(APPEND unittests "test_linecache")
+list(APPEND unittests "test_linuxaudiodev")
+list(APPEND unittests "test_list")
+list(APPEND unittests "test__locale")
+list(APPEND unittests "test_locale")
+list(APPEND unittests "test_logging")
+list(APPEND unittests "test_long")
+list(APPEND unittests "test_longexp")
+list(APPEND unittests "test_long_future")
+list(APPEND unittests "test_macos")
+list(APPEND unittests "test_macostools")
+list(APPEND unittests "test_macpath")
+list(APPEND unittests "test_mailbox")
+list(APPEND unittests "test_marshal")
+list(APPEND unittests "test_math")
+list(APPEND unittests "test_md5")
+list(APPEND unittests "test_memoryio")
+list(APPEND unittests "test_memoryview")
+list(APPEND unittests "test_mhlib")
+list(APPEND unittests "test_mimetools")
+list(APPEND unittests "test_mimetypes")
+list(APPEND unittests "test_MimeWriter")
+list(APPEND unittests "test_minidom")
+list(APPEND unittests "test_mmap")
+list(APPEND unittests "test_module")
+list(APPEND unittests "test_modulefinder")
+list(APPEND unittests "test_msilib")
+list(APPEND unittests "test_multibytecodec")
+list(APPEND unittests "test_multibytecodec_support")
+list(APPEND unittests "test_multifile")
+list(APPEND unittests "test_multiprocessing")
+list(APPEND unittests "test_mutants")
+list(APPEND unittests "test_mutex")
+list(APPEND unittests "test_netrc")
+list(APPEND unittests "test_new")
+list(APPEND unittests "test_nis")
+list(APPEND unittests "test_normalization")
+list(APPEND unittests "test_ntpath")
+list(APPEND unittests "test_old_mailbox")
+list(APPEND unittests "test_opcodes")
+list(APPEND unittests "test_openpty")
+list(APPEND unittests "test_operator")
+list(APPEND unittests "test_optparse")
+list(APPEND unittests "test_os")
+list(APPEND unittests "test_ossaudiodev")
+list(APPEND unittests "test_parser")
+list(APPEND unittests "test_pdb")
+list(APPEND unittests "test_peepholer")
+list(APPEND unittests "test_pep247")
+list(APPEND unittests "test_pep263")
+list(APPEND unittests "test_pep277")
+list(APPEND unittests "test_pep292")
+list(APPEND unittests "test_pep352")
+list(APPEND unittests "test_pickle")
+list(APPEND unittests "test_pickletools")
+list(APPEND unittests "test_pipes")
+list(APPEND unittests "test_pkg")
+list(APPEND unittests "test_pkgimport")
+list(APPEND unittests "test_pkgutil")
+list(APPEND unittests "test_platform")
+list(APPEND unittests "test_plistlib")
+list(APPEND unittests "test_poll")
+list(APPEND unittests "test_popen")
+list(APPEND unittests "test_popen2")
+list(APPEND unittests "test_poplib")
+list(APPEND unittests "test_posix")
+list(APPEND unittests "test_posixpath")
+list(APPEND unittests "test_pow")
+list(APPEND unittests "test_pprint")
+list(APPEND unittests "test_print")
+list(APPEND unittests "test_profile")
+list(APPEND unittests "test_property")
+list(APPEND unittests "test_pstats")
+list(APPEND unittests "test_pty")
+list(APPEND unittests "test_pwd")
+list(APPEND unittests "test_py3kwarn")
+list(APPEND unittests "test_pyclbr")
+list(APPEND unittests "test_py_compile")
+list(APPEND unittests "test_pydoc")
+list(APPEND unittests "test_pyexpat")
+list(APPEND unittests "test_queue")
+list(APPEND unittests "test_quopri")
+list(APPEND unittests "test_random")
+list(APPEND unittests "test_re")
+list(APPEND unittests "test_readline")
+list(APPEND unittests "test_repr")
+list(APPEND unittests "test_resource")
+list(APPEND unittests "test_rfc822")
+list(APPEND unittests "test_richcmp")
+list(APPEND unittests "test_rlcompleter")
+list(APPEND unittests "test_robotparser")
+list(APPEND unittests "test_runpy")
+list(APPEND unittests "test_sax")
+list(APPEND unittests "test_scope")
+list(APPEND unittests "test_scriptpackages")
+list(APPEND unittests "test_select")
+list(APPEND unittests "test_set")
+list(APPEND unittests "test_setcomps")
+list(APPEND unittests "test_sets")
+list(APPEND unittests "test_sgmllib")
+list(APPEND unittests "test_sha")
+list(APPEND unittests "test_shelve")
+list(APPEND unittests "test_shlex")
+list(APPEND unittests "test_shutil")
+list(APPEND unittests "test_signal")
+list(APPEND unittests "test_SimpleHTTPServer")
+list(APPEND unittests "test_site")
+list(APPEND unittests "test_slice")
+list(APPEND unittests "test_smtplib")
+list(APPEND unittests "test_smtpnet")
+list(APPEND unittests "test_socket")
+list(APPEND unittests "test_socketserver")
+list(APPEND unittests "test_softspace")
+list(APPEND unittests "test_sort")
+list(APPEND unittests "test_sqlite")
+list(APPEND unittests "test_ssl")
+list(APPEND unittests "test_startfile")
+list(APPEND unittests "test_str")
+list(APPEND unittests "test_strftime")
+list(APPEND unittests "test_string")
+list(APPEND unittests "test_StringIO")
+list(APPEND unittests "test_stringprep")
+list(APPEND unittests "test_strop")
+list(APPEND unittests "test_strptime")
+list(APPEND unittests "test_strtod")
+list(APPEND unittests "test_struct")
+list(APPEND unittests "test_structmembers")
+list(APPEND unittests "test_structseq")
+list(APPEND unittests "test_subprocess")
+list(APPEND unittests "test_sunaudiodev")
+list(APPEND unittests "test_sundry")
+list(APPEND unittests "test_support")
+list(APPEND unittests "test_symtable")
 list(APPEND unittests "test_syntax")
-list(APPEND unittests "test_deque")
+list(APPEND unittests "test_sys")
+list(APPEND unittests "test_sysconfig")
+list(APPEND unittests "test_sys_setprofile")
+list(APPEND unittests "test_sys_settrace")
+list(APPEND unittests "test_tarfile")
+list(APPEND unittests "test_tcl")
+list(APPEND unittests "test_telnetlib")
+list(APPEND unittests "test_tempfile")
+list(APPEND unittests "test_textwrap")
+list(APPEND unittests "test_thread")
+list(APPEND unittests "test_threaded_import")
 list(APPEND unittests "test_threadedtempfile")
+list(APPEND unittests "test_threading")
+list(APPEND unittests "test_threading_local")
+list(APPEND unittests "test_threadsignals")
+list(APPEND unittests "test_time")
+list(APPEND unittests "test_timeout")
+list(APPEND unittests "test_tk")
+list(APPEND unittests "test_tokenize")
+list(APPEND unittests "test_trace")
+list(APPEND unittests "test_traceback")
+list(APPEND unittests "test_transformer")
+list(APPEND unittests "test_ttk_guionly")
+list(APPEND unittests "test_ttk_textonly")
+list(APPEND unittests "test_tuple")
+list(APPEND unittests "test_typechecks")
+list(APPEND unittests "test_types")
+list(APPEND unittests "test_ucn")
+list(APPEND unittests "test_unary")
+list(APPEND unittests "test_undocumented_details")
+list(APPEND unittests "test_unicode")
+list(APPEND unittests "test_unicodedata")
+list(APPEND unittests "test_unicode_file")
+list(APPEND unittests "test_unittest")
+list(APPEND unittests "test_univnewlines")
+list(APPEND unittests "test_univnewlines2k")
+list(APPEND unittests "test_unpack")
+list(APPEND unittests "test_urllib")
+list(APPEND unittests "test_urllib2")
+list(APPEND unittests "test_urllib2_localnet")
+list(APPEND unittests "test_urllib2net")
+list(APPEND unittests "test_urllibnet")
+list(APPEND unittests "test_urlparse")
+list(APPEND unittests "test_userdict")
+list(APPEND unittests "test_userlist")
+list(APPEND unittests "test_userstring")
+list(APPEND unittests "test_uu")
+list(APPEND unittests "test_uuid")
+list(APPEND unittests "test_wait3")
+list(APPEND unittests "test_wait4")
+list(APPEND unittests "test_warnings")
+list(APPEND unittests "test_wave")
+list(APPEND unittests "test_weakref")
+list(APPEND unittests "test_weakset")
+list(APPEND unittests "test_whichdb")
+list(APPEND unittests "test_winreg")
+list(APPEND unittests "test_winsound")
+list(APPEND unittests "test_with")
+list(APPEND unittests "test_wsgiref")
+list(APPEND unittests "test_xdrlib")
+list(APPEND unittests "test_xml_etree")
+list(APPEND unittests "test_xml_etree_c")
+list(APPEND unittests "test_xmllib")
+list(APPEND unittests "test_xmlrpc")
+list(APPEND unittests "test_xpickle")
+list(APPEND unittests "test_xrange")
+list(APPEND unittests "test_zipfile")
+list(APPEND unittests "test_zipfile64")
+list(APPEND unittests "test_zipimport")
 list(APPEND unittests "test_zipimport_support")
-list(APPEND unittests "test_coercion")
-list(APPEND unittests "test_future1")
-list(APPEND unittests "test_long_future")
-list(APPEND unittests "test_mutants")
-list(APPEND unittests "test_platform")
-list(APPEND unittests "test_htmllib")
-list(APPEND unittests "test_new")
-list(APPEND unittests "test_winsound")
-list(APPEND unittests "test_frozen")
-list(APPEND unittests "test_scriptpackages")
-list(APPEND unittests "test_threading")
-list(APPEND unittests "test_pwd")
-list(APPEND unittests "test_sets")
-list(APPEND unittests "test_wsgiref")
-list(APPEND unittests "test_genexps")
-list(APPEND unittests "test_abc")
-list(APPEND unittests "test_with")
-list(APPEND unittests "test_pdb")
-list(APPEND unittests "test_cl")
-list(APPEND unittests "test_urllib")
-list(APPEND unittests "test_uuid")
-list(APPEND unittests "test_strtod")
-list(APPEND unittests "test_fork1")
-list(APPEND unittests "test_bisect")
-list(APPEND unittests "test_socket")
-list(APPEND unittests "test_errno")
-list(APPEND unittests "test_pstats")
-list(APPEND unittests "test_transformer")
-list(APPEND unittests "test_epoll")
-list(APPEND unittests "test_cprofile")
-list(APPEND unittests "test_tuple")
-list(APPEND unittests "test_urlparse")
-list(APPEND unittests "test_coding")
-list(APPEND unittests "test_robotparser")
-list(APPEND unittests "test_dictcomps")
-list(APPEND unittests "test_xml_etree")
-list(APPEND unittests "test_complex_args")
-list(APPEND unittests "test_hash")
-list(APPEND unittests "test_enumerate")
-list(APPEND unittests "test_linuxaudiodev")
-list(APPEND unittests "test_ssl")
-list(APPEND unittests "test_urllib2_localnet")
-list(APPEND unittests "test_typechecks")
-list(APPEND unittests "test_format")
-list(APPEND unittests "test_shelve")
-list(APPEND unittests "test_threadsignals")
-list(APPEND unittests "test_descr")
-list(APPEND unittests "test_fractions")
-list(APPEND unittests "test_io")
-list(APPEND unittests "test_mhlib")
-list(APPEND unittests "test_rfc822")
-list(APPEND unittests "test_opcodes")
-list(APPEND unittests "test_print")
-list(APPEND unittests "test_stringprep")
-list(APPEND unittests "test_longexp")
-list(APPEND unittests "test_sys_settrace")
-list(APPEND unittests "test_binascii")
-list(APPEND unittests "test_codecmaps_cn")
-list(APPEND unittests "test_import")
-list(APPEND unittests "test_pep352")
-list(APPEND unittests "test_minidom")
-list(APPEND unittests "test_pipes")
-list(APPEND unittests "test_cgi")
-list(APPEND unittests "test_codecencodings_kr")
-list(APPEND unittests "test_cmd_line")
-list(APPEND unittests "test_mailbox")
-list(APPEND unittests "test_sys_setprofile")
-list(APPEND unittests "test_sgmllib")
-list(APPEND unittests "test_index")
-list(APPEND unittests "test_int_literal")
-list(APPEND unittests "test_SimpleHTTPServer")
-list(APPEND unittests "test_gl")
-list(APPEND unittests "test_bytes")
-list(APPEND unittests "test_pydoc")
-list(APPEND unittests "test_thread")
-list(APPEND unittests "test_inspect")
-list(APPEND unittests "test_pickletools")
-list(APPEND unittests "test_subprocess")
-list(APPEND unittests "test_iter")
-list(APPEND unittests "test_signal")
-list(APPEND unittests "test_future")
-list(APPEND unittests "test_heapq")
-list(APPEND unittests "test_dumbdbm")
-list(APPEND unittests "test_atexit")
-list(APPEND unittests "test_codecs")
-list(APPEND unittests "test_shutil")
-list(APPEND unittests "test_httpservers")
-list(APPEND unittests "test_fileinput")
-list(APPEND unittests "test_code")
-list(APPEND unittests "test_time")
-list(APPEND unittests "test_future_builtins")
-list(APPEND unittests "test_py_compile")
-list(APPEND unittests "test_itertools")
-list(APPEND unittests "test_contains")
-list(APPEND unittests "test_strop")
-list(APPEND unittests "test_codecmaps_tw")
-list(APPEND unittests "test_poplib")
-list(APPEND unittests "test_bsddb3")
-list(APPEND unittests "test_ioctl")
-list(APPEND unittests "test_ttk_guionly")
-list(APPEND unittests "test_bigaddrspace")
-list(APPEND unittests "test_codeop")
-list(APPEND unittests "test_decorators")
-list(APPEND unittests "test_aifc")
-list(APPEND unittests "test_bz2")
-list(APPEND unittests "test_functools")
-list(APPEND unittests "test_distutils")
-list(APPEND unittests "test_csv")
-list(APPEND unittests "test_compile")
-list(APPEND unittests "test_compare")
-list(APPEND unittests "test_codecmaps_jp")
-list(APPEND unittests "test_grammar")
-list(APPEND unittests "test_cpickle")
-list(APPEND unittests "test_smtpnet")
-list(APPEND unittests "test_weakref")
-list(APPEND unittests "test_fcntl")
-list(APPEND unittests "test_dis")
-list(APPEND unittests "test_userstring")
-list(APPEND unittests "test_dummy_thread")
-list(APPEND unittests "test_repr")
-list(APPEND unittests "test_filecmp")
-list(APPEND unittests "test_bsddb")
-list(APPEND unittests "test_userdict")
-list(APPEND unittests "test___future__")
-list(APPEND unittests "test_dbm")
-list(APPEND unittests "test_cmd")
-list(APPEND unittests "test_ctypes")
 list(APPEND unittests "test_zlib")
-list(APPEND unittests "test_binhex")
-list(APPEND unittests "test_smtplib")
-list(APPEND unittests "test_codecencodings_tw")
-list(APPEND unittests "test_importhooks")
-list(APPEND unittests "test_multifile")
-list(APPEND unittests "test_charmapcodec")
-list(APPEND unittests "test_locale")
-list(APPEND unittests "test_imp")
-list(APPEND unittests "test_codecencodings_cn")
-list(APPEND unittests "test_colorsys")
-list(APPEND unittests "test_complex")
-list(APPEND unittests "test_textwrap")
-list(APPEND unittests "test_cmd_line_script")
-list(APPEND unittests "test_urllib2net")
-list(APPEND unittests "test_pkgutil")
-list(APPEND unittests "test_univnewlines2k")
-list(APPEND unittests "test_structseq")
-list(APPEND unittests "test_univnewlines")
-list(APPEND unittests "test_modulefinder")
-list(APPEND unittests "test_class")
-list(APPEND unittests "test_defaultdict")
-list(APPEND unittests "test_pkg")
-list(APPEND unittests "test_unpack")
-list(APPEND unittests "test_funcattrs")
-list(APPEND unittests "test_bufio")
-list(APPEND unittests "test_argparse")
-list(APPEND unittests "test_future2")
-list(APPEND unittests "test_imageop")
-list(APPEND unittests "test_userlist")
-list(APPEND unittests "test_normalization")
-list(APPEND unittests "test_list")
-list(APPEND unittests "test_copy")
-list(APPEND unittests "test_asyncore")
-list(APPEND unittests "test_codecencodings_jp")
-list(APPEND unittests "test_collections")
-list(APPEND unittests "test_multibytecodec")
-list(APPEND unittests "test_socketserver")
-list(APPEND unittests "test_ast")
-list(APPEND unittests "test_string")
-list(APPEND unittests "test_poll")
-list(APPEND unittests "test_builtin")
-list(APPEND unittests "test_glob")
-list(APPEND unittests "test_json")
-list(APPEND unittests "test_xmlrpc")
-list(APPEND unittests "test_profile")
-list(APPEND unittests "test_xpickle")
-list(APPEND unittests "test_applesingle")
-list(APPEND unittests "test_pty")
-list(APPEND unittests "test_iterlen")
-list(APPEND unittests "test_fnmatch")
-list(APPEND unittests "test_plistlib")
-list(APPEND unittests "test_tempfile")
-list(APPEND unittests "test_re")
-list(APPEND unittests "test_pyclbr")
-list(APPEND unittests "test_wait4")
-list(APPEND unittests "test_optparse")
-list(APPEND unittests "test_genericpath")
-list(APPEND unittests "test_imaplib")

 list(REMOVE_DUPLICATES unittests)


using field 10x26 if int128 not detected

--- cmake/secp256k1.cmake
+++ cmake/secp256k1.cmake
@@ -19,21 +19,22 @@

         if(NOT WIN32 AND NOT MSVC)
             add_definitions(-DUSE_ASM_X86_64)
-        endif()
-
-        add_definitions(-DUSE_FIELD_5X52)
-
-        check_type_size("int128_t" SIZEOF_INT128)
-        if(NOT SIZEOF_INT128)
+            add_definitions(-DUSE_FIELD_5X52)
+            check_type_size("int128_t" SIZEOF_INT128)
+        else()
             check_type_size("__int128" SIZEOF_INT128 BUILTIN_TYPES_ONLY)
         endif()

+
         if(SIZEOF_INT128)
-            add_definitions(-D__HAS_INT128__)
             add_definitions(-DUSE_SCALAR_4X64)
             add_definitions(-DHAVE___INT128)
+            add_definitions(-DUSE_FIELD_5X52)
         else()
             add_definitions(-DUSE_SCALAR_8X32)
+            if(WIN32 OR MSVC)
+                add_definitions(-DUSE_FIELD_10X26)
+            endif()
         endif()

     else()


fixed FindHDF5.cmake: allow paths containing spaces

--- config/FindHDF5.cmake
+++ config/FindHDF5.cmake
@@ -2,56 +2,63 @@
 #
 FIND_PATH(HDF5_INCLUDE_DIR hdf5.h)

-FIND_LIBRARY(HDF5_CORE_LIBRARY NAMES hdf5dll hdf5  )
-FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hldll hdf5_hl  )
+if(HDF5_INCLUDE_DIR)
+	SET(HDF5_TRY_COMPILE_INCLUDE_DIR "-DINCLUDE_DIRECTORIES:STRING=${HDF5_INCLUDE_DIR}")

-IF(WIN32 AND HDF5_CORE_LIBRARY MATCHES "dll.lib$")
-    SET(HDF5_CFLAGS "-D_HDF5USEDLL_")
-    SET(HDF5_CPPFLAGS "-D_HDF5USEDLL_ -DHDF5CPP_USEDLL")
-ELSE()
-    SET(HDF5_CFLAGS)
-    SET(HDF5_CPPFLAGS)
-ENDIF()
+	FIND_LIBRARY(HDF5_CORE_LIBRARY NAMES hdf5dll hdf5  )
+	FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hldll hdf5_hl  )

-SET(HDF5_VERSION_MAJOR 1)
-SET(HDF5_VERSION_MINOR 6)
+	IF(WIN32 AND HDF5_CORE_LIBRARY MATCHES "dll.lib$")
+		SET(HDF5_CFLAGS "-D_HDF5USEDLL_")
+		SET(HDF5_CPPFLAGS "-D_HDF5USEDLL_ -DHDF5CPP_USEDLL")
+	ELSE()
+		SET(HDF5_CFLAGS)
+		SET(HDF5_CPPFLAGS)
+	ENDIF()

-set(HDF5_SUFFICIENT_VERSION FALSE)
-TRY_COMPILE(HDF5_SUFFICIENT_VERSION
-            ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/config/checkHDF5version.c
-            COMPILE_DEFINITIONS "-I${HDF5_INCLUDE_DIR} -DMIN_MAJOR=${HDF5_VERSION_MAJOR} -DMIN_MINOR=${HDF5_VERSION_MINOR}")
-
-if(HDF5_SUFFICIENT_VERSION)
-    MESSAGE(STATUS
-           "Checking HDF5 version (at least ${HDF5_VERSION_MAJOR}.${HDF5_VERSION_MINOR}): ok")
-else()
-    MESSAGE( STATUS "HDF5: need at least version ${HDF5_VERSION_MAJOR}.${HDF5_VERSION_MINOR}" )
-endif()
+	SET(HDF5_VERSION_MAJOR 1)
+	SET(HDF5_VERSION_MINOR 6)

-set(HDF5_USES_ZLIB FALSE)
-TRY_COMPILE(HDF5_USES_ZLIB
-           ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/config/checkHDF5usesCompression.c
-           COMPILE_DEFINITIONS "-I${HDF5_INCLUDE_DIR} -DH5_SOMETHING=H5_HAVE_FILTER_DEFLATE")
-
-if(HDF5_USES_ZLIB)
-    FIND_LIBRARY(HDF5_Z_LIBRARY NAMES zlib1 z )
-    set(HDF5_ZLIB_OK ${HDF5_Z_LIBRARY})
-else()
-    set(HDF5_ZLIB_OK TRUE)
-    set(HDF5_Z_LIBRARY "")
-endif()
+	set(HDF5_SUFFICIENT_VERSION FALSE)
+	TRY_COMPILE(HDF5_SUFFICIENT_VERSION
+				${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/config/checkHDF5version.c
+				COMPILE_DEFINITIONS "-DMIN_MAJOR=${HDF5_VERSION_MAJOR} -DMIN_MINOR=${HDF5_VERSION_MINOR}"
+				CMAKE_FLAGS "${HDF5_TRY_COMPILE_INCLUDE_DIR}")
+
+	if(HDF5_SUFFICIENT_VERSION)
+		MESSAGE(STATUS
+			   "Checking HDF5 version (at least ${HDF5_VERSION_MAJOR}.${HDF5_VERSION_MINOR}): ok")
+	else()
+		MESSAGE( STATUS "HDF5: need at least version ${HDF5_VERSION_MAJOR}.${HDF5_VERSION_MINOR}" )
+	endif()

-set(HDF5_USES_SZLIB FALSE)
-TRY_COMPILE(HDF5_USES_SZLIB
-            ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/config/checkHDF5usesCompression.c
-            COMPILE_DEFINITIONS "-I${HDF5_INCLUDE_DIR} -DH5_SOMETHING=H5_HAVE_FILTER_SZIP")
-
-if(HDF5_USES_SZLIB)
-    FIND_LIBRARY(HDF5_SZ_LIBRARY NAMES szlibdll sz )
-    set(HDF5_SZLIB_OK ${HDF5_SZ_LIBRARY})
-else()
-    set(HDF5_SZLIB_OK TRUE)
-    set(HDF5_SZ_LIBRARY "")
+	set(HDF5_USES_ZLIB FALSE)
+	TRY_COMPILE(HDF5_USES_ZLIB
+			   ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/config/checkHDF5usesCompression.c
+			   COMPILE_DEFINITIONS "-DH5_SOMETHING=H5_HAVE_FILTER_DEFLATE"
+			   CMAKE_FLAGS "${HDF5_TRY_COMPILE_INCLUDE_DIR}")
+
+    if(HDF5_USES_ZLIB)
+		FIND_LIBRARY(HDF5_Z_LIBRARY NAMES zlib1 z )
+		set(HDF5_ZLIB_OK ${HDF5_Z_LIBRARY})
+	else()
+		set(HDF5_ZLIB_OK TRUE)
+		set(HDF5_Z_LIBRARY "")
+	endif()
+
+	set(HDF5_USES_SZLIB FALSE)
+	TRY_COMPILE(HDF5_USES_SZLIB
+				${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/config/checkHDF5usesCompression.c
+				COMPILE_DEFINITIONS "-DH5_SOMETHING=H5_HAVE_FILTER_SZIP"
+				CMAKE_FLAGS "${HDF5_TRY_COMPILE_INCLUDE_DIR}")
+
+	if(HDF5_USES_SZLIB)
+		FIND_LIBRARY(HDF5_SZ_LIBRARY NAMES szlibdll sz szip)
+		set(HDF5_SZLIB_OK ${HDF5_SZ_LIBRARY})
+	else()
+		set(HDF5_SZLIB_OK TRUE)
+		set(HDF5_SZ_LIBRARY "")
+	endif()
 endif()

 # handle the QUIETLY and REQUIRED arguments and set HDF5_FOUND to TRUE if


utils: define PLATFORM_Linux when not on MSVC

--- Engine/scripts/utils.cmake
+++ Engine/scripts/utils.cmake
@@ -184,6 +184,8 @@
 	# os
 	if (MSVC)
 		add_definitions(-DPLATFORM_Win)
+	else()
+		add_definitions(-DPLATFORM_Linux)
 	endif(MSVC)

 	set(_p )


updates/fixes libdvidcpp to use the old DVID interface

--- libdvidcpp.cmake
+++ libdvidcpp.cmake
@@ -12,7 +12,7 @@
 include (cppnetlib)

-set(LIBDVID_VERSION 8d439ea629d5fe5de6ce1e522215018eb9b7eac3) # 2014-10-03
+set(LIBDVID_VERSION "df9ae21dc5ef24c8396e46c66e4d7db893376e93") # 2014-10-05

 external_git_repo (libdvidcpp
     ${LIBDVID_VERSION}


Related to bug 880: Accept make as well a gmake when searching the MakeCommand. And don't include \n in match expression

--- cmake/EigenConfigureTesting.cmake
+++ cmake/EigenConfigureTesting.cmake
@@ -24,9 +24,9 @@
 # At this stage, we can also add custom flags to the build tool through the user defined EIGEN_TEST_BUILD_FLAGS variable.
 file(READ  "${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl" EIGEN_DART_CONFIG_FILE)
 # try to grab the default flags
-string(REGEX MATCH "MakeCommand:.*-- (.*)DefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE})
+string(REGEX MATCH "MakeCommand:.*-- (.*)\nDefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE})
 if(NOT CMAKE_MATCH_1)
-string(REGEX MATCH "MakeCommand:.*gmake (.*)DefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE})
+string(REGEX MATCH "MakeCommand:.*make (.*)\nDefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE})
 endif()
 string(REGEX REPLACE "MakeCommand:.*DefaultCTestConfigurationType" "MakeCommand: ${CMAKE_COMMAND} --build . --target buildtests --config \"\${CTEST_CONFIGURATION_TYPE}\" -- ${CMAKE_MATCH_1} ${EIGEN_TEST_BUILD_FLAGS}\nDefaultCTestConfigurationType"
        EIGEN_DART_CONFIG_FILE2 ${EIGEN_DART_CONFIG_FILE})


[CMake] pkg-config: generate correct library link file names

--- cmake/MapnikExportPkgConfig.cmake
+++ cmake/MapnikExportPkgConfig.cmake
@@ -1,4 +1,4 @@
-function(create_pkg_config_file _lib_name _description)
+function(create_pkg_config_file _target _lib_name _description)
     string(CONFIGURE [[
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
@@ -8,7 +8,7 @@
 Name: @_lib_name@
 Description: @_description@
 Version: @MAPNIK_VERSION@
-Libs: -L"${libdir}" -l@_lib_name@
+Libs: -L"${libdir}" -l$<TARGET_FILE_PREFIX:@_target@>$<TARGET_FILE_BASE_NAME:@_target@>$<TARGET_PROPERTY:@_target@,$<CONFIG>_POSTFIX>
 Cflags: -I"${includedir}" ]]
     _contents @ONLY)

@@ -38,7 +38,7 @@
 Description: @_description@
 Version: @MAPNIK_VERSION@
 Requires: libmapnikwkt libmapnikjson
-Libs: -L"${libdir}" -l@_lib_name@ -llibmapnikwkt -llibmapnikjson
+Libs: -L"${libdir}" -l$<TARGET_FILE_PREFIX:mapnik>$<TARGET_FILE_BASE_NAME:mapnik>$<TARGET_PROPERTY:mapnik,$<CONFIG>_POSTFIX> -l$<TARGET_FILE_PREFIX:json>$<TARGET_FILE_BASE_NAME:json>$<TARGET_PROPERTY:json,$<CONFIG>_POSTFIX> -l$<TARGET_FILE_PREFIX:wkt>$<TARGET_FILE_BASE_NAME:wkt>$<TARGET_PROPERTY:wkt,$<CONFIG>_POSTFIX>
 Cflags: -I"${includedir}" @_str_compile_defs@]]
     _contents @ONLY)
     file(GENERATE
@@ -52,6 +52,6 @@
 endfunction()

-create_pkg_config_file(libmapnikwkt "wkt library")
-create_pkg_config_file(libmapnikjson "json library")
+create_pkg_config_file(wkt libmapnikwkt "wkt library")
+create_pkg_config_file(json libmapnikjson "json library")
 create_pkg_config_file_mapnik("libmapnik" "mapnik library")


Fix CMake for clang-cl

Fix CMake for clang-cl

Avoids passing -Wall, which will enable literally every warning in
Clang. Avoids passing -ffunction-sections etc to clang-cl, which each
generate warnings.

--- cmake/OpenCVCompilerOptions.cmake
+++ cmake/OpenCVCompilerOptions.cmake
@@ -86,7 +86,11 @@
 if(CV_GCC OR CV_CLANG)
   # High level of warnings.
   add_extra_compiler_option(-W)
-  add_extra_compiler_option(-Wall)
+  if (NOT MSVC)
+    # clang-cl interprets -Wall as MSVC would: -Weverything, which is more than
+    # we want.
+    add_extra_compiler_option(-Wall)
+  endif()
   add_extra_compiler_option(-Werror=return-type)
   add_extra_compiler_option(-Werror=non-virtual-dtor)
   add_extra_compiler_option(-Werror=address)
@@ -173,7 +177,7 @@
       string(REPLACE "-ffunction-sections" "" ${flags} "${${flags}}")
       string(REPLACE "-fdata-sections" "" ${flags} "${${flags}}")
     endforeach()
-  elseif(NOT ((IOS OR ANDROID) AND NOT BUILD_SHARED_LIBS))
+  elseif(NOT ((IOS OR ANDROID) AND NOT BUILD_SHARED_LIBS) AND NOT MSVC)
     # Remove unreferenced functions: function level linking
     add_extra_compiler_option(-ffunction-sections)
     add_extra_compiler_option(-fdata-sections)
@@ -266,6 +270,7 @@

 # set default visibility to hidden
 if((CV_GCC OR CV_CLANG)
+    AND NOT MSVC
     AND NOT OPENCV_SKIP_VISIBILITY_HIDDEN
     AND NOT " ${CMAKE_CXX_FLAGS} ${OPENCV_EXTRA_FLAGS} ${OPENCV_EXTRA_CXX_FLAGS}" MATCHES " -fvisibility")
   add_extra_compiler_option(-fvisibility=hidden)


Wasm.cmake: add exceptions in debug build

--- cmake/WasmEmscriptenOptions.cmake
+++ cmake/WasmEmscriptenOptions.cmake
@@ -3,11 +3,11 @@

 # Debug build is  -O0 -g4 in order to have the call stack + source map
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g4")
+    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g4 -s DISABLE_EXCEPTION_CATCHING=0")

     # source-map-base enables to be able to "kind of debug" from the js developper console
     # Advice: always debug the same exact source code on desktop before even trying to run in the browser
-    # add_link_options(--source-map-base http://localhost:8001/src/)
+    add_link_options(-O0 --source-map-base http://localhost:8000/src/)
 endif()

 #add_link_options(--preload-file build/assets@/)


Revert "Always pass -fcolor-diagnostics to clang."

This commit didn't enable color diagnostics for ninja but confuses jenkins
because it enabled color diagnostics there and now our error scanner cannot
work.

This reverts commit 102fb9decb2faa6772845ba7ad5356882e091d3f.

--- cmake/modules/CheckCompiler.cmake
+++ cmake/modules/CheckCompiler.cmake
@@ -33,12 +33,10 @@
   string(REGEX REPLACE "^.*[ ]version[ ][0-9]+\\.([0-9]+).*" "\\1" CLANG_MINOR "${_clang_version_info}")
   message(STATUS "Found Clang. Major version ${CLANG_MAJOR}, minor version ${CLANG_MINOR}")
   set(COMPILER_VERSION clang${CLANG_MAJOR}${CLANG_MINOR})
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics")
   if(ccache)
     # https://bugzilla.samba.org/show_bug.cgi?id=8118 and color.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -fcolor-diagnostics")
   endif()
 else()
   set(CLANG_MAJOR 0)


Add macro to add compile options to ROOT

The intended use of this macro is to add compile options that are not
requirements of ROOT, like options to ignore certain warnings. However,
since the option names depend on the compiler, check each flag before
adding it to the list, so that only supported flags are added.


fix wrong cmake var evaluation

fix wrong cmake var evaluation

--- cmakemodules/DeclareMRPTLib.cmake
+++ cmakemodules/DeclareMRPTLib.cmake
@@ -407,7 +407,7 @@
 		endif(MSVC)
 	else() # it IS headers_only:
 		install(TARGETS ${name} EXPORT mrpt-${name}-targets)
-	endif (NOT ${headers_only})
+	endif ()

 	# Create module CMake config file:
 	# For local usage from the BUILD directory (without "install"):
@@ -431,7 +431,7 @@

 	# Regular arch-dep libraries get to LIBDIR (/usr/lib), while
 	# arch-indep (headers-only) go to DATADIR (/usr/share):
-	if (headers_only)
+	if (${headers_only})
 		set(LIB_TARGET_INSTALL_DEST ${CMAKE_INSTALL_DATADIR})
 	else()
 		set(LIB_TARGET_INSTALL_DEST ${CMAKE_INSTALL_LIBDIR})


[cmake] fix sm 86 is only for cuda >= 11.1

--- cmake/ChooseCudaCC.cmake
+++ cmake/ChooseCudaCC.cmake
@@ -80,8 +80,11 @@
   #
   set(CUDA_MIN_CC 20)
   set(CUDA_MAX_CC 86)
-  if(CUDA_VERSION_MAJOR GREATER_EQUAL 11)
+  if(CUDA_VERSION VERSION_GREATER_EQUAL 11.1)
     set(CUDA_MIN_CC 35)
+  elseif(CUDA_VERSION_MAJOR GREATER_EQUAL 11)
+    set(CUDA_MIN_CC 35)
+    set(CUDA_MAX_CC 80)
   elseif(CUDA_VERSION_MAJOR GREATER_EQUAL 10)
     set(CUDA_MIN_CC 30)
     set(CUDA_MAX_CC 75)


Update CodeCoverage.cmake

Update CodeCoverage.cmake

--- cmake/CodeCoverage.cmake
+++ cmake/CodeCoverage.cmake
@@ -1,4 +1,4 @@
-FIND_PROGRAM(GCOV_PATH gcov-$ENV{GCOV_VERSION})
+FIND_PROGRAM(GCOV_PATH gcov PATHS /usr/bin)
 FIND_PROGRAM(LCOV_PATH lcov)
 FIND_PROGRAM(GENHTML_PATH genhtml)


exclude python module initialization and OpenCV's allocator and conversions code from coverage

--- cmake/CodeCoverage.cmake
+++ cmake/CodeCoverage.cmake
@@ -143,7 +143,7 @@
 		# Capturing lcov counters and generating report
 		COMMAND ${LCOV_PATH} --directory . --capture --output-file ${_outputname}.info.tmp
 		COMMAND ${LCOV_PATH} --extract ${_outputname}.info.tmp '*elm*' --output-file ${_outputname}.info.tmp
-		COMMAND ${LCOV_PATH} --remove ${_outputname}.info.tmp 'tests/*' 'test/*' '/usr/*' '/opt/*' 'opencv/modules/*' --output-file ${_outputname}.info
+		COMMAND ${LCOV_PATH} --remove ${_outputname}.info.tmp 'python/*alloc*' 'python/conversions_cv*' 'python/elmpy*' 'test/*' 'tests/*' '/usr/*' '/opt/*' 'opencv/modules/*' --output-file ${_outputname}.info
 		COMMAND ${GENHTML_PATH} -o ${_outputname} ${_outputname}.info
 		COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info.tmp*


make apf_sim and gmi_sim optional tribits packages

--- cmake/Dependencies.cmake
+++ cmake/Dependencies.cmake
@@ -1,10 +1,11 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
+  LIB_OPTIONAL_PACKAGES
+    SCORECgmi_sim
+    SCORECapf_sim
   LIB_REQUIRED_PACKAGES
     SCORECpcu
     SCORECgmi
-    SCORECgmi_sim
     SCORECapf
-    SCORECapf_sim
     SCORECmds
     SCORECparma
     SCORECapf_zoltan


Same as SVN commit r815981 by neundorf: search in more directories (i.e. allow me to set CMAKE_PREFIX_PATH to kdesupport's prefix)

svn path=/trunk/kdesupport/phonon/; revision=816900

--- cmake/FindAutomoc4.cmake
+++ cmake/FindAutomoc4.cmake
@@ -23,9 +23,16 @@
    set(AUTOMOC4_CONFIG_FILE "${KDESupport_SOURCE_DIR}/automoc/Automoc4Config.cmake")
 else("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
    # when building this project outside kdesupport
+
+   # CMAKE_[SYSTEM_]PREFIX_PATH exists starting with cmake 2.6.0
+   file(TO_CMAKE_PATH "$ENV{CMAKE_PREFIX_PATH}" _env_CMAKE_PREFIX_PATH)
+   file(TO_CMAKE_PATH "$ENV{CMAKE_LIBRARY_PATH}" _env_CMAKE_LIBRARY_PATH)
+
    find_file(AUTOMOC4_CONFIG_FILE NAMES Automoc4Config.cmake
              PATH_SUFFIXES automoc4 lib/automoc4 lib64/automoc4
-             PATHS ${CMAKE_SYSTEM_PREFIX_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib
+             PATHS ${_env_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH} ${CMAKE_SYSTEM_PREFIX_PATH}
+                   ${_env_CMAKE_LIBRARY_PATH} ${CMAKE_LIBRARY_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH}
+                   ${CMAKE_INSTALL_PREFIX}/lib
              NO_DEFAULT_PATH )
 endif("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")


Install appdata to $PREFIX/share/metainfo, not the old appdata dir.

--- cmake/FindIntltool.cmake
+++ cmake/FindIntltool.cmake
@@ -17,7 +17,7 @@
             ${INTLTOOL_MERGE_EXECUTABLE} --xml-style ${CMAKE_SOURCE_DIR}/${po_dir}
                 ${CMAKE_CURRENT_SOURCE_DIR}/${appstream_name}.in ${appstream_name}
         )
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${appstream_name} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
+        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${appstream_name} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
     endmacro (INTLTOOL_MERGE_APPDATA appstream_name po_dir)
     macro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
         add_custom_target (org.gnome.Geary.desktop ALL


CMake: cxx flags bugfix

CMake: cxx flags bugfix

--- cmake/globalconfig.cmake
+++ cmake/globalconfig.cmake
@@ -231,24 +231,24 @@
     mark_as_advanced(IVW_FORCE_SHARED_CRT)
     if(SHARED_LIBS OR IVW_FORCE_SHARED_CRT)
         set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD")
-        set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_DEBUG} /MD")
+        set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MD")
         set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd")
-        set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} /MDd")
+        set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MD")

         set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
-        set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_DEBUG} /MD")
+        set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MD")
         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} /MDd")
+        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
     else()
         set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
-        set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_DEBUG} /MT")
+        set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MT")
         set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
-        set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} /MTd")
+        set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")

         set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-        set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_DEBUG} /MT")
+        set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
-        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} /MTd")
+        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
     endif()

     # For >=VS2015 enable edit and continue "ZI"


fixed a typo

fixed a typo

git-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@6445 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/pcl_find_sse.cmake
+++ cmake/pcl_find_sse.cmake
@@ -138,7 +138,7 @@
       endif ()

     endif()
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${SSE_FLAGS}")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${SSE_FLAGS}")
     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${SSE_FLAGS}")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${SSE_FLAGS}")


Delete overlapping macros

Delete overlapping macros

SSE3 and SSE4.1 is checked in PCL_CHECK_FOR_SSE.
Also, These macros doesn't to using.

--- cmake/pcl_find_sse.cmake
+++ cmake/pcl_find_sse.cmake
@@ -205,53 +205,3 @@
         endif()
     endif()
 endmacro(PCL_CHECK_FOR_SSE)
-
-###############################################################################
-# Check for the presence of SSE 4.1
-macro(PCL_CHECK_FOR_SSE4_1)
-  include(CheckCXXSourceRuns)
-  set(CMAKE_REQUIRED_FLAGS)
-
-  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-      set(CMAKE_REQUIRED_FLAGS "-msse4.1")
-  endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-
-  check_cxx_source_runs("
-      #include <smmintrin.h>
-      int main()
-      {
-        __m128 a, b;
-        float vals[4] = {1, 2, 3, 4};
-        const int mask = 123;
-        a = _mm_loadu_ps(vals);
-        b = a;
-        b = _mm_dp_ps (a, a, mask);
-        _mm_storeu_ps(vals,b);
-        return 0;
-      }"
-      HAVE_SSE4_1_EXTENSIONS "CHECK_FOR_SSE4_1")
-endmacro(PCL_CHECK_FOR_SSE4_1)
-
-###############################################################################
-# Check for the presence of SSE 3
-macro(PCL_CHECK_FOR_SSE3)
-  include(CheckCXXSourceRuns)
-  set(CMAKE_REQUIRED_FLAGS)
-
-  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-      set(CMAKE_REQUIRED_FLAGS "-msse3")
-  endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-
-  check_cxx_source_runs("
-      #include <pmmintrin.h>
-      int main ()
-      {
-          __m128d a, b;
-          double vals[2] = {0};
-          a = _mm_loadu_pd (vals);
-          b = _mm_hadd_pd (a,a);
-          _mm_storeu_pd (vals, b);
-          return (0);
-      }"
-      HAVE_SSE3_EXTENSIONS)
-endmacro(PCL_CHECK_FOR_SSE3)


fix for compiling on edison

fix for compiling on edison

--- Edison.cmake
+++ Edison.cmake
@@ -1,4 +1,4 @@
-if(EDISON_BUILD)
+if(EDISON_BUILD AND (NOT ${CMAKE_SYSTEM_VERSION} EQUAL 3.10.17-poky-edison+))
 	#Are you using the 32 or the 64 bits version of the SDK?.
 	set(SDK_32bits FALSE) #Use this line for the 64 bits SDK
 	#set(SDK_32bits TRUE) #Use this line for the 32 bits SDK
@@ -29,7 +29,7 @@
 			set(CMAKE_MAKE_PROGRAM "C:/Program Files (x86)/mingw-w64/i686-4.9.2-posix-dwarf-rt_v3-rev1/mingw32/bin/mingw32-make.exe")
 		endif()
 		set(CMAKE_C_COMPILER ${cross_compiler_sysroot}/usr/bin/i586-poky-linux/i586-poky-linux-gcc.exe)
-		set(CMAKE_CXX_COMPILER ${cross_compiler_sysroot}/usr/bin/i586-poky-linux/i586-poky-linux-g++.exe)
+		set(CMAKE_CXX_COMPILER ${cross_compiler_sysroot}/usr/bin/i586-poky-linux/i586-poky-linux-g++.exe)
 	else()
 		#Linux host
 		if(${SDK_32bits})
@@ -42,7 +42,7 @@
 			set(cross_compiler_sysroot ${edison_sdk_root}/sysroots/x86_64-pokysdk-linux)
 		endif()
 		set(CMAKE_C_COMPILER ${cross_compiler_sysroot}/usr/bin/i586-poky-linux/i586-poky-linux-gcc)
-		set(CMAKE_CXX_COMPILER ${cross_compiler_sysroot}/usr/bin/i586-poky-linux/i586-poky-linux-g++)
+		set(CMAKE_CXX_COMPILER ${cross_compiler_sysroot}/usr/bin/i586-poky-linux/i586-poky-linux-g++)
 	ENDIF(WIN32)

@@ -78,4 +78,4 @@
 			add_deployment_file("${filename}" "${DEST}/${path}")
 		endforeach(filename)
 	endmacro()
-endif(EDISON_BUILD)+endif(EDISON_BUILD)


Improve ExternalProject cmake file (#3697)

* Set cmake CMP0144, if available

Signed-off-by: Robert Adam <34c6fceca75e456f25e7e99531e2425c6c1de443@robert-adam.de>

* Add include dirs directly to defined targets

By directly associating the defined antlr_* targets with the respective
include directories, we make sure that any user that links against one
of these targets, automatically has the necessary directories in their
include path as well (without the need to explicitly specify them) as
cmake will transitively propagate the interface include dirs to the
linked-to target.

Signed-off-by: Robert Adam <34c6fceca75e456f25e7e99531e2425c6c1de443@robert-adam.de>

--- runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
+++ runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
@@ -1,4 +1,8 @@
 cmake_minimum_required(VERSION 3.7)
+
+if(POLICY CMP0114)
+    cmake_policy(SET CMP0114 NEW)
+endif()

 include(ExternalProject)

@@ -10,6 +14,10 @@
   # Set to commit hash to keep the build stable and does not need to rebuild after 'clean'
   set(ANTLR4_TAG master)
 endif()
+
+# Ensure that the include dir already exists at configure time (to avoid cmake erroring
+# on non-existent include dirs)
+file(MAKE_DIRECTORY "${ANTLR4_INCLUDE_DIRS}")

 if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
   set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(Configuration))
@@ -135,6 +143,10 @@
 add_dependencies(antlr4_static antlr4_runtime-build_static)
 set_target_properties(antlr4_static PROPERTIES
                       IMPORTED_LOCATION ${ANTLR4_STATIC_LIBRARIES})
+target_include_directories(antlr4_static
+    INTERFACE
+        ${ANTLR4_INCLUDE_DIRS}
+)

 ExternalProject_Add_Step(
     antlr4_runtime
@@ -152,6 +164,11 @@
 add_dependencies(antlr4_shared antlr4_runtime-build_shared)
 set_target_properties(antlr4_shared PROPERTIES
                       IMPORTED_LOCATION ${ANTLR4_RUNTIME_LIBRARIES})
+target_include_directories(antlr4_shared
+    INTERFACE
+        ${ANTLR4_INCLUDE_DIRS}
+)
+
 if(ANTLR4_SHARED_LIBRARIES)
   set_target_properties(antlr4_shared PROPERTIES
                         IMPORTED_IMPLIB ${ANTLR4_SHARED_LIBRARIES})


Add PROJECT_NAME to git update target name

When projects are built as SubProjects the target cannot be created if the
name already exists

--- GitExternal.cmake
+++ GitExternal.cmake
@@ -107,7 +107,7 @@
         list(GET DATA 2 TAG)

         # Create a unique, flat name
-        string(REPLACE "/" "_" GIT_EXTERNAL_NAME ${DIR})
+        string(REPLACE "/" "_" GIT_EXTERNAL_NAME ${DIR}_${PROJECT_NAME})

         if(NOT TARGET update_git_external_${GIT_EXTERNAL_NAME}) # not done
           # pull in identified external


ImportedProjectUtils: Ensure that paths are quotes properly

--- ImportedProjectUtils.cmake
+++ ImportedProjectUtils.cmake
@@ -341,20 +341,20 @@

         list (APPEND CREATE_METAPROJECT_OPTIONS
               CMAKE_ARGS
-              "\"-C${INITIAL_CACHE}\"")
+              "-C${INITIAL_CACHE}")
     else ()

         math (EXPR CREATE_METAPROJECT_CMAKE_ARGS_INSERT_INDEX
               "${CREATE_METAPROJECT_CMAKE_ARGS_INDEX} + 1")
         list (INSERT CREATE_METAPROJECT_OPTIONS
               "${CREATE_METAPROJECT_CMAKE_ARGS_INSERT_INDEX}"
-              "\"-C${INITIAL_CACHE}\"")
+              "-C${INITIAL_CACHE}")

     endif ()

     # Need to pass this as space separated later
-    string (REPLACE ";" " " CREATE_METAPROJECT_OPTIONS
-            "${CREATE_METAPROJECT_OPTIONS}")
+    cmake_spacify_list (CREATE_METAPROJECT_OPTIONS
+                        LIST ${CREATE_METAPROJECT_OPTIONS})

     # Escape spaces in the generator so that they aren't turned into list
     # separators when passing them to add_custom_command
@@ -393,7 +393,7 @@
         set (METAPROJECT_APPEND_EXPORT_SCRIPT_CONTENTS
              "file (APPEND \"${APPEND_TO}\"\n"
              "      \"\\nexport (TARGETS ${EXPORTED}\\n\"\n"
-             "      \"           FILE \"${EXPORTS}.cmake\")\\n\")\n")
+             "      \"           FILE \\\"${EXPORTS}.cmake\\\")\\n\")\n")
         string (REPLACE ";" ""
                 METAPROJECT_APPEND_EXPORT_SCRIPT_CONTENTS
                 "${METAPROJECT_APPEND_EXPORT_SCRIPT_CONTENTS}")
@@ -445,8 +445,8 @@
                                 COMMAND
                                 "${CMAKE_COMMAND}"
                                 ..
-                                -C${INITIAL_CACHE}
-                                -G${CMAKE_GENERATOR}
+                                "-C${INITIAL_CACHE}"
+                                "-G${CMAKE_GENERATOR}"
                                 WORKING_DIRECTORY
                                 "${METAPROJECT_BUILD_DIR}")


cmake: update SOVERSION

cmake: update SOVERSION

- OpenCV 4.x doesn't guarantee or maintain ABI compatibility
- We should increase SO version on each release

--- cmake/OpenCVVersion.cmake
+++ cmake/OpenCVVersion.cmake
@@ -10,8 +10,10 @@

 set(OPENCV_VERSION "${OPENCV_VERSION_PLAIN}${OPENCV_VERSION_STATUS}")

-set(OPENCV_SOVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}")
-set(OPENCV_LIBVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
+string(REGEX MATCH "[0-9][0-9]$" OPENCV_VERSION_MINOR_2DIGITS "00${OPENCV_VERSION_MINOR}")
+string(REGEX MATCH "[0-9][0-9]$" OPENCV_VERSION_PATCH_2DIGITS "00${OPENCV_VERSION_PATCH}")
+ocv_update(OPENCV_SOVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR_2DIGITS}")
+ocv_update(OPENCV_LIBVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")

 # create a dependency on the version file
 # we never use the output of the following command but cmake will rerun automatically if the version file changes


TundraInstall.cmake: add setup_remove_directory.

--- cmake/TundraInstall.cmake
+++ cmake/TundraInstall.cmake
@@ -154,7 +154,7 @@
 endfunction ()

 # Macro removes file from install <prefix>
-# Handy for removing files you dont want in the installation after setup_install_directory() or setup_install_files_find().
+# Handy for removing files you don't want in the installation after setup_install_directory() or setup_install_files_find().
 #
 # Example: setup_remove_file ("data/assets/dummy.txt")
 #
@@ -163,6 +163,17 @@
     install (CODE "file (REMOVE ${CMAKE_INSTALL_PREFIX}/bin/${FILE_PATH})")
     install (CODE "message(\" \")")
 endfunction ()
+
+# Removes directory and its content recursively from install <prefix>
+# Handy for removing directories you don't want in the installation after setup_install_directory() or setup_install_files_find().
+#
+# Example: setup_remove_directory("data/assets/translations")
+#
+function(setup_remove_directory FILE_PATH)
+    install(CODE "message(\"\nRemoving directory ${CMAKE_INSTALL_PREFIX}/bin/${FILE_PATH}\")")
+    install(CODE "file (REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/bin/${FILE_PATH})")
+    install(CODE "message(\" \")")
+endfunction()

 # Macro for installing the target build results into the install prefix.
 # This macro gets called automatically in final_target() for all projects.


CMake: fix long lines

CMake: fix long lines

--- cmake/bitcode_rules.cmake
+++ cmake/bitcode_rules.cmake
@@ -41,7 +41,9 @@
         "${CMAKE_SOURCE_DIR}/include/pocl_types.h"
         "${CMAKE_SOURCE_DIR}/include/_kernel_c.h"
         ${KERNEL_DEPEND_HEADERS}
-        COMMAND "${CLANG}" ${CLANG_FLAGS} ${KERNEL_CL_FLAGS} ${DEVICE_CL_FLAGS} "-D__CBUILD__" "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}" "-include" "${CMAKE_SOURCE_DIR}/include/_kernel_c.h"
+        COMMAND "${CLANG}" ${CLANG_FLAGS} ${KERNEL_CL_FLAGS} ${DEVICE_CL_FLAGS}
+        "-D__CBUILD__" "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}"
+        "-include" "${CMAKE_SOURCE_DIR}/include/_kernel_c.h"
         COMMENT "Building C to LLVM bitcode ${BC_FILE}"
         VERBATIM)
 endfunction()
@@ -59,7 +61,8 @@
     add_custom_command(OUTPUT "${BC_FILE}"
         DEPENDS "${FULL_F_PATH}"
           ${KERNEL_DEPEND_HEADERS}
-        COMMAND  "${CLANGXX}" ${CLANG_FLAGS} ${KERNEL_CLANGXX_FLAGS} ${DEVICE_CL_FLAGS} "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}"
+        COMMAND  "${CLANGXX}" ${CLANG_FLAGS} ${KERNEL_CLANGXX_FLAGS}
+        ${DEVICE_CL_FLAGS} "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}"
         COMMENT "Building C++ to LLVM bitcode ${BC_FILE}"
         VERBATIM)
 endfunction()


Made android tool invocation silent during cmake run

--- cmake/oryol_android.cmake
+++ cmake/oryol_android.cmake
@@ -10,7 +10,7 @@
 macro(oryol_android_create_project target)

     # call the android SDK tool to create a new project
-    execute_process(COMMAND ${ANDROID_SDK_TOOL} create project
+    execute_process(COMMAND ${ANDROID_SDK_TOOL} --silent create project
                     --path ${CMAKE_CURRENT_BINARY_DIR}/android
                     --target ${ANDROID_PLATFORM}
                     --name ${target}


remove unusable/broken old method of specifying which compiler to use

--- cmake/ospray_macros.cmake
+++ cmake/ospray_macros.cmake
@@ -364,39 +364,8 @@
 ## Compiler configuration macro ##

 MACRO(OSPRAY_CONFIGURE_COMPILER)
-  # enable ability for users to force a compiler using the pre-0.8.3 method
-  # (doesn't work right now!)
-  SET(OSPRAY_COMPILER "" CACHE STRING "Force compiler: GCC, ICC, CLANG")
-  SET_PROPERTY(CACHE OSPRAY_COMPILER PROPERTY STRINGS GCC ICC CLANG)
-  MARK_AS_ADVANCED(OSPRAY_COMPILER)
-
   # unhide compiler to make it easier for users to see what they are using
   MARK_AS_ADVANCED(CLEAR CMAKE_CXX_COMPILER)
-
-  IF(NOT ":${OSPRAY_COMPILER}" STREQUAL ":")
-    STRING(TOUPPER ${OSPRAY_COMPILER} OSPRAY_COMPILER)
-    IF(${OSPRAY_COMPILER} STREQUAL "GCC")
-      FIND_PROGRAM(GCC_EXECUTABLE gcc DOC "Path to the gcc executable.")
-      FIND_PROGRAM(G++_EXECUTABLE g++ DOC "Path to the g++ executable.")
-      SET(CMAKE_C_COMPILER ${GCC_EXECUTABLE} CACHE STRING "C Compiler" FORCE)
-      SET(CMAKE_CXX_COMPILER ${G++_EXECUTABLE} CACHE STRING "CXX Compiler" FORCE)
-      SET(CMAKE_C_COMPILER "gcc")
-      SET(CMAKE_CXX_COMPILER "g++")
-      SET(CMAKE_CXX_COMPILER_ID "GNU")
-    ELSEIF(${OSPRAY_COMPILER} STREQUAL "ICC")
-      FIND_PROGRAM(ICC_EXECUTABLE icc DOC "Path to the icc executable.")
-      FIND_PROGRAM(ICPC_EXECUTABLE icpc DOC "Path to the icpc executable.")
-      SET(CMAKE_C_COMPILER ${ICC_EXECUTABLE} CACHE STRING "CXX Compiler" FORCE)
-      SET(CMAKE_CXX_COMPILER ${ICPC_EXECUTABLE} CACHE STRING "CXX Compiler" FORCE)
-      SET(CMAKE_CXX_COMPILER_ID "Intel")
-    ELSEIF(${OSPRAY_COMPILER} STREQUAL "CLANG")
-      FIND_PROGRAM(CLANG_EXECUTABLE clang DOC "Path to the clang executable.")
-      FIND_PROGRAM(CLANG_EXECUTABLE clang++ DOC "Path to the clang++ executable.")
-      SET(CMAKE_C_COMPILER ${CLANG_EXECUTABLE} CACHE STRING "C Compiler" FORCE)
-      SET(CMAKE_CXX_COMPILER ${CLANG_EXECUTABLE} CACHE STRING "CXX Compiler" FORCE)
-      SET(CMAKE_CXX_COMPILER_ID "Clang")
-    ENDIF()
-  ENDIF()

   IF (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
     SET(OSPRAY_COMPILER_ICC   ON )


restrict hardening to Unix systems.

restrict hardening to Unix systems.

--- cmake/qibuild/flags.cmake
+++ cmake/qibuild/flags.cmake
@@ -103,7 +103,7 @@
   _qi_add_flags(CMAKE_CXX_FLAGS "-m32")
 endif()

-if(QI_WITH_HARDENING)
+if(QI_WITH_HARDENING AND UNIX AND NOT APPLE)
   qi_info("Enabling hardening")
   set(hardening_flags "-pie -fPIE -Wl,-z,relro,-z,now -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong")
   _qi_add_flags(CMAKE_C_FLAGS ${hardening_flags})


build: enable out_http, out_splunk and out_es on Windows

These plugins are already ported to Windows. Just plug in them.

Signed-off-by: Fujimoto Seiji <ef879192bb1e41d519c82cf76440dc8e9a530806@clear-code.com>

--- cmake/windows-setup.cmake
+++ cmake/windows-setup.cmake
@@ -8,6 +8,7 @@
 set(FLB_LUAJIT                Yes)
 set(FLB_EXAMPLES               No)
 set(FLB_PARSER                Yes)
+set(FLB_TLS                   Yes)

 # Windows does not support strptime(3)
 set(FLB_SYSTEM_STRPTIME        No)
@@ -42,18 +43,18 @@
 set(FLB_OUT_AZURE              No)
 set(FLB_OUT_BIGQUERY           No)
 set(FLB_OUT_COUNTER           Yes)
-set(FLB_OUT_ES                 No)
+set(FLB_OUT_ES                Yes)
 set(FLB_OUT_EXIT               No)
 set(FLB_OUT_FORWARD            No)
 set(FLB_OUT_GELF               No)
-set(FLB_OUT_HTTP               No)
+set(FLB_OUT_HTTP              Yes)
 set(FLB_OUT_INFLUXDB           No)
 set(FLB_OUT_NATS               No)
 set(FLB_OUT_PLOT               No)
 set(FLB_OUT_FILE               No)
 set(FLB_OUT_TD                 No)
 set(FLB_OUT_RETRY              No)
-set(FLB_OUT_SPLUNK             No)
+set(FLB_OUT_SPLUNK            Yes)
 set(FLB_OUT_STACKDRIVER        No)
 set(FLB_OUT_STDOUT            Yes)
 set(FLB_OUT_LIB                No)


broken test

broken test

--- neulib_com.cmake
+++ neulib_com.cmake
@@ -19,6 +19,7 @@
   ExternalProject_Add(${libneurolabi_NAME}
     PREFIX              ${BUILDEM_DIR}
     GIT_REPOSITORY      ${libneurolabi_URL}
+    CONFIGURE_COMMAND   git checkout master
     BUILD_COMMAND       ${BUILDEM_ENV_STRING} ${libneurolabi_SRC_DIR}/neurolabi/update_library ${config_args}
     BUILD_IN_SOURCE     1
     INSTALL_COMMAND     ${BUILDEM_ENV_STRING} ${libneurolabi_SRC_DIR}/neurolabi/install_library ${BUILDEM_DIR} ${libname}


update example config file

update example config file

--- config/user_options.cmake
+++ config/user_options.cmake
@@ -28,15 +28,15 @@
 ##############################################################################

 # Paths to Intel TBB
-SET (TBB_ROOT "C:/Program Files/Intel/TBB/4/2")
-SET (TBB_INC_PATH "$TBB_ROOT/include" CACHE PATH "TBB include")
-IF (MSVC_VERSION GREATER 1800)
-    SET (VSMC_LIB_PATH "$TBB_ROOT/lib/vc12" CACHE PATH "TBB lib")
-ELSEIF (MSVC_VERSION GREATER 1700)
-    SET (VSMC_LIB_PATH "$TBB_ROOT/lib/vc11" CACHE PATH "TBB lib")
-ELSEIF (MSVC_VERSION GREATER 1600)
-    SET (VSMC_LIB_PATH "$TBB_ROOT/lib/vc10" CACHE PATH "TBB lib")
-ENDIF (MSVC_VERSION GREATER 1800)
+SET (TBB_ROOT "C:/Program Files/Intel/TBB/4.2")
+SET (TBB_INC_PATH "${TBB_ROOT}/include" CACHE PATH "TBB include")
+IF (MSVC_VERSION EQUAL 1600)
+    SET (TBB_LIB_PATH "${TBB_ROOT}/lib/intel64/vc10" CACHE PATH "TBB lib")
+ELSEIF (MSVC_VERSION EQUAL 1700)
+    SET (TBB_LIB_PATH "${TBB_ROOT}/lib/intel64/vc11" CACHE PATH "TBB lib")
+ELSEIF (MSVC_VERSION EQUAL 1800)
+    SET (TBB_LIB_PATH "${TBB_ROOT}/lib/intel64/vc12" CACHE PATH "TBB lib")
+ENDIF (MSVC_VERSION EQUAL 1600)

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

@@ -48,14 +48,26 @@

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

-# Enable/Disable checking features
+# Disable checking features
+SET (AESNI_FOUND   FALSE CACHE BOOL "NO AES-NI")
+SET (GCD_FOUND     FALSE CACHE BOOL "NO GCD")
+SET (GSL_FOUND     FALSE CACHE BOOL "NO GSL")
+SET (INT128_FOUND  FALSE CACHE BOOL "NO int128")
+SET (MKL_FOUND     FALSE CACHE BOOL "NO MKL")
 SET (RD_RAND_FOUND FALSE CACHE BOOL "NO RdRand")
 SET (RD_SEED_FOUND FALSE CACHE BOOL "NO RdSeed")
-SET (AESNI_FOUND   FALSE CACHE BOOL "NO AES-NI")
-SET (INT128_FOUND  FALSE CACHE BOOL "NO int128")
+SET (TESTU01_FOUND FALSE CACHE BOOL "NO TestU01")
 SET (VSMC_CONSTEXPR_ENGINE_FOUND FALSE CACHE BOOL "NO constexpr min/max")
+
 SET (VSMC_ENABLE_CXX11 ON CACHE BOOL "Try C++11")
-SET (VSMC_ENABLE_CXX11LIB_THREAD ON CACHE BOOL "Try C++11 <thread>")
-IF (MSVC_VERSION GREATER 1700)
-    SET (VSMC_ENABLE_CXX11LIB_FUTURE ON CACHE BOOL "Try C++11 <future>")
-ENDIF (MSVC_VERSION GREATER 1700)
+
+IF (MSVC_VERSION LESS 1700)
+    SET (VSMC_RANDOM_STD_FOUND FALSE CACHE BOOL "NO C++11 <random>")
+    SET (VSMC_STDTBB_FOUND     FALSE CACHE BOOL "NO C++11 concurrency")
+ENDIF (MSVC_VERSION LESS 1700)
+
+IF (MSVC_VERSION LESS 1800)
+    SET (CXX11LIB_TUPLE_FOUND      FALSE CACHE BOOL "NO C++11 <tuple>")
+    SET (VSMC_CXX11_MATH_STD_FOUND FALSE CACHE BOOL "NO C++11 <cmath>")
+    SET (VSMC_CXX11_MATH_C99_FOUND FALSE CACHE BOOL "NO C99 <math.h>")
+ENDIF (MSVC_VERSION LESS 1800)


Fix the error: Not found unicode/udat.h

Fix the error: Not found unicode/udat.h

--- dep/icu.cmake
+++ dep/icu.cmake
@@ -10,7 +10,8 @@
 #///   - ${TBAG_DEP_ICU_LIBRARIES}

 set (TBAG_DEP_ICU_NAME          "libtbag-icu")
-set (TBAG_DEP_ICU_INCLUDE_DIRS  "${PROJECT_SOURCE_DIR}/dep/icu/common")
+set (TBAG_DEP_ICU_INCLUDE_DIRS  "${PROJECT_SOURCE_DIR}/dep/icu/common"
+                                "${PROJECT_SOURCE_DIR}/dep/icu/i18n")
 set (TBAG_DEP_ICU_LIBRARIES     "${PROJECT_SOURCE_DIR}/dep/icu/lib/libicudata.a"
                                 "${PROJECT_SOURCE_DIR}/dep/icu/lib/libicui18n.a"
                                 "${PROJECT_SOURCE_DIR}/dep/icu/lib/libicuuc.a")


SVN_SILENT made messages (.desktop file)

--- ds9/ds9.desktop.cmake
+++ ds9/ds9.desktop.cmake
@@ -19,6 +19,7 @@
 Name[el]=DirectShow9
 Name[es]=DirectShow9
 Name[et]=DirectShow9
+Name[ga]=DirectShow9
 Name[gl]=DirectShow9
 Name[hu]=DirectShow9
 Name[it]=DirectShow9


Remove the "flexisip" systemd script because it has no meaning. There is flexisip-proxy, flexisip-conference, and flexisip-presence. There is no way for the moment to group the three targets on a single one.

--- build/rpm/flexisip.spec.cmake
+++ build/rpm/flexisip.spec.cmake
@@ -130,8 +130,6 @@
 %endif

 mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
-install -p -m 0644 scripts/flexisip.service $RPM_BUILD_ROOT/lib/systemd/system
-install -p -m 0644 scripts/flexisip\@.service $RPM_BUILD_ROOT/lib/systemd/system
 install -p -m 0644 scripts/flexisip-proxy.service $RPM_BUILD_ROOT/lib/systemd/system
 install -p -m 0644 scripts/flexisip-proxy\@.service $RPM_BUILD_ROOT/lib/systemd/system
 %if @ENABLE_PRESENCE@


Revert "fix(flexisip.spec): please, only use epoch when you understand its meaning"

This reverts commit c23a39bc0f92362489e7fb37517bd8f8400a58d7.

--- build/rpm/flexisip.spec.cmake
+++ build/rpm/flexisip.spec.cmake
@@ -16,6 +16,8 @@
 Version:       @PROJECT_VERSION@
 Release:       %build_number%{?dist}

+#to be alined with redhat which changed epoc to 1 for an unknown reason
+Epoch:         1
 License:       AGPLv3
 Group:         Applications/Communications
 URL:           http://flexisip.org


cmake: Update LAPACK

cmake: Update LAPACK

$ git shortlog 7851b1869..eb6fac41 --no-merges
Jean-Christophe Fillion-Robin (3):
      cmake: Remove redundant call to "enable_testing()"
      cmake: Enable BUILD_TESTING by default if build type is coverage
      cmake: Attempt to find python interpreter only if BUILD_TESTING is ON

--- SuperBuild/External_LAPACK.cmake
+++ SuperBuild/External_LAPACK.cmake
@@ -35,7 +35,7 @@

   ExternalProject_SetIfNotDefined(
     Slicer_${proj}_GIT_TAG
-    "7851b1869cd798d1e7cd0ec4b69059012921c57f"
+    "eb6fac41396e383e5c780b1afd01512848a7bcf9"
     QUIET
     )


BUG: Update the Python package URL, nightly to latest

Change-Id: I7492d2f3298a1dd86091f697f7f4f5a5619281de

--- Superbuild/External-Python.cmake
+++ Superbuild/External-Python.cmake
@@ -31,6 +31,6 @@
     SOURCE_DIR ${_virtualenv_SOURCE_DIR}
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ${PYTHON_EXECUTABLE} "${_virtualenv_script}" "${_itk_venv}"
-    INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install itk sphinx -f https://github.com/InsightSoftwareConsortium/ITKPythonPackage/releases/tag/nightly
+    INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install itk sphinx -f https://github.com/InsightSoftwareConsortium/ITKPythonPackage/releases/tag/latest
     )
 endif()


CMake: bug fix: OmniORB detection: Python backend is detected by looking for the file omniidl_be/python.py (was omniidl_be/__init__.py)

--- salome_adm/cmake_files/FindOmniORB.cmake
+++ salome_adm/cmake_files/FindOmniORB.cmake
@@ -107,7 +107,7 @@
      NAMES python.py PATHS "/lib/python/omniidl_be" DOC ${_doc})
 ELSE()
   FIND_PATH(OMNIORB_PYTHON_BACKEND
-     NAMES __init__.py
+     NAMES python.py
      PATHS "/lib/python${_py_version}/site-packages/omniidl_be" "/usr/lib/omniidl/omniidl_be"
      DOC ${_doc})
 ENDIF()


Hopefully fix LD_LIBRARY_PATH issues in travis

--- cmake/GetLibStdCXX.cmake
+++ cmake/GetLibStdCXX.cmake
@@ -3,6 +3,10 @@
 ProcessorCount(N)

 message(STATUS "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}")
+
+# clear LD_LIBRARY_PATH, but restore it after
+set(BEFORE_LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH})
+set(ENV{LD_LIBRARY_PATH})

 if(UNIX AND NOT APPLE AND NOT WIN32)

@@ -54,7 +58,9 @@
 # 	execute_process(COMMAND make WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gcc/build)
 # 	execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gcc/build)
 #
-
+
+# restore LD_LIBRARY_PATH
+set(ENV{LD_LIBRARY_PATH} ${BEFORE_LD_LIBRARY_PATH})

 elseif(APPLE)


fix continuous cdash script (#253)

fix continuous cdash script (#253)


Merging r242993:
------------------------------------------------------------------------
r242993 | yrnkrn | 2015-07-23 01:06:12 -0700 (Thu, 23 Jul 2015) | 11 lines

Avoid using -Wl,-z,defs on Cygwin.

Prior to CMAKE 2.8.4 that was covered by the WIN32 conditional but
from 2.8.4 CMAKE no longer defined WIN32 when running under Cygwin
and it needs its own test.

Patch by Martell Malone!

http://reviews.llvm.org/D11347

------------------------------------------------------------------------

git-svn-id: 263342a87c3ff23ea578f8c5fbbb34c4b5dc855b@243023 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/HandleLLVMOptions.cmake
+++ cmake/modules/HandleLLVMOptions.cmake
@@ -131,7 +131,7 @@

 # Pass -Wl,-z,defs. This makes sure all symbols are defined. Otherwise a DSO
 # build might work on ELF but fail on MachO/COFF.
-if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR
+if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR
         ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") AND
    NOT LLVM_USE_SANITIZER)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")


Issues: Fixes #8 where when using Ogre SDK all needed include and lib dirs were not added. #7 still exists afaik, I will have to check that later with a proper Ogre SDK.

--- cmake/ConfigurePackages.cmake
+++ cmake/ConfigurePackages.cmake
@@ -163,8 +163,28 @@
         sagase_configure_package (OGRE
             NAMES Ogre OgreSDK ogre OGRE
             COMPONENTS ${TUNDRA_OGRE_NEEDED_COMPONENTS}
-            PREFIXES ${ENV_OGRE_HOME} ${ENV_TUNDRA_DEP_PATH})
-
+            PREFIXES ${ENV_OGRE_HOME}           # First try to find from OGRE_HOME
+                     ${ENV_OGRE_HOME}/SDK       # Add OGRE_HOME/SDK to make this not so strict
+                     ${ENV_TUNDRA_DEP_PATH})    # TUNDRA_DEP_PATH last
+
+        # Additional include dirs to find everything when using Ogre SDK
+        # <ogre_main_include_dir>/OGRE
+        foreach (_OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIRS})
+            string(REGEX MATCH "/include$" _ROOT_INCLUDE_FOUND ${_OGRE_INCLUDE_DIR})
+            if (_ROOT_INCLUDE_FOUND)
+                SET (OGRE_INCLUDE_DIRS ${OGRE_INCLUDE_DIRS} "${_OGRE_INCLUDE_DIR}/OGRE")
+            endif()
+        endforeach ()
+
+        # Additional library dirs to find everything when using Ogre SDK
+        # <ogre_main_lib_dir>/{Release|Debug|DebWithRelInfo|MinSizeRel}/opt
+        foreach (_OGRE_LIBRARY_DIR ${OGRE_LIBRARY_DIRS})
+            string(REGEX MATCH "/lib$" _ROOT_LIBDIR_FOUND ${_OGRE_LIBRARY_DIR})
+            if (_ROOT_LIBDIR_FOUND)
+                SET (OGRE_LIBRARY_DIRS ${OGRE_LIBRARY_DIRS} "${_OGRE_LIBRARY_DIR}/$(OutDir)/opt")
+            endif()
+        endforeach ()
+
         # Report ogre then search check directx
         sagase_configure_report (OGRE)


changing windows search path for new version of flann

git-svn-id: 1af002208e930b4d920e7c2b948d1e98a012c795@955 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- cmake/Modules/FindFlann.cmake
+++ cmake/Modules/FindFlann.cmake
@@ -13,7 +13,7 @@

 find_path(FLANN_INCLUDE_DIR flann/flann.hpp
           HINTS ${PC_FLANN_INCLUDEDIR} ${PC_FLANN_INCLUDE_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
-          PATHS "$ENV{PROGRAMFILES}/flann 1.6.8" "$ENV{PROGRAMW6432}/flann 1.6.8"
+          PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9"
           PATH_SUFFIXES include)

 # Prefer static libraries in Windows over shared ones
@@ -21,13 +21,13 @@
   find_library(FLANN_LIBRARY
                NAMES flann_cpp_s flann_cpp
                HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
-               PATHS "$ENV{PROGRAMFILES}/flann 1.6.8" "$ENV{PROGRAMW6432}/flann 1.6.8"
+               PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9"
                PATH_SUFFIXES lib)

   find_library(FLANN_LIBRARY_DEBUG
                NAMES flann_cpp_s-gd flann_cpp-gd flann_cpp_s flann_cpp
                HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT} $ENV{FLANN_ROOT}"
-               PATHS "$ENV{PROGRAMFILES}/flann 1.6.8" "$ENV{PROGRAMW6432}/flann 1.6.8"
+               PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9"
                PATH_SUFFIXES lib)
 else(WIN32)
   find_library(FLANN_LIBRARY