Remove OCaml

Remove OCaml

--- src/llvm-minimal/cmake/config-ix.cmake
+++ src/llvm-minimal/cmake/config-ix.cmake
@@ -562,31 +562,31 @@
 endif()

 # Keep the version requirements in sync with bindings/ocaml/README.txt.
-include(FindOCaml)
-include(AddOCaml)
-if(WIN32)
-  message(STATUS "OCaml bindings disabled.")
-else()
-  find_package(OCaml)
-  if( NOT OCAML_FOUND )
-    message(STATUS "OCaml bindings disabled.")
-  else()
-    if( OCAML_VERSION VERSION_LESS "4.00.0" )
-      message(STATUS "OCaml bindings disabled, need OCaml >=4.00.0.")
-    else()
-      find_ocamlfind_package(ctypes VERSION 0.4 OPTIONAL)
-      if( HAVE_OCAML_CTYPES )
-        message(STATUS "OCaml bindings enabled.")
-        find_ocamlfind_package(oUnit VERSION 2 OPTIONAL)
-        set(LLVM_BINDINGS "${LLVM_BINDINGS} ocaml")
-
-        set(LLVM_OCAML_INSTALL_PATH "${OCAML_STDLIB_PATH}" CACHE STRING
-            "Install directory for LLVM OCaml packages")
-      else()
-        message(STATUS "OCaml bindings disabled, need ctypes >=0.4.")
-      endif()
-    endif()
-  endif()
-endif()
+#include(FindOCaml)
+#include(AddOCaml)
+#if(WIN32)
+#  message(STATUS "OCaml bindings disabled.")
+#else()
+#  find_package(OCaml)
+#  if( NOT OCAML_FOUND )
+#    message(STATUS "OCaml bindings disabled.")
+#  else()
+#    if( OCAML_VERSION VERSION_LESS "4.00.0" )
+#      message(STATUS "OCaml bindings disabled, need OCaml >=4.00.0.")
+#    else()
+#      find_ocamlfind_package(ctypes VERSION 0.4 OPTIONAL)
+#      if( HAVE_OCAML_CTYPES )
+#        message(STATUS "OCaml bindings enabled.")
+#        find_ocamlfind_package(oUnit VERSION 2 OPTIONAL)
+#        set(LLVM_BINDINGS "${LLVM_BINDINGS} ocaml")
+#
+#        set(LLVM_OCAML_INSTALL_PATH "${OCAML_STDLIB_PATH}" CACHE STRING
+#            "Install directory for LLVM OCaml packages")
+#      else()
+#        message(STATUS "OCaml bindings disabled, need ctypes >=0.4.")
+#      endif()
+#    endif()
+#  endif()
+#endif()

 string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")


update boost use script with 1.63 libs, deps

--- projects/use/usexp-boost-config.cmake
+++ projects/use/usexp-boost-config.cmake
@@ -3,7 +3,7 @@
 get_filename_component(XP_ROOTDIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)
 get_filename_component(XP_ROOTDIR ${XP_ROOTDIR} ABSOLUTE) # remove relative parts
 string(TOUPPER ${prj} PRJ)
-set(XP_USE_LATEST_BOOST OFF)
+#set(XP_USE_LATEST_BOOST OFF)
 if(NOT DEFINED XP_USE_LATEST_BOOST)
   option(XP_USE_LATEST_BOOST "build with boost @BOOST_NEWVER@ instead of @BOOST_OLDVER@" OFF)
 endif()
@@ -19,8 +19,11 @@
     coroutine # depends on thread, context (m)
     log # depends on filesystem, thread, system (rt, pthread, m)
     timer # depends on chrono (m)
+    #type_erasure # depends on thread, system (pthread, m) NEW with @BOOST_NEWVER@
+    #wave # depends on thread, system (pthread, m) # NOTE: not a default
     ######
     chrono # depends on system (rt, pthread, m)
+    #fiber # depends on context (pthread, m) NEW with @BOOST_NEWVER@
     filesystem # depends on system (pthread, m)
     graph # depends on regex (m)
     random # depends on system (pthread, m)
@@ -28,17 +31,24 @@
     wserialization # depends on serialization (m)
     ######
     atomic
-    container # depends on (pthread)
-    context
-    date_time # depends on (m)
+    container # depends on (pthread, m)
+    context # depends on (pthread, m)
+    date_time # depends on (pthread, m)
     exception
     iostreams # depends on (z, bz2, pthread, m)
-    program_options # depends on (m)
-    python # depends on (m)
+    #math_c99 # depends on (pthread, m) # NOTE: not a default
+    #math_c99f # depends on (pthread, m) # NOTE: not a default
+    #math_c99l # depends on (pthread, m) # NOTE: not a default
+    #math_tr1 # depends on (pthread, m) # NOTE: not a default
+    #math_tr1f # depends on (pthread, m) # NOTE: not a default
+    #math_tr1l # depends on (pthread, m) # NOTE: not a default
+    #prg_exec_monitor # depends on (pthread, m) # NOTE: not a default
+    program_options # depends on (pthread, m)
+    python # depends on (pthread, m)
     regex # depends on (pthread, m)
-    serialization # depends on (m)
-    signals # depends on (m)
-    system # depends on (m)
+    serialization # depends on (pthread, m)
+    signals # depends on (pthread, m)
+    system # depends on (pthread, m)
     test_exec_monitor
     unit_test_framework # depends on (pthread, m)
     )


more updates to codecov

more updates to codecov

--- CodeCoverage.cmake
+++ CodeCoverage.cmake
@@ -68,7 +68,7 @@
 #

 # Check prereqs
-FIND_PROGRAM( GCOV_PATH gcov )
+FIND_PROGRAM( GCOV_PATH NAMES gcov-4.9 gcov-4.8 gcov )
 FIND_PROGRAM( LCOV_PATH lcov )
 FIND_PROGRAM( GENHTML_PATH genhtml )
 FIND_PROGRAM( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)
@@ -134,7 +134,7 @@
     # Capturing lcov counters and generating report
     COMMAND ${LCOV_PATH} --directory . --capture --output-file ${_outputname}.info
     COMMAND ${LCOV_PATH} --remove ${_outputname}.info 'tests/*' '/usr/*' --output-file ${_outputname}.info.cleaned
-    COMMAND ${CMAKE_COMMAND} -E rename ${_outputname}.info.cleaned ${_outputname}.info
+    COMMAND ${CMAKE_COMMAND} -E renamecd . ${_outputname}.info.cleaned ${_outputname}.info
   )

 	# Setup target


build/cmake/DefinePlatformSpecifc.cmake: Ensure ClangCl on MSVC is recognized as MSVC (because it does not handle -Wall too well)

--- build/cmake/DefinePlatformSpecifc.cmake
+++ build/cmake/DefinePlatformSpecifc.cmake
@@ -25,13 +25,7 @@

 # basic options
 foreach(lang IN ITEMS C CXX)
-  if(CMAKE_${lang}_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wall")
-    set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -ferror-limit=1")
-  elseif(CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
-    set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wall -Wextra")
-    set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -fmax-errors=1")
-  elseif(CMAKE_${lang}_COMPILER_ID STREQUAL "MSVC")
+  if("CMAKE_${lang}_COMPILER_ID" STREQUAL "MSVC" OR "${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "MSVC")
     set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /MP") # parallel build
     set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /W3") # warning level 3
     include(CheckCXXCompilerFlag)
@@ -45,6 +39,12 @@
       set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /execution-charset:utf-8")
     endif()
     add_definitions("-DUNICODE -D_UNICODE")
+  elseif("CMAKE_${lang}_COMPILER_ID" STREQUAL "Clang")
+    set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wall")
+    set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -ferror-limit=1")
+  elseif("CMAKE_${lang}_COMPILER_ID" STREQUAL "GNU")
+    set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wall -Wextra")
+    set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -fmax-errors=1")
   endif()
 endforeach()


Qt5::Gui add missing libraries

Qt5::Gui add missing libraries

--- cmake/Qt5Gui_ZZZ_HunterPlugin.cmake
+++ cmake/Qt5Gui_ZZZ_HunterPlugin.cmake
@@ -62,6 +62,8 @@
       Qt5::Gui
       "static_qt_plugins.cpp"
   )
+
+  _qt_cmake_extra_helpers_add_interface(Qt5::Gui Qt5::QCocoaIntegrationPlugin)

   # _CGImageDestinationAddImage
   _qt_cmake_extra_helpers_add_interface(Qt5::Gui "-framework ImageIO")


Qt 5.9 no need to load modules explicitly

--- cmake/Qt5Qml_ZZZ_HunterPlugin.cmake
+++ cmake/Qt5Qml_ZZZ_HunterPlugin.cmake
@@ -28,27 +28,29 @@
   endif()
 endif()

-include(
-    "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QLocalClientConnectionFactory.cmake"
-    OPTIONAL
-)
-include(
-    "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QQmlDebugServerFactory.cmake"
-    OPTIONAL
-)
-include(
-    "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QQmlDebuggerServiceFactory.cmake"
-    OPTIONAL
-)
-include(
-    "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QQmlInspectorServiceFactory.cmake"
-    OPTIONAL
-)
-include(
-    "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QQmlProfilerServiceFactory.cmake"
-    OPTIONAL
-)
-include(
-    "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QTcpServerConnectionFactory.cmake"
-    OPTIONAL
-)
+if(Qt5Core_VERSION VERSION_LESS 5.9)
+  include(
+      "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QLocalClientConnectionFactory.cmake"
+      OPTIONAL
+  )
+  include(
+      "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QQmlDebugServerFactory.cmake"
+      OPTIONAL
+  )
+  include(
+      "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QQmlDebuggerServiceFactory.cmake"
+      OPTIONAL
+  )
+  include(
+      "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QQmlInspectorServiceFactory.cmake"
+      OPTIONAL
+  )
+  include(
+      "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QQmlProfilerServiceFactory.cmake"
+      OPTIONAL
+  )
+  include(
+      "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_QTcpServerConnectionFactory.cmake"
+      OPTIONAL
+  )
+endif()


[cmake] only set -Og if compiler supports it

--- cmake/modules/DuneStuffMacros.cmake
+++ cmake/modules/DuneStuffMacros.cmake
@@ -79,8 +79,9 @@
         )
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
         set( CMAKE_CXX_FLAGS_DEBUG CACHE STRING
-        "-Wlogical-op -Og ${CMAKE_CXX_FLAGS_DEBUG} "
+        "-Wlogical-op  ${CMAKE_CXX_FLAGS_DEBUG} "
         )
+        ADD_IF_SUPPORTED("-Og")
 endif()

 MACRO(INCLUDE_SYS_DIR)


[cmake] adds macro for clang format target

--- cmake/modules/DuneStuffMacros.cmake
+++ cmake/modules/DuneStuffMacros.cmake
@@ -142,4 +142,23 @@
     else()
         message(WARNING "not adding analyze target because clang-check is missing")
     endif(EXISTS ${ANALYZER})
-endmacro(add_analyze)+endmacro(add_analyze)
+
+macro(add_format)
+    find_program(FORMAT NAMES clang-format clang-format-3.4)
+    if(EXISTS ${FORMAT})
+        message(STATUS "adding format target")
+        add_custom_target( format SOURCES ${ARGN} )
+        foreach(_file ${ARGN})
+            string(REPLACE "/" "_" fn ${_file})
+            if(NOT EXISTS ${_file})
+                # 'fix' relative source defs
+                set(_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file})
+            endif(NOT EXISTS ${_file})
+            add_custom_target("format_${fn}" ${FORMAT} -i -style=file ${_file} )
+            add_dependencies( format "format_${fn}" )
+        endforeach(_file )
+    else()
+        message(WARNING "not adding format target because clang-format is missing")
+    endif(EXISTS ${FORMAT})
+endmacro(add_format)


Removed unused code.

Removed unused code.

--- cmake/osvrRenderManagerConfig.cmake
+++ cmake/osvrRenderManagerConfig.cmake
@@ -10,7 +10,6 @@

 # Fix up imported targets to add deps: these files will only exist in install trees.
 include("${CMAKE_CURRENT_LIST_DIR}/osvrRenderManagerConfigInstalledBoost.cmake" OPTIONAL)
-include("${CMAKE_CURRENT_LIST_DIR}/osvrRenderManagerConfigInstalledOpenCV.cmake" OPTIONAL)

 # A list of filenames of required libraries for running with osvrRenderManager DLL
 set(OSVRRM_REQUIRED_LIBRARIES_DEBUG "@OSVRRM_REQUIRED_LIBRARIES_DEBUG@")
@@ -44,4 +43,3 @@

 # Hook for a super-build to optionally inject configuration after target import.
 include("${CMAKE_CURRENT_LIST_DIR}/osvrRenderManagerConfigSuperBuildSuffix.cmake" OPTIONAL)
-


[cmake] make boost serialization a global link dependency

--- cmake/siconos_find_common_dep.cmake
+++ cmake/siconos_find_common_dep.cmake
@@ -256,8 +256,7 @@
 include(serialization_vector_test)
 if(WITH_SERIALIZATION)
   COMPILE_WITH(Boost 1.47
-    COMPONENTS serialization filesystem REQUIRED
-    SICONOS_COMPONENTS io)
+    COMPONENTS serialization filesystem REQUIRED)
   if (Boost_VERSION GREATER 106100)
     # If boost is recent enough, prefer system boost serialization to
     # the one included in "externals/boost_serialization".


COMP: Attempt to properly determine Tcl version

--- CMake/vtkTclTkMacros.cmake
+++ CMake/vtkTclTkMacros.cmake
@@ -17,23 +17,39 @@
   SET (${tcl_tk_minor_version} "")
   FOREACH (tcl_tk_minor_version_try "2" "3" "4")
     IF ("${TK_INTERNAL_PATH}" MATCHES "tk8\\.?${tcl_tk_minor_version_try}")
-	  SET (${tcl_tk_major_version} "8")
-	  SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
+      SET (${tcl_tk_major_version} "8")
+      SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
     ENDIF ("${TK_INTERNAL_PATH}" MATCHES "tk8\\.?${tcl_tk_minor_version_try}")
     IF ("${TCL_LIBRARY}" MATCHES "tcl8\\.?${tcl_tk_minor_version_try}")
-	  SET (${tcl_tk_major_version} "8")
-	  SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
+      SET (${tcl_tk_major_version} "8")
+      SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
     ENDIF ("${TCL_LIBRARY}" MATCHES "tcl8\\.?${tcl_tk_minor_version_try}")
     IF ("${TCL_INCLUDE_PATH}" MATCHES "tcl8\\.?${tcl_tk_minor_version_try}")
-	  SET (${tcl_tk_major_version} "8")
-	  SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
+      SET (${tcl_tk_major_version} "8")
+      SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
     ENDIF ("${TCL_INCLUDE_PATH}" MATCHES "tcl8\\.?${tcl_tk_minor_version_try}")
     # Mac
     IF ("${TCL_INCLUDE_PATH}" MATCHES "Tcl.*8\\.${tcl_tk_minor_version_try}")
-	  SET (${tcl_tk_major_version} "8")
-	  SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
+      SET (${tcl_tk_major_version} "8")
+      SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
     ENDIF ("${TCL_INCLUDE_PATH}" MATCHES "Tcl.*8\\.${tcl_tk_minor_version_try}")
   ENDFOREACH (tcl_tk_minor_version_try)
+
+  FOREACH(dir ${TCL_INCLUDE_PATH})
+    IF(EXISTS "${dir}/tcl.h")
+      FILE(READ "${TCL_INCLUDE_PATH}/tcl.h" tcl_include_file)
+      STRING(REGEX REPLACE
+        ".*#define TCL_VERSION[ \t]*\"([0-9][0-9]*\\.[0-9][0-9]*)\".*" "\\1"
+        tcl_include_file "${tcl_include_file}")
+      IF(${tcl_include_file} MATCHES "^[0-9]*\\.[0-9]*$")
+        MESSAGE("Version ${tcl_include_file}")
+        STRING(REGEX REPLACE "^([0-9]*)\\.([0-9]*)$" "\\1" "${tcl_tk_major_version}"
+          "${tcl_include_file}")
+        STRING(REGEX REPLACE "^([0-9]*)\\.([0-9]*)$" "\\2" "${tcl_tk_minor_version}"
+          "${tcl_include_file}")
+      ENDIF(${tcl_include_file} MATCHES "^[0-9]*\\.[0-9]*$")
+    ENDIF(EXISTS "${dir}/tcl.h")
+  ENDFOREACH(dir)

 ENDMACRO (VTK_GET_TCL_TK_VERSION)

@@ -68,9 +84,9 @@
   FILE (GLOB TCL_SUPPORT_FILES_TCL "${tcl_support_lib_dir}/*.tcl")
   FILE (GLOB TCL_SUPPORT_FILES_ENC "${tcl_support_lib_dir}/encoding/*.enc")
   SET (${list}
-       "${tcl_support_lib_dir}/tclIndex"
-       ${TCL_SUPPORT_FILES_TCL}
-	   ${TCL_SUPPORT_FILES_ENC})
+    "${tcl_support_lib_dir}/tclIndex"
+    ${TCL_SUPPORT_FILES_TCL}
+    ${TCL_SUPPORT_FILES_ENC})

 ENDMACRO (VTK_GET_TCL_SUPPORT_FILES)

@@ -80,8 +96,8 @@

   FILE (GLOB TK_SUPPORT_FILES_TCL "${tk_support_lib_dir}/*.tcl")
   SET (${list}
-       "${tk_support_lib_dir}/tclIndex"
-	   ${TK_SUPPORT_FILES_TCL})
+    "${tk_support_lib_dir}/tclIndex"
+    ${TK_SUPPORT_FILES_TCL})

 ENDMACRO (VTK_GET_TK_SUPPORT_FILES)

@@ -162,7 +178,7 @@
       "${project_dir}/tcl${TCL_TK_VERSION}"
       "${tk_support_lib_dir}"
       "${project_dir}/tk${TCL_TK_VERSION}"
-    )
+      )
   ENDIF (TCL_TK_MAJOR_VERSION AND TCL_TK_MINOR_VERSION)

 ENDMACRO (VTK_COPY_TCL_TK_SUPPORT_FILES_TO_DIR)
@@ -211,10 +227,10 @@
   ENDIF (CMAKE_CONFIGURATION_TYPES)
   FOREACH (config ${CONFIG_TYPES})
     VTK_COPY_TCL_TK_SUPPORT_FILES_TO_DIR (
-       "${tcl_support_lib_dir}"
-       "${tk_support_lib_dir}"
-       "${build_dir}/${config}/${dir}"
-    )
+      "${tcl_support_lib_dir}"
+      "${tk_support_lib_dir}"
+      "${build_dir}/${config}/${dir}"
+      )
   ENDFOREACH (config)

 ENDMACRO (VTK_COPY_TCL_TK_SUPPORT_FILES_TO_BUILD_DIR)


use pkg-config --static if available

use pkg-config --static if available

--- CMakeFiles/FindPETSC.cmake
+++ CMakeFiles/FindPETSC.cmake
@@ -8,9 +8,18 @@
 #if PETSc_DIR we're probably doing things the old way
 #so just skip to that
 #otherwise, try and use pkg-config
+if(PETSCPKG_STATIC_LIBRARY_DIRS)
+set(PETSC_LIBRARY_DIRS ${PETSCPKG_STATIC_LIBRARY_DIRS})
+set(PETSC_INCLUDE_DIRS ${PETSCPKG_STATIC_INCLUDE_DIRS})
+set(PETSC_LIBRARIES ${PETSCPKG_STATIC_LIBRARIES})
+else()
+message(WARNING "pkg-config with --static didn't work")
+message(WARNING "consider updating pkg-config")
+message(WARNING "and/or building PETSc as a single library")
 set(PETSC_LIBRARY_DIRS ${PETSCPKG_LIBRARY_DIRS})
 set(PETSC_INCLUDE_DIRS ${PETSCPKG_INCLUDE_DIRS})
 set(PETSC_LIBRARIES ${PETSCPKG_LIBRARIES})
+endif()
 set(PETSC_FOUND TRUE)

 else()


[Web] Update CMakeLists

[Web] Update CMakeLists

--- Web/cmake/BuildThirdParty.cmake
+++ Web/cmake/BuildThirdParty.cmake
@@ -1,10 +1,10 @@
-add_library(absl SHARED)
-
-target_sources(absl
-    PRIVATE
-        ../Siv3D/src/ThirdParty/absl/numeric/int128.cc
-        ../Siv3D/src/ThirdParty/absl/random/discrete_distribution.cc
-        ../Siv3D/src/ThirdParty/absl/random/gaussian_distribution.cc
+# add_library(absl SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/absl/numeric/int128.cc
+    ../Siv3D/src/ThirdParty/absl/random/discrete_distribution.cc
+    ../Siv3D/src/ThirdParty/absl/random/gaussian_distribution.cc
 )

@@ -90,20 +90,20 @@

-add_library(easyexif SHARED)
-
-target_sources(easyexif
-    PRIVATE
-        ../Siv3D/src/ThirdParty/easyexif/exif.cpp
-)
-
-
-
-add_library(fmt SHARED)
-
-target_sources(fmt
-    PRIVATE
-        ../Siv3D/src/ThirdParty/fmt/format.cc
+# add_library(easyexif SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/easyexif/exif.cpp
+)
+
+
+
+# add_library(fmt SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/fmt/format.cc
 )

@@ -203,26 +203,26 @@

 target_sources(msdfgen
     PRIVATE
-        ../Siv3D/src/ThirdParty/msdfgen/core/contour-combiners.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/Contour.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/edge-coloring.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/edge-segments.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/edge-selectors.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/EdgeHolder.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/equation-solver.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/msdf-edge-artifact-patcher.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/msdf-error-correction.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/msdfgen.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/rasterization.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/render-sdf.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/save-bmp.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/save-tiff.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/Scanline.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/sdf-error-estimation.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/shape-description.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/Shape.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/SignedDistance.cpp
-        ../Siv3D/src/ThirdParty/msdfgen/core/Vector2.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/contour-combiners.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/Contour.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/edge-coloring.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/edge-segments.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/edge-selectors.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/EdgeHolder.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/equation-solver.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/msdf-edge-artifact-patcher.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/msdf-error-correction.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/msdfgen.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/rasterization.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/render-sdf.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/save-bmp.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/save-tiff.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/Scanline.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/sdf-error-estimation.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/shape-description.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/Shape.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/SignedDistance.cpp
+    ../Siv3D/src/ThirdParty/msdfgen/core/Vector2.cpp
 )

@@ -300,11 +300,11 @@

-add_library(pffft SHARED)
-
-target_sources(pffft
-    PRIVATE
-        ../Siv3D/src/ThirdParty/pffft/pffft.c
+# add_library(pffft SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/pffft/pffft.c
 )

@@ -324,11 +324,11 @@
         ../Siv3D/src/ThirdParty/plutovg/sw_ft_stroker.c
 )

-add_library(qr SHARED)
-
-target_sources(qr
-    PRIVATE
-        ../Siv3D/src/ThirdParty/qr-code-generator-library/QrCode.cpp
+# add_library(qr SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/qr-code-generator-library/QrCode.cpp
 )

@@ -371,22 +371,22 @@

-add_library(rtaudio SHARED)
-
-target_sources(rtaudio
-    PRIVATE
-        ../Siv3D/src/ThirdParty/rtaudio/RtAudio.cpp
-)
-
-
-
-add_library(serial SHARED)
-
-target_sources(serial
-    PRIVATE
-        ../Siv3D/src/ThirdParty/serial/impl/list_ports/list_ports_linux.cc
-        ../Siv3D/src/ThirdParty/serial/impl/unix.cc
-        ../Siv3D/src/ThirdParty/serial/serial.cc
+# add_library(rtaudio SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/rtaudio/RtAudio.cpp
+)
+
+
+
+# add_library(serial SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/serial/impl/list_ports/list_ports_linux.cc
+    ../Siv3D/src/ThirdParty/serial/impl/unix.cc
+    ../Siv3D/src/ThirdParty/serial/serial.cc
 )

@@ -395,128 +395,128 @@

 target_sources(soloud
     PRIVATE
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/monotone/soloud_monotone.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/noise/soloud_noise.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/sfxr/soloud_sfxr.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/darray.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/klatt.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/resonator.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/soloud_speech.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/tts.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/tedsid/sid.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/tedsid/soloud_tedsid.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/tedsid/ted.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/vic/soloud_vic.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/vizsn/soloud_vizsn.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/wav/dr_impl.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/wav/soloud_wav.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/wav/soloud_wavstream.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/audiosource/wav/stb_vorbis.c
-        ../Siv3D/src/ThirdParty/soloud/src/backend/alsa/soloud_alsa.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/coreaudio/soloud_coreaudio.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/jack/soloud_jack.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/miniaudio/soloud_miniaudio.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/nosound/soloud_nosound.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/null/soloud_null.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/openal/soloud_openal.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/openal/soloud_openal_dll.c
-        ../Siv3D/src/ThirdParty/soloud/src/backend/opensles/soloud_opensles.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/oss/soloud_oss.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/portaudio/soloud_portaudio.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/portaudio/soloud_portaudio_dll.c
-        ../Siv3D/src/ThirdParty/soloud/src/backend/sdl2_static/soloud_sdl2_static.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/sdl/soloud_sdl1.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/sdl/soloud_sdl1_dll.c
-        ../Siv3D/src/ThirdParty/soloud/src/backend/sdl/soloud_sdl2.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/sdl/soloud_sdl2_dll.c
-        ../Siv3D/src/ThirdParty/soloud/src/backend/sdl_static/soloud_sdl_static.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/vita_homebrew/soloud_vita_homebrew.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/wasapi/soloud_wasapi.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/winmm/soloud_winmm.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/backend/xaudio2/soloud_xaudio2.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_audiosource.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_bus.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_3d.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_basicops.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_faderops.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_filterops.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_getters.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_setters.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_voicegroup.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_voiceops.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_fader.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_fft.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_fft_lut.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_file.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_filter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_misc.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_queue.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/core/soloud_thread.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_bassboostfilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_biquadresonantfilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_dcremovalfilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_echofilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_eqfilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_fftfilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_flangerfilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_freeverbfilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_lofifilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_robotizefilter.cpp
-        ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_waveshaperfilter.cpp
-)
-
-
-
-add_library(SplineLib SHARED)
-
-target_sources(SplineLib
-    PRIVATE
-        ../Siv3D/src/ThirdParty/SplineLib/Splines.cpp
-)
-
-
-
-add_library(tinyxml SHARED)
-
-target_sources(tinyxml
-    PRIVATE
-        ../Siv3D/src/ThirdParty/tinyxml/tinyxml2.cpp
-)
-
-
-
-add_library(zstd SHARED)
-
-target_sources(zstd
-    PRIVATE
-        ../Siv3D/src/ThirdParty/zstd/common/debug.c
-        ../Siv3D/src/ThirdParty/zstd/common/entropy_common.c
-        ../Siv3D/src/ThirdParty/zstd/common/error_private.c
-        ../Siv3D/src/ThirdParty/zstd/common/fse_decompress.c
-        ../Siv3D/src/ThirdParty/zstd/common/pool.c
-        ../Siv3D/src/ThirdParty/zstd/common/threading.c
-        ../Siv3D/src/ThirdParty/zstd/common/xxhash.c
-        ../Siv3D/src/ThirdParty/zstd/common/zstd_common.c
-        ../Siv3D/src/ThirdParty/zstd/compress/fse_compress.c
-        ../Siv3D/src/ThirdParty/zstd/compress/hist.c
-        ../Siv3D/src/ThirdParty/zstd/compress/huf_compress.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstdmt_compress.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstd_compress.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstd_compress_literals.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstd_compress_sequences.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstd_compress_superblock.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstd_double_fast.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstd_fast.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstd_lazy.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstd_ldm.c
-        ../Siv3D/src/ThirdParty/zstd/compress/zstd_opt.c
-        ../Siv3D/src/ThirdParty/zstd/decompress/huf_decompress.c
-        ../Siv3D/src/ThirdParty/zstd/decompress/zstd_ddict.c
-        ../Siv3D/src/ThirdParty/zstd/decompress/zstd_decompress.c
-        ../Siv3D/src/ThirdParty/zstd/decompress/zstd_decompress_block.c
-        ../Siv3D/src/ThirdParty/zstd/dictBuilder/cover.c
-        ../Siv3D/src/ThirdParty/zstd/dictBuilder/divsufsort.c
-        ../Siv3D/src/ThirdParty/zstd/dictBuilder/fastcover.c
-        ../Siv3D/src/ThirdParty/zstd/dictBuilder/zdict.c
-)
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/monotone/soloud_monotone.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/noise/soloud_noise.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/sfxr/soloud_sfxr.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/darray.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/klatt.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/resonator.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/soloud_speech.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/speech/tts.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/tedsid/sid.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/tedsid/soloud_tedsid.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/tedsid/ted.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/vic/soloud_vic.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/vizsn/soloud_vizsn.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/wav/dr_impl.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/wav/soloud_wav.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/wav/soloud_wavstream.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/audiosource/wav/stb_vorbis.c
+    ../Siv3D/src/ThirdParty/soloud/src/backend/alsa/soloud_alsa.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/coreaudio/soloud_coreaudio.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/jack/soloud_jack.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/miniaudio/soloud_miniaudio.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/nosound/soloud_nosound.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/null/soloud_null.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/openal/soloud_openal.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/openal/soloud_openal_dll.c
+    ../Siv3D/src/ThirdParty/soloud/src/backend/opensles/soloud_opensles.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/oss/soloud_oss.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/portaudio/soloud_portaudio.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/portaudio/soloud_portaudio_dll.c
+    ../Siv3D/src/ThirdParty/soloud/src/backend/sdl2_static/soloud_sdl2_static.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/sdl/soloud_sdl1.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/sdl/soloud_sdl1_dll.c
+    ../Siv3D/src/ThirdParty/soloud/src/backend/sdl/soloud_sdl2.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/sdl/soloud_sdl2_dll.c
+    ../Siv3D/src/ThirdParty/soloud/src/backend/sdl_static/soloud_sdl_static.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/vita_homebrew/soloud_vita_homebrew.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/wasapi/soloud_wasapi.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/winmm/soloud_winmm.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/backend/xaudio2/soloud_xaudio2.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_audiosource.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_bus.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_3d.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_basicops.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_faderops.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_filterops.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_getters.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_setters.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_voicegroup.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_core_voiceops.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_fader.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_fft.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_fft_lut.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_file.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_filter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_misc.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_queue.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/core/soloud_thread.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_bassboostfilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_biquadresonantfilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_dcremovalfilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_echofilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_eqfilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_fftfilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_flangerfilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_freeverbfilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_lofifilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_robotizefilter.cpp
+    ../Siv3D/src/ThirdParty/soloud/src/filter/soloud_waveshaperfilter.cpp
+)
+
+
+
+# add_library(SplineLib SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/SplineLib/Splines.cpp
+)
+
+
+
+# add_library(tinyxml SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/tinyxml/tinyxml2.cpp
+)
+
+
+
+# add_library(zstd SHARED)
+
+set(SIV3D_SOURCES
+    ${SIV3D_SOURCES}
+    ../Siv3D/src/ThirdParty/zstd/common/debug.c
+    ../Siv3D/src/ThirdParty/zstd/common/entropy_common.c
+    ../Siv3D/src/ThirdParty/zstd/common/error_private.c
+    ../Siv3D/src/ThirdParty/zstd/common/fse_decompress.c
+    ../Siv3D/src/ThirdParty/zstd/common/pool.c
+    ../Siv3D/src/ThirdParty/zstd/common/threading.c
+    ../Siv3D/src/ThirdParty/zstd/common/xxhash.c
+    ../Siv3D/src/ThirdParty/zstd/common/zstd_common.c
+    ../Siv3D/src/ThirdParty/zstd/compress/fse_compress.c
+    ../Siv3D/src/ThirdParty/zstd/compress/hist.c
+    ../Siv3D/src/ThirdParty/zstd/compress/huf_compress.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstdmt_compress.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstd_compress.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstd_compress_literals.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstd_compress_sequences.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstd_compress_superblock.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstd_double_fast.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstd_fast.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstd_lazy.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstd_ldm.c
+    ../Siv3D/src/ThirdParty/zstd/compress/zstd_opt.c
+    ../Siv3D/src/ThirdParty/zstd/decompress/huf_decompress.c
+    ../Siv3D/src/ThirdParty/zstd/decompress/zstd_ddict.c
+    ../Siv3D/src/ThirdParty/zstd/decompress/zstd_decompress.c
+    ../Siv3D/src/ThirdParty/zstd/decompress/zstd_decompress_block.c
+    ../Siv3D/src/ThirdParty/zstd/dictBuilder/cover.c
+    ../Siv3D/src/ThirdParty/zstd/dictBuilder/divsufsort.c
+    ../Siv3D/src/ThirdParty/zstd/dictBuilder/fastcover.c
+    ../Siv3D/src/ThirdParty/zstd/dictBuilder/zdict.c
+)


vtkhdf5: If cygwin dont check for HAVE_TIMEZONE.

This check is disabled for Cygwin in HDF5's configure script.

--- Utilities/vtkhdf5/ConfigureChecks.cmake
+++ Utilities/vtkhdf5/ConfigureChecks.cmake
@@ -495,7 +495,6 @@
       HAVE_ATTRIBUTE
       HAVE_FUNCTION
       HAVE_TM_GMTOFF
-      HAVE_TIMEZONE
       HAVE_STRUCT_TIMEZONE
       HAVE_STAT_ST_BLOCKS
       HAVE_FUNCTION
@@ -511,6 +510,10 @@
   )
     HDF5_FUNCTION_TEST (${test})
   ENDFOREACH (test)
+
+  IF(NOT CYGWIN)
+    HDF5_FUNCTION_TEST (HAVE_TIMEZONE)
+  ENDIF()
 ENDIF (WINDOWS)

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


BUG: Fix bug #1457

BUG: Fix bug #1457

--- SuperBuild/CMake/External_netcdf.cmake
+++ SuperBuild/CMake/External_netcdf.cmake
@@ -25,7 +25,8 @@
 # declare dependencies
 ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(NETCDF HDF5 ZLIB CURL HDF4 JPEG)

-set(NETCDF_SB_CONFIG)
+set(NETCDF_SB_CONFIG ${NETCDF_SB_CONFIG} -DHDF5_C_LIBRARY:PATH=${SB_INSTALL_PREFIX}/lib/libhdf5.so
+ -DHDF5_HL_LIBRARY:PATH=${SB_INSTALL_PREFIX}/lib/libhdf5_hl.so -DHDF5_INCLUDE_DIR:PATH=${SB_INSTALL_PREFIX}/include)

 ExternalProject_Add(NETCDF
   PREFIX NETCDF


CMake: Update deps management

CMake: Update deps management

--- cmake/cpp.cmake
+++ cmake/cpp.cmake
@@ -24,6 +24,18 @@
 else()
   find_package(absl REQUIRED)
 endif()
+set(ABSL_DEPS
+  absl::base
+  absl::random_random
+  absl::raw_hash_set
+  absl::hash
+  absl::memory
+  absl::meta
+  absl::str_format
+  absl::strings
+  absl::synchronization
+  absl::any
+  )

 set(GFLAGS_USE_TARGET_NAMESPACE TRUE)
 if(BUILD_gflags)
@@ -83,14 +95,17 @@
 # Check optional Dependencies
 if(USE_CPLEX)
   find_package(CPLEX REQUIRED)
+  set(CPLEX_DEP CPLEX::CPLEX)
 endif()

 if(USE_SCIP)
   find_package(SCIP REQUIRED)
+  set(SCIP_DEP SCIP::SCIP)
 endif()

 if(USE_XPRESS)
   find_package(XPRESS REQUIRED)
+  set(XPRESS_DEP XPRESS::XPRESS)
 endif()

 # If wrapper are built, we need to have the install rpath in BINARY_DIR to package
@@ -206,32 +221,17 @@
 # Dependencies
 target_link_libraries(${PROJECT_NAME} PUBLIC
   ZLIB::ZLIB
-  absl::base
-  absl::random_random
-  absl::raw_hash_set
-  absl::hash
-  absl::memory
-  absl::meta
-  absl::str_format
-  absl::strings
-  absl::synchronization
-  absl::any
+  ${ABSL_DEPS}
   ${GFLAGS_DEP}
   glog::glog
   protobuf::libprotobuf
   ${COINOR_DEPS}
+  ${CPLEX_DEP}
+  ${SCIP_DEP}
+  ${XPRESS_DEP}
   Threads::Threads)
 if(WIN32)
   target_link_libraries(${PROJECT_NAME} PUBLIC psapi.lib ws2_32.lib)
-endif()
-if(USE_CPLEX)
-  target_link_libraries(${PROJECT_NAME} PUBLIC CPLEX::CPLEX)
-endif()
-if(USE_SCIP)
-  target_link_libraries(${PROJECT_NAME} PUBLIC SCIP::SCIP)
-endif()
-if(USE_XPRESS)
-  target_link_libraries(${PROJECT_NAME} PUBLIC XPRESS::XPRESS)
 endif()

 # ALIAS


Include support for ChibiOS syscalls to use newlib stuff (#309)

- required for malloc

Signed-off-by: José Simões <1616ff7a83d123f98f8f38fa2524eab406644781@eclo.solutions>

--- CMake/Modules/FindCHIBIOS.cmake
+++ CMake/Modules/FindCHIBIOS.cmake
@@ -105,6 +105,9 @@

     chqueues.c

+    # required to use malloc and other newlib stuff
+    syscalls.c
+
     # CMSIS
     cmsis_os.c

@@ -123,6 +126,7 @@
             ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/oslib/src
             ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/rt/ports/ARMCMx/cmsis_os
             ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/abstractions/cmsis_os
+            ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/various

             # this path hint is for the usual location of the board.c file
             ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/boards/${CHIBIOS_BOARD}


[cmake] Remove modification about CMAKE_FIND_LIBRARY_SUFFIXES

--- CMakeModules/FindCAPSTONE.cmake
+++ CMakeModules/FindCAPSTONE.cmake
@@ -27,10 +27,6 @@
       PATHS ${CAPSTONE_PKGCONF_INCLUDE_DIRS}
     )

-    if(NOT BUILD_SHARED_LIBS)
-        SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-    endif()
-
     find_library(CAPSTONE_LIBRARY
       NAMES capstone
       PATHS ${CAPSTONE_PKGCONF_LIBRARY_DIRS}


Update to use renamed files in CMakeModules/ProjectCPack.cmake

--- CMakeModules/ProjectCPack.cmake
+++ CMakeModules/ProjectCPack.cmake
@@ -2,8 +2,8 @@
 IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
   SET(CPACK_PACKAGE_VENDOR "${PROJECT_VENDOR}")
-  SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+  SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
   SET(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
   SET(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
   SET(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")


Disable platform check to build Bender on VS2008 without SP1

--- CMake/Superbuild/External_Slicer.cmake
+++ CMake/Superbuild/External_Slicer.cmake
@@ -111,6 +111,7 @@
       -DGIT_EXECUTABLE:FILEPATH=${GIT_EXECUTABLE}
       -D${proj}_USE_GIT_PROTOCOL:BOOL=${Bender_USE_GIT_PROTOCOL}
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+      -DSlicer_PLATFORM_CHECK:BOOL=FALSE
       -DSlicer_REQUIRED_QT_VERSION:STRING=${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}
       -DSlicer_ADDITIONAL_DEPENDENCIES:STRING=${${proj}_INTERNAL_DEPENDENCIES_LIST}
       -DSlicer_ADDITIONAL_EXTERNAL_PROJECT_DIR:PATH=${Bender_SUPERBUILD_DIR}


- add minor corrections to the portability checker

git-svn-id: 59214148e3ac47647353bb066875245f1d63170f@8325 4525493e-7705-40b1-a816-d608a930855b

--- cmake/modules/PortabilityGNUCheck.cmake
+++ cmake/modules/PortabilityGNUCheck.cmake
@@ -6,16 +6,15 @@
 INCLUDE (CheckFunctionExists)
 INCLUDE (CheckSymbolExists)

-
 ##  C func
 #CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
 CHECK_INCLUDE_FILES (locale.h HAVE_LOCALE_H)
 CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H)

 ## POSIX
-CHECK_SYMBOL_EXISTS(strptime time.h HAVE_STRPTIME_H)
+CHECK_FUNCTION_EXISTS(strptime HAVE_STRPTIME_H)

 ##GNU EXT
-CHECK_SYMBOL_EXISTS(mempcpy string.h HAVE_MEMPCPY_H)
+CHECK_FUNCTION_EXISTS(mempcpy HAVE_MEMPCPY_H)


build: canonicalise the windows paths prior to use

In order to substitute the path into the VFS overlay, we need to escape
the paths.  Instead, opt on the CMake behaviour of
`get_filename_component` providing the canonicalised path with forward
slashes rather than backslashes.  This allows the overlay to be used on
Windows as well as Linux.

--- cmake/modules/SwiftWindowsSupport.cmake
+++ cmake/modules/SwiftWindowsSupport.cmake
@@ -61,8 +61,8 @@
 function(swift_windows_generate_sdk_vfs_overlay flags)
   swift_verify_windows_environment_variables()

-  set(VCToolsInstallDir $ENV{VCToolsInstallDir})
-  set(UniversalCRTSdkDir $ENV{UniversalCRTSdkDir})
+  get_filename_component(VCToolsInstallDir $ENV{VCToolsInstallDir} ABSOLUTE)
+  get_filename_component(UniversalCRTSdkDir $ENV{UniversalCRTSdkDir} ABSOLUTE)
   set(UCRTVersion $ENV{UCRTVersion})

   # TODO(compnerd) use a target to avoid re-creating this file all the time


PARQUET-937: Support CMake < 3.4 again for Arrow detection

pkg_get_variable was introduced in CMake 3.4.
See also: https://cmake.org/cmake/help/latest/release/3.4.html

Author: Kouhei Sutou <kou@clear-code.com>

Closes #283 from kou/support-cmake-3.3-or-older and squashes the following commits:

66462f0 [Kouhei Sutou] Support CMake < 3.4 again for Arrow detection

--- cmake_modules/ThirdpartyToolchain.cmake
+++ cmake_modules/ThirdpartyToolchain.cmake
@@ -359,8 +359,13 @@
   set(ARROW_INCLUDE_DIR ${ARROW_INCLUDE_DIRS})
   set(ARROW_LIBS ${ARROW_LIBRARY_DIRS})

-  pkg_get_variable(ARROW_ABI_VERSION arrow abi_version)
-  pkg_get_variable(ARROW_IO_ABI_VERSION arrow-io abi_version)
+  if (COMMAND pkg_get_variable)
+    pkg_get_variable(ARROW_ABI_VERSION arrow abi_version)
+    pkg_get_variable(ARROW_IO_ABI_VERSION arrow-io abi_version)
+  else()
+    set(ARROW_ABI_VERSION "")
+    set(ARROW_IO_ABI_VERSION "")
+  endif()
   if (ARROW_ABI_VERSION STREQUAL "")
     set(ARROW_SHARED_LIB_SUFFIX "")
   else()


ORC-707: FIX tzdata to recover Win32 build in AppVeyor (#590)

--- cmake_modules/ThirdpartyToolchain.cmake
+++ cmake_modules/ThirdpartyToolchain.cmake
@@ -259,8 +259,8 @@

 if (WIN32)
   ExternalProject_Add(tzdata_ep
-    URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2020b-1.tar.xz"
-    URL_HASH MD5=1BE1D18B4042A5011E96D20054BEEF33
+    URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2020e-1.tar.xz"
+    URL_HASH MD5=f387bd21bd54a68ef73a0b9fa20a9ff5
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND "")


CI: remove DiapOTB from CI (doesn't compile because of openMP)

--- CI/configure_options.cmake
+++ CI/configure_options.cmake
@@ -70,7 +70,7 @@
 set(cmake_configure_option
 "${cmake_configure_option}
 CMAKE_PREFIX_PATH=${XDK_PATH}")
-foreach(remote_module OTBTemporalGapFilling SertitObject otbGRM DiapOTBModule)
+foreach(remote_module OTBTemporalGapFilling SertitObject otbGRM ) #DiapOTBModule
   set(cmake_configure_option
 "${cmake_configure_option}
 Module_${remote_module}:BOOL=ON")


fixed: py optinal install

fixed: py optinal install

--- CMake/BuildFunctions.cmake
+++ CMake/BuildFunctions.cmake
@@ -1978,10 +1978,10 @@

               LIBRARY DESTINATION ${_OSG_TARGET_LIBDIR_REL}
               COMPONENT release_libraries
+              OPTIONAL

               ARCHIVE DESTINATION ${_OSG_TARGET_LIBDIR_REL}
               COMPONENT release_libraries
-
               OPTIONAL)

       INSTALL(TARGETS ${PROJECT_NAME}Py
@@ -1995,10 +1995,10 @@

               LIBRARY DESTINATION ${_OSG_TARGET_LIBDIR_DBG}
               COMPONENT debug_libraries
+              OPTIONAL

               ARCHIVE DESTINATION ${_OSG_TARGET_LIBDIR_DBG}
               COMPONENT debug_libraries
-
               OPTIONAL)

       INSTALL(TARGETS ${PROJECT_NAME}Py
@@ -2012,10 +2012,10 @@

               LIBRARY DESTINATION ${_OSG_TARGET_LIBDIR_RELNO}
               COMPONENT release_no_opt_libraries
+              OPTIONAL

               ARCHIVE DESTINATION ${_OSG_TARGET_LIBDIR_RELNO}
               COMPONENT release_no_opt_libraries
-
               OPTIONAL)

       INSTALL(TARGETS ${PROJECT_NAME}Py
@@ -2029,10 +2029,10 @@

               LIBRARY DESTINATION ${_OSG_TARGET_LIBDIR_DBGO}
               COMPONENT debug_opt_libraries
+              OPTIONAL

               ARCHIVE DESTINATION ${_OSG_TARGET_LIBDIR_DBGO}
               COMPONENT debug_opt_libraries
-
               OPTIONAL)

@@ -2126,9 +2126,11 @@

               RUNTIME DESTINATION ${_OSG_PY_INST_BASE}
               COMPONENT libraries
+              OPTIONAL

               LIBRARY DESTINATION ${_OSG_PY_INST_BASE}
               COMPONENT libraries
+              OPTIONAL

               ARCHIVE DESTINATION ${_OSG_PY_INST_BASE}
               COMPONENT libraries


Fixed Boost include directory for Windows.

--- CMakeExternals/Boost.cmake
+++ CMakeExternals/Boost.cmake
@@ -20,7 +20,7 @@
     set(_boost_version 1_56)
     set(_boost_install_include_dir include/boost)
     if(WIN32)
-      set(_boost_install_include_dir include/boost-${_boost_version})
+      set(_boost_install_include_dir include/boost-${_boost_version}/boost)
     endif()

     set(_boost_libs )


enh: Do not add WITH_<Pkg> option when USE_<Pkg> variable set [BASIS]

--- CMake/Basis/CommonTools.cmake
+++ CMake/Basis/CommonTools.cmake
@@ -300,7 +300,11 @@
       if (NOT DEFINED WITH_${PKG}_DEFAULT)
         set (WITH_${PKG}_DEFAULT OFF)
       endif ()
-      option (WITH_${PKG} "Build with optional ${PKG} dependency" ${WITH_${PKG}_DEFAULT})
+      if (DEFINED USE_${PKG} AND NOT DEFINED WITH_${PKG})
+        set (WITH_${PKG} ${WITH_${PKG}_DEFAULT})
+      else ()
+        option (WITH_${PKG} "Build with optional ${PKG} dependency" ${WITH_${PKG}_DEFAULT})
+      endif ()
     endif ()
     # look for external package only if required, built with optional dependency
     # enabled by user (cf. WITH_<PKG> option above) or deprecated -DUSE_<PKG>=ON


enh: Report when previously found package is used, no find_package [BASIS]

--- CMake/Basis/CommonTools.cmake
+++ CMake/Basis/CommonTools.cmake
@@ -774,7 +774,11 @@
         # status message with information about found package
         if (_BFP_STATUS)
           if (${PKG}_FOUND)
-            set (_BFP_STATUS "${_BFP_STATUS} - found")
+            if (_BFP_NO_FIND_PACKAGE)
+              set (_BFP_STATUS "${_BFP_STATUS} - already found")
+            else ()
+              set (_BFP_STATUS "${_BFP_STATUS} - found")
+            endif ()
             if ("^${PKG}$" STREQUAL "^Boost$")
               set (_BFP_STATUS "${_BFP_STATUS} v${${_BFP_NS}_MAJOR_VERSION}.${${_BFP_NS}_MINOR_VERSION}.${${_BFP_NS}_SUBMINOR_VERSION}")
             elseif (DEFINED ${_BFP_NS}_VERSION_STRING AND NOT ${_BFP_NS}_VERSION_STRING MATCHES "^(0(\\.0)?(\\.0)?)?$")


Use CMake's regex instead of 'grep' because it is not universal. The 'grep' command on macOS is from BSD which requires different option than Linux one to enable extended or Perl-compatible regex parsing. [skip appveyor] [ci only: OSX]

--- CMake/Modules/CheckHost.cmake
+++ CMake/Modules/CheckHost.cmake
@@ -31,7 +31,7 @@
 #  HAS_LIB64 (multilib capable)
 #  CCACHE_VERSION (when using Clang with ccache enabled)
 #
-# Neither here or there:
+# Neither here nor there:
 #  BASH_ON_WINDOWS
 #

@@ -75,7 +75,8 @@
     # Test if PCH could be enabled in tandem with ccache when using Clang compiler toolchain
     if ("$ENV{USE_CCACHE}" AND CMAKE_CXX_COMPILER_ID MATCHES Clang)
         if (NOT DEFINED CCACHE_VERSION)
-            execute_process (COMMAND ccache --version COMMAND head -1 COMMAND grep -oP "(?:\\d+\\.)?(?:\\d+\\.)?\\d+" RESULT_VARIABLE CCACHE_EXIT_CODE OUTPUT_VARIABLE CCACHE_VERSION ERROR_QUIET)
+            execute_process (COMMAND ccache --version COMMAND head -1 RESULT_VARIABLE CCACHE_EXIT_CODE OUTPUT_VARIABLE CCACHE_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+            string (REGEX MATCH "[^ .]+\\.[^.]+\\.[^ ]+" CCACHE_VERSION "${CCACHE_VERSION}")    # Stringify as it could be empty when an error has occured
             if (CCACHE_EXIT_CODE EQUAL 0)
                set (CCACHE_VERSION ${CCACHE_VERSION} CACHE INTERNAL "ccache version")
            endif ()


Fixed: don't look for Ogre library binaries for linking when we are using Ogre sources - instead, use the target names.

--HG--
branch : v1-9

--- CMake/Packages/FindOGRE.cmake
+++ CMake/Packages/FindOGRE.cmake
@@ -215,8 +215,17 @@
   set(OGRE_INCOMPATIBLE FALSE)
 endif ()

-find_library(OGRE_LIBRARY_REL NAMES ${OGRE_LIBRARY_NAMES} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel")
-find_library(OGRE_LIBRARY_DBG NAMES ${OGRE_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Debug")
+if (NOT OGRE_SOURCE) # If using ogre sources, use the target names instead of library files to link.
+	find_library(OGRE_LIBRARY_REL NAMES ${OGRE_LIBRARY_NAMES} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel")
+	find_library(OGRE_LIBRARY_DBG NAMES ${OGRE_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Debug")
+else()
+	if( NOT OGRE_LIBRARIES OR OGRE_LIBRARIES STREQUAL "" )
+		message( FATAL_ERROR "When using Ogre from sources, please specify target names in OGRE_LIBRARIES!" )
+	else()
+		message( "Using Ogre source instead of binary libraries - skipping library files search." )
+	endif()
+endif()
+
 make_library_set(OGRE_LIBRARY)

 if(APPLE)


Revert "Able to build for FreeBSD 12 (Thanks to Jason Bacon) #6765"

This reverts commit c552886875ce22c7f8ec3cf54100ea67ea2eaaf4.

--- build/cmake/macros/SystemSpecificInformations.cmake
+++ build/cmake/macros/SystemSpecificInformations.cmake
@@ -265,7 +265,6 @@
     set( SYSTEM_NAME "freebsd_${FREEBSD_RELEASE}" )
     set( CONDOR_FREEBSD ON )
     set( BSD_UNIX ON )
-    # FIXME: Is there a >= to replace all the MATCHES operators below?
     if(FREEBSD_MAJOR MATCHES "4" )
       set( CONDOR_FREEBSD4 ON )
     elseif(FREEBSD_MAJOR MATCHES "5" )
@@ -285,9 +284,6 @@
     elseif(FREEBSD_MAJOR MATCHES "11" )
       set( CONDOR_FREEBSD11 ON )
       set( CONDOR_UTMPX ON )
-    elseif(FREEBSD_MAJOR MATCHES "12" )
-      set( CONDOR_FREEBSD11 ON )
-      set( CONDOR_UTMPX ON )
     endif()
     if( CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" )
       set( SYS_ARCH "x86_64")


SVN_SILENT made messages (.desktop file)

--- gstreamer/gstreamer.desktop.cmake
+++ gstreamer/gstreamer.desktop.cmake
@@ -115,7 +115,7 @@
 Comment[sr@latin]=GStreamer kao pozadina Phonona
 Comment[sv]=Phonon Gstreamer-gränssnitt
 Comment[th]=โปรแกรมเบื้องหลัง GStreamer ของ Phonon
-Comment[tr]=Phonon GStreamer arkaucu
+Comment[tr]=Phonon GStreamer arka ucu
 Comment[ug]=Phonon GStreamer نىڭ ئارقائۇچى
 Comment[uk]=Модуль використання GStreamer у Phonon
 Comment[x-test]=xxPhonon GStreamer backendxx


Fixed code alignment.

Fixed code alignment.

--- cmake/Modules/Urho3D-CMake-magic.cmake
+++ cmake/Modules/Urho3D-CMake-magic.cmake
@@ -169,9 +169,9 @@
         set (DEFINE_EXPORT "__declspec(dllexport)")
         set (DEFINE_IMPORT "__declspec(dllimport)")
     elseif (COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY)
-      set (DEFINE_EXPORT "__attribute__((visibility(\"default\")))")
-      set (DEFINE_IMPORT "__attribute__((visibility(\"default\")))")
-      set (DEFINE_NO_EXPORT "__attribute__((visibility(\"hidden\")))")
+        set (DEFINE_EXPORT "__attribute__((visibility(\"default\")))")
+        set (DEFINE_IMPORT "__attribute__((visibility(\"default\")))")
+        set (DEFINE_NO_EXPORT "__attribute__((visibility(\"hidden\")))")
     endif ()
 endmacro ()


posix_sitl_default.cmake: add -DORB_USE_PUBLISHER_RULES if it's a replay build

--- cmake/configs/posix_sitl_default.cmake
+++ cmake/configs/posix_sitl_default.cmake
@@ -112,3 +112,12 @@
 	)
 set_property(CACHE config_sitl_debugger
 	PROPERTY STRINGS "disable;gdb;lldb")
+
+# If the environment variable 'replay' is defined, we are building with replay
+# support. In this case, we enable the orb publisher rules.
+set(REPLAY_FILE "$ENV{replay}")
+if(REPLAY_FILE)
+	message("Building with uorb publisher rules support")
+	add_definitions(-DORB_USE_PUBLISHER_RULES)
+endif()
+


Search for Qt5 version of QExtSerialPort in Qt5 builds

BUG: 348594

--- cmake/modules/FindQextSerialPort.cmake
+++ cmake/modules/FindQextSerialPort.cmake
@@ -6,8 +6,13 @@
   set(QEXTSERIALPORT_FOUND TRUE)
 else(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARIES)

-  find_path(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATH_SUFFIXES QtExtSerialPort HINTS ${QT_INCLUDE_DIR})
-  find_library(QEXTSERIALPORT_LIBRARIES NAMES qextserialport HINTS ${QT_LIBRARY_DIR})
+  if(QT5BUILD)
+    find_path(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATH_SUFFIXES QtExtSerialPort HINTS ${Qt5Core_INCLUDE_DIRS})
+    find_library(QEXTSERIALPORT_LIBRARIES NAMES Qt5ExtSerialPort HINTS ${QT_LIBRARY_DIR})
+  else()
+    find_path(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATH_SUFFIXES QtExtSerialPort HINTS ${QT_INCLUDE_DIR})
+    find_library(QEXTSERIALPORT_LIBRARIES NAMES qextserialport HINTS ${QT_LIBRARY_DIR})
+  endif()

   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(QextSerialPort DEFAULT_MSG QEXTSERIALPORT_INCLUDE_DIR QEXTSERIALPORT_LIBRARIES)


LLVMProcessSources.cmake: [MSVC] Don't add "PROPERTIES HEADER_FILE_ONLY" to *.def.

FIXME: Shall we put *.def(s) to the folder?

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

--- cmake/modules/LLVMProcessSources.cmake
+++ cmake/modules/LLVMProcessSources.cmake
@@ -29,7 +29,7 @@

 macro(add_header_files srcs)
-  file(GLOB hds *.h *.def)
+  file(GLOB hds *.h)
   if( hds )
     set_source_files_properties(${hds} PROPERTIES HEADER_FILE_ONLY ON)
     list(APPEND ${srcs} ${hds})
@@ -50,6 +50,7 @@
   endforeach(s)
   if( MSVC_IDE )
     # This adds .td and .h files to the Visual Studio solution:
+    # FIXME: Shall we handle *.def here?
     add_td_sources(sources)
     add_header_files(sources)
   endif()


stream specific CMake macros and options now live in the stream module

--- components/ospcommon/cmake/macros.cmake
+++ components/ospcommon/cmake/macros.cmake
@@ -58,15 +58,6 @@
   ENDIF()
 ENDMACRO()

-OPTION(OSPRAY_SUPPORT_DOUBLES OFF "Build double precision support?")
-
-
-MACRO(OSPRAY_CONFIGURE_STREAM)
-  SET(OSPRAY_STREAM_ISA "NATIVE" CACHE STRING
-      "Target ISA (NATIVE SCALAR, SSE4, AVX, AVX2, KNL, SKX)")
-ENDMACRO()
-
-
 ## Macro configure ISA targets for ispc ##
 MACRO(OSPRAY_CONFIGURE_ISPC_ISA)

@@ -275,143 +266,6 @@
   ELSE()
     OSPRAY_INSTALL_LIBRARY(${LIBRARY_NAME} ${LIBRARY_COMPONENT})
   ENDIF()
-ENDMACRO()
-
-## Convenience macro that creates a loadable library with different
-# SIMD-instantiations.
-#
-# i.e., 'OSPRAY_CREATE_SIMD_LIBRARY(myLib <sources>)' would, when
-# targets sse, avx, and avx2 are all enabled, create one
-# libmyLib_sse.so that has 'sources' comiled with sse compile flags,
-# one libmyLib_avx.so compiles with avx, etc.
-MACRO(OSPRAY_CREATE_SIMD_LIBRARY LIBRARY_BASE_NAME)
-  OSPRAY_SPLIT_CREATE_ARGS(LIBRARY ${ARGN})
-
-  # ------------------------------------------------------------------
-  # this is the list of all isa-specific targets we can in theory
-  # build for. note that skx and knx are different because they use
-  # different isas to be cleaned up, and set somewhere globally!
-
-  IF (OSPRAY_STREAM_ISA STREQUAL "ALL")
-    SET(STREAM_ISALIST  sse4 avx avx2 skx knx)
-  ELSEIF (OSPRAY_STREAM_ISA STREQUAL "SCALAR")
-    SET(STREAM_ISALIST scalar)
-  ELSEIF (OSPRAY_STREAM_ISA STREQUAL "NATIVE")
-    SET(STREAM_ISALIST native)
-  ELSEIF (OSPRAY_STREAM_ISA STREQUAL "SSE4")
-    SET(STREAM_ISALIST scalar sse4)
-  ELSEIF (OSPRAY_STREAM_ISA STREQUAL "AVX")
-    SET(STREAM_ISALIST scalar sse4 avx )
-  ELSEIF (OSPRAY_STREAM_ISA STREQUAL "AVX2")
-    SET(STREAM_ISALIST scalar sse4 avx avx2)
-    #    SET(ISALIST sse avx avx2 skx knx)
-  ELSE ()
-    MESSAGE(FATAL_ERROR "un-recognized ospray_build_isa '${OSPRAY_STREAM_ISA}' in ospray_create_simd_library")
-  ENDIF()
-
-  SET(OSPRAY_CXXFLAGS_COMMON "")
-  IF (OSPRAY_COMPILER_ICC)
-    SET(OSPRAY_CXXFLAGS_SCALAR -DOSPRAY_SCALAR=1)
-    SET(OSPRAY_CXXFLAGS_NATIVE -march=native -DOSPRAY_SIMD_NATIVE=1)
-    SET(OSPRAY_CXXFLAGS_SSE4 -xsse4.2 -DOSPRAY_SIMD_SSE=1)
-    SET(OSPRAY_CXXFLAGS_AVX  -xAVX -DOSPRAY_SIMD_AVX=1)
-    SET(OSPRAY_CXXFLAGS_AVX2 -xCORE-AVX2 -DOSPRAY_SIMD_AVX2=1)
-    SET(OSPRAY_CXXFLAGS_SKX  -xCORE-AVX512 -DOSPRAY_SIMD_SKX=1)
-    SET(OSPRAY_CXXFLAGS_KNL  -xMIC-AVX512 -DOSPRAY_SIMD_KNX=1)
-  ELSEIF (OSPRAY_COMPILER_GCC)
-#TODO: fix tsimd to work without any isa in gcc mode - for now, i'm adding sse4 even for scalar
-    SET(OSPRAY_CXXFLAGS_NATIVE -march=native -DOSPRAY_SIMD_NATIVE=1)
-    SET(OSPRAY_CXXFLAGS_SCALAR -msse4.2 -DOSPRAY_SIMD_NONE=1 -DOSPRAY_SCALAR=1)
-    SET(OSPRAY_CXXFLAGS_SSE4 -msse4.2 -DOSPRAY_SIMD_SSE=1)
-    SET(OSPRAY_CXXFLAGS_AVX  -mavx -DOSPRAY_SIMD_AVX=1)
-    SET(OSPRAY_CXXFLAGS_AVX2 -mavx2 -mf16c -mfma -mlzcnt -mbmi -mbmi2 -DOSPRAY_SIMD_AVX2=1)
-    SET(OSPRAY_CXXFLAGS_SKX   -mavx512f -mavx512dq -mavx512cd -mavx512bw -mavx512vl -mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -DOSPRAY_SIMD_SKX=2)
-    SET(OSPRAY_CXXFLAGS_KNL  -mavx512f -mavx512pf -mavx512er -mavx512cd -mf16c -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -DOSPRAY_SIMD_KNX=1)
-  ELSEIF (OSPRAY_COMPILER_CLANG)
-    # get rid of "XXX is not defined, will evaluate to 0" warning -
-    # that's what we _want_
-    SET(OSPRAY_CXXFLAGS_COMMON ${OSPRAY_CXXFLAGS_COMMON} -Wno-undef)
-
-    # get rid of the tsimd 'annymous types' and 'anonymous structs'
-    # warnings - shuld get fixed in tsimd
-    SET(OSPRAY_CXXFLAGS_COMMON ${OSPRAY_CXXFLAGS_COMMON} -Wno-gnu-anonymous-struct -Wno-source-uses-openmp -Wno-nested-anon-types)
-
-    # at least temporarily, ignore un-used parameters (should
-    # eventually turn back on, but not while we have lots of dummy api
-    # functions...)
-    SET(OSPRAY_CXXFLAGS_COMMON ${OSPRAY_CXXFLAGS_COMMON} -Wno-unused-parameter)
-
-    SET(OSPRAY_CXXFLAGS_COMMON ${OSPRAY_CXXFLAGS_COMMON} -openmp)
-
-    # define isa-specific flags
-    SET(OSPRAY_CXXFLAGS_SCALAR -DOSPRAY_SIMD_NONE=1 -DOSPRAY_SCALAR=1)
-    SET(OSPRAY_CXXFLAGS_NATIVE -march=native -DOSPRAY_SIMD_NATIVE=1 )
-    SET(OSPRAY_CXXFLAGS_SSE4 -msse4.2 -DOSPRAY_SIMD_SSE=1)
-    SET(OSPRAY_CXXFLAGS_AVX  -mavx -DOSPRAY_SIMD_AVX=1)
-    SET(OSPRAY_CXXFLAGS_AVX2 -mavx2 -mf16c -mfma -mlzcnt -mbmi -mbmi2 -DOSPRAY_SIMD_AVX2=1)
-    SET(OSPRAY_CXXFLAGS_SKX -march=skx -DOSPRAY_SIMD_SKX=1)
-    SET(OSPRAY_CXXFLAGS_KNL -march=knl -DOSPRAY_SIMD_KNX=1)
-  ELSE()
-    MESSAGE("OSPRAY_CREATE_SIMD_LIBRARY: Compiler not recognized!")
-  ENDIF()
-
-  # the name of the library we'll be generating for that isa
-  SET(OSPRAY_SIMD_LIBNAME_SCALAR scalar)
-  SET(OSPRAY_SIMD_LIBNAME_NATIVE native)
-  SET(OSPRAY_SIMD_LIBNAME_SSE4 sse4)
-  SET(OSPRAY_SIMD_LIBNAME_AVX  avx)
-  SET(OSPRAY_SIMD_LIBNAME_AVX2 avx2)
-  SET(OSPRAY_SIMD_LIBNAME_KNL knl)
-  SET(OSPRAY_SIMD_LIBNAME_SKX skx)
-  # end 'to be cleaned up'
-  # ------------------------------------------------------------------
-
-  # hack: prevent ispc from doing multi-target binaries in this module by
-  # temporarily setting a single-target ispc target list
-  SET(SAVED_OSPRAY_ISPC_TARGET_LIST ${OSPRAY_ISPC_TARGET_LIST})
-
-  FOREACH(_ISA ${STREAM_ISALIST})
-    STRING(TOUPPER ${_ISA} ISA)
-    message("building for ISA ${ISA}")
-    SET(OSPRAY_ISPC_TARGET_LIST ${OSPRAY_ISPC_TARGET_${ISA}})
-    OSPRAY_FIX_ISPC_TARGET_LIST()
-    SET(OSPRAY_ISPC_TARGET_NAME ${OSPRAY_SIMD_LIBNAME_${ISA}})
-
-    # ----------- float -----------
-    SET(LIBRARY_NAME ${LIBRARY_BASE_NAME}_${OSPRAY_SIMD_LIBNAME_${ISA}})
-    OSPRAY_ADD_LIBRARY(${LIBRARY_NAME}_float SHARED ${LIBRARY_SOURCES})
-    message("building ${LIBRARY_NAME}_float from ${LIBRARY_SOURCES} flags  ${OSPRAY_CXXFLAGS_${ISA}}")
-    TARGET_COMPILE_OPTIONS(${LIBRARY_NAME}_float PRIVATE ${OSPRAY_CXXFLAGS_COMMON} ${OSPRAY_CXXFLAGS_${ISA}} -DOSPRAY_USE_DOUBLES=0)
-    TARGET_LINK_LIBRARIES(${LIBRARY_NAME}_float ${LIBRARY_LIBS})
-    OSPRAY_SET_LIBRARY_VERSION(${LIBRARY_NAME}_float)
-#    IF(${LIBRARY_EXCLUDE_FROM_ALL})
-#      SET_TARGET_PROPERTIES(${LIBRARY_NAME}_float PROPERTIES EXCLUDE_FROM_ALL TRUE)
-#    ELSE()
-#      OSPRAY_INSTALL_LIBRARY(${LIBRARY_NAME}_float ${LIBRARY_COMPONENT})
-#    ENDIF()
-
-    IF (OSPRAY_SUPPORT_DOUBLES)
-    # ----------- double -----------
-    SET(LIBRARY_NAME ${LIBRARY_BASE_NAME}_${OSPRAY_SIMD_LIBNAME_${ISA}})
-    OSPRAY_ADD_LIBRARY(${LIBRARY_NAME}_double SHARED ${LIBRARY_SOURCES})
-    TARGET_COMPILE_OPTIONS(${LIBRARY_NAME}_double PRIVATE ${OSPRAY_CXXFLAGS_COMMON} ${OSPRAY_CXXFLAGS_${ISA}} -DOSPRAY_USE_DOUBLES=1)
-    TARGET_LINK_LIBRARIES(${LIBRARY_NAME}_double ${LIBRARY_LIBS})
-    OSPRAY_SET_LIBRARY_VERSION(${LIBRARY_NAME}_double)
-    IF(${LIBRARY_EXCLUDE_FROM_ALL})
-      SET_TARGET_PROPERTIES(${LIBRARY_NAME}_double PROPERTIES EXCLUDE_FROM_ALL TRUE)
-    ELSE()
-      OSPRAY_INSTALL_LIBRARY(${LIBRARY_NAME}_double ${LIBRARY_COMPONENT})
-    ENDIF()
-    ENDIF()
-
-    # end of hack: restore original ispc target list for multi-target libraries
-    SET(OSPRAY_ISPC_TARGET_LIST ${SAVED_OSPRAY_ISPC_TARGET_LIST})
-    SET(OSPRAY_ISPC_TARGET_NAME "")
-  ENDFOREACH()
-
-  # end of hack: restore original ispc target list for multi-target libraries
-  SET(OSPRAY_ISPC_TARGET_LIST ${SAVED_OSPRAY_ISPC_TARGET_LIST})
-  SET(OSPRAY_ISPC_TARGET_NAME "")
 ENDMACRO()

 ## Conveniance macro for creating OSPRay applications ##


[Build] The Python script is now also installed. There is still some work to specify the correct path of the dependency (library).

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -129,6 +129,10 @@
 	"Where to install ${PROJECT_NAME}" FORCE)
   set (CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
 	"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE STRING
+	"C++ compilation flags" FORCE)
+  set (COMPILE_FLAGS "${COMPILE_FLAGS}" CACHE STRING
+	"Supplementary C++ compilation flags" FORCE)
   set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" CACHE PATH
 	"Path to custom CMake Modules" FORCE)
   set (INSTALL_DOC "${INSTALL_DOC}" CACHE BOOL
@@ -372,7 +376,7 @@
   set (Boost_USE_STATIC_RUNTIME OFF)
   set (BOOST_REQUIRED_COMPONENTS
     program_options date_time iostreams serialization filesystem
-    unit_test_framework)
+    unit_test_framework python)

   # The first check is for the required components.
   find_package (Boost COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
@@ -389,7 +393,8 @@
     # Update the list of dependencies for the project
     list (APPEND PROJ_DEP_LIBS_FOR_LIB
       ${Boost_IOSTREAMS_LIBRARY} ${Boost_SERIALIZATION_LIBRARY}
-      ${Boost_FILESYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
+      ${Boost_FILESYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
+      ${Boost_PYTHON_LIBRARY})
     list (APPEND PROJ_DEP_LIBS_FOR_BIN ${Boost_PROGRAM_OPTIONS_LIBRARY})
     list (APPEND PROJ_DEP_LIBS_FOR_TST ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})

@@ -397,7 +402,8 @@
     set (BOOST_REQUIRED_LIBS
       ${Boost_IOSTREAMS_LIBRARY} ${Boost_SERIALIZATION_LIBRARY}
       ${Boost_FILESYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
-      ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+      ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+      ${Boost_PYTHON_LIBRARY})
   endif (Boost_FOUND)

 endmacro (get_boost)
@@ -535,11 +541,20 @@
 macro (init_build)
   ##
   # Compilation
-  # Note: the debug flag (-g) is set (or not) by giving the
-  # corresponding option when calling cmake:
-  # cmake -DCMAKE_BUILD_TYPE:STRING={Debug,Release,MinSizeRel,RelWithDebInfo}
-  #set (CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror")
-  set (CMAKE_CXX_FLAGS "-Wall -Werror")
+  # Note:
+  #  * The debug flag (-g) is set (or not) by giving the corresponding option
+  #    when calling cmake:
+  #    cmake -DCMAKE_BUILD_TYPE:STRING={Debug,Release,MinSizeRel,RelWithDebInfo}
+  #  * The CMAKE_CXX_FLAGS is set by CMake to be equal to the CXXFLAGS
+  #    environment variable. Hence:
+  #    CXXFLAGS="-O2"; export CXXFLAGS; cmake ..
+  #    will set CMAKE_CXX_FLAGS as being equal to -O2.
+  if (NOT CMAKE_CXX_FLAGS)
+	#set (CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror")
+	set (CMAKE_CXX_FLAGS "-Wall -Werror")
+  endif (NOT CMAKE_CXX_FLAGS)
+
+  #
   include_directories (BEFORE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})

   ##
@@ -744,9 +759,12 @@
     "${${MODULE_LIB_TARGET}_root_HEADERS}" "${${MODULE_LIB_TARGET}_SOURCES}"
     ${_intermodule_dependencies})

-  # Installation of all the remaining header files for the module, i.e.,
-  # the header files located in all the layers except the root.
-  module_header_install_everything_else ()
+  # If so required, installation of all the remaining header files
+  # for the module, i.e., the header files located in all the layers
+  # except the root.
+  if (${_publish_all_headers_flag})
+    module_header_install_everything_else()
+  endif (${_publish_all_headers_flag})

   # Convenient message to the user/developer
   if (NOT "${INSTALL_LIB_DIR}" MATCHES "^/usr/${LIBDIR}$")
@@ -763,6 +781,8 @@
 #    short name: a 'lib' suffix is just appended to the short name.
 #  * The directory where to find the header files.
 #  * The header files to be published/installed along with the library.
+#    If there are no header to be exported, the 'na' keyword (standing for
+#    'non available') must be given.
 #  * The source files to build the library.
 #    Note that the source files contain at least the header files. Hence,
 #    even when there are no .cpp source files, the .hpp files will appear.
@@ -775,7 +795,7 @@
 # external libraries (e.g., Boost, SOCI, StdAir) are automatically
 # appended, thanks to the get_external_libs() macro.
 macro (module_library_add_specific
-	_lib_short_name _lib_dir _lib_headers _lib_sources)
+    _lib_short_name _lib_dir _lib_headers _lib_sources)
   # Derive the library (CMake) target from its name
   set (_lib_target ${_lib_short_name}lib)

@@ -821,9 +841,6 @@
     # as generated by the module_generate_config_helpers() macro
     add_dependencies (${_lib_target} hdr_cfg_${MODULE_NAME})
   endif (${_lib_short_name} STREQUAL ${MODULE_NAME})
-
-  # DEBUG
-  #message ("DEBUG -- [${_lib_target}] _lib_headers = ${_lib_headers}")

   ##
   # Library name (and soname)
@@ -856,8 +873,11 @@
   list (APPEND ${MODULE_NAME}_ALL_LIBS ${_lib_target})
   set (${MODULE_NAME}_ALL_LIBS ${${MODULE_NAME}_ALL_LIBS} PARENT_SCOPE)

-  # Install the header files for the library
-  module_header_install_specific (${_lib_dir} "${_lib_headers}")
+  # If given/existing, install the header files for the library
+  string (TOLOWER "${_lib_headers}" _lib_headers_lower)
+  if (NOT "${_lib_headers_lower}" STREQUAL "na")
+    module_header_install_specific (${_lib_dir} "${_lib_headers}")
+  endif (NOT "${_lib_headers_lower}" STREQUAL "na")

 endmacro (module_library_add_specific)

@@ -946,11 +966,37 @@
 endmacro (module_binary_add)

 ##
+# Add a Python script to be installed
+macro (module_python_add _script_file)
+  #
+  set (_full_python_script_path ${CMAKE_CURRENT_SOURCE_DIR}/${_script_file})
+  if (EXISTS ${_full_python_script_path})
+    # Install the development helpers
+    install (PROGRAMS ${_script_file} DESTINATION bin COMPONENT devel)
+
+  else (EXISTS ${_full_python_script_path})
+    message (FATAL_ERROR
+      "The Python script to be installed, '${_script_file}', does not exist")
+  endif (EXISTS ${_full_python_script_path})
+
+  # Register the binary target in the project (for reporting purpose)
+  get_filename_component (_script_alone ${_script_file} NAME)
+  list (APPEND PROJ_ALL_BIN_TARGETS ${_script_alone})
+  set (PROJ_ALL_BIN_TARGETS ${PROJ_ALL_BIN_TARGETS} PARENT_SCOPE)
+
+  # Register, for reporting purpose, the list of executables to be built
+  # and installed for that module
+  list (APPEND ${MODULE_NAME}_ALL_EXECS ${_script_alone})
+  set (${MODULE_NAME}_ALL_EXECS ${${MODULE_NAME}_ALL_EXECS} PARENT_SCOPE)
+
+endmacro (module_python_add)
+
+##
 # Installation of the CMake import helper, so that third party projects
 # can refer to it (for libraries, header files and binaries)
 macro (module_export_install)
-  install (EXPORT ${LIB_DEPENDENCY_EXPORT} DESTINATION
-    "${INSTALL_DATA_DIR}/${PACKAGE}/CMake" COMPONENT devel)
+  install (EXPORT ${LIB_DEPENDENCY_EXPORT}
+    DESTINATION "${INSTALL_DATA_DIR}/${PACKAGE}/CMake" COMPONENT devel)
 endmacro (module_export_install)

@@ -1105,11 +1151,11 @@

   # Install the development helpers
   install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${CFG_SCRIPT}
-	DESTINATION ${CFG_SCRIPT_PATH})
+    DESTINATION ${CFG_SCRIPT_PATH})
   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKGCFG_SCRIPT}
-	DESTINATION ${PKGCFG_SCRIPT_PATH})
+    DESTINATION ${PKGCFG_SCRIPT_PATH})
   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${M4_MACROFILE}
-	DESTINATION ${M4_MACROFILE_PATH})
+    DESTINATION ${M4_MACROFILE_PATH})

 endmacro (install_dev_helper_files)

@@ -1221,11 +1267,11 @@
   message (STATUS)
   foreach (_module_name ${PROJ_ALL_MOD_FOR_BLD})
     message (STATUS "* Module ....................... : ${_module_name}")
-    message (STATUS "  + Layers to be built ......... : ${${_module_name}_ALL_LAYERS}")
+    message (STATUS "  + Layers to build ............ : ${${_module_name}_ALL_LAYERS}")
     message (STATUS "  + Dependencies on other layers : ${${_module_name}_INTER_TARGETS}")
-    message (STATUS "  + Libraries to be built ...... : ${${_module_name}_ALL_LIBS}")
-    message (STATUS "  + Executables to be built .... : ${${_module_name}_ALL_EXECS}")
-    message (STATUS "  + Test to be checked ......... : ${${_module_name}_ALL_TESTS}")
+    message (STATUS "  + Libraries to build/install . : ${${_module_name}_ALL_LIBS}")
+    message (STATUS "  + Executables to build/install : ${${_module_name}_ALL_EXECS}")
+    message (STATUS "  + Tests to perform ........... : ${${_module_name}_ALL_TESTS}")
   endforeach (_module_name)
 endmacro (display_status_all_modules)

@@ -1248,14 +1294,18 @@
   message (STATUS "---     Build Configuration    ---")
   message (STATUS "----------------------------------")
   message (STATUS "Modules to build ............... : ${PROJ_ALL_MOD_FOR_BLD}")
-  message (STATUS "Libraries to build ............. : ${PROJ_ALL_LIB_TARGETS}")
-  message (STATUS "Binaries to build .............. : ${PROJ_ALL_BIN_TARGETS}")
+  message (STATUS "Libraries to build/install ..... : ${PROJ_ALL_LIB_TARGETS}")
+  message (STATUS "Binaries to build/install ...... : ${PROJ_ALL_BIN_TARGETS}")
   message (STATUS "Modules to test ................ : ${PROJ_ALL_MOD_FOR_TST}")
   message (STATUS "Binaries to test ............... : ${PROJ_ALL_TST_TARGETS}")
   display_status_all_modules ()
   message (STATUS)
   message (STATUS "BUILD_SHARED_LIBS .............. : ${BUILD_SHARED_LIBS}")
   message (STATUS "CMAKE_BUILD_TYPE ............... : ${CMAKE_BUILD_TYPE}")
+  message (STATUS " * CMAKE_C_FLAGS ............... : ${CMAKE_C_FLAGS}")
+  message (STATUS " * CMAKE_CXX_FLAGS ............. : ${CMAKE_CXX_FLAGS}")
+  message (STATUS " * BUILD_FLAGS ................. : ${BUILD_FLAGS}")
+  message (STATUS " * COMPILE_FLAGS ............... : ${COMPILE_FLAGS}")
   message (STATUS "CMAKE_MODULE_PATH .............. : ${CMAKE_MODULE_PATH}")
   message (STATUS "CMAKE_INSTALL_PREFIX ........... : ${CMAKE_INSTALL_PREFIX}")
   display_doxygen ()


[Build] Suppressed wrong end-of-lines.

[Build] Suppressed wrong end-of-lines.

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -1280,9 +1280,7 @@

   # Convenient message to the user/developer
   if (NOT CMAKE_INSTALL_RPATH_USE_LINK_PATH)
-    install (CODE "message (\"On Unix-based platforms, run "
-	  "export LD_LIBRARY_PATH=${INSTALL_LIB_DIR}:\$LD_LIBRARY_PATH "
-	  "once per session\")")
+    install (CODE "message (\"On Unix-based platforms, run export LD_LIBRARY_PATH=${INSTALL_LIB_DIR}:\$LD_LIBRARY_PATH once per session\")")
   endif (NOT CMAKE_INSTALL_RPATH_USE_LINK_PATH)

 endmacro (module_library_add_standard)


Disable random_ops_test on windows.

Disable random_ops_test on windows.

PiperOrigin-RevId: 200814177

--- tensorflow/contrib/cmake/tf_tests.cmake
+++ tensorflow/contrib/cmake/tf_tests.cmake
@@ -229,6 +229,8 @@
       "${tensorflow_source_dir}/tensorflow/python/debug/cli/profile_analyzer_cli_test.py"
       # Windows does not have the curses library and uses readline.
       "${tensorflow_source_dir}/tensorflow/python/debug/cli/curses_ui_test.py"
+      # Bug in shape inference (b/110283809)
+      "${tensorflow_source_dir}/tensorflow/python/kernel_tests/random/random_ops_test.py"
       # TFDBG grpc:// mode is not yet available on Windows.
       "${tensorflow_source_dir}/tensorflow/python/debug/lib/dist_session_debug_grpc_test.py"
       "${tensorflow_source_dir}/tensorflow/python/debug/lib/grpc_large_data_test.py"


Remove opencog from ATOMSPACE_LIBPATH since it is supplied using PATH_SUFFICES

--- lib/FindAtomSpace.cmake
+++ lib/FindAtomSpace.cmake
@@ -11,7 +11,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 set(ATOMSPACE_LIBPATH
-   /usr/lib/opencog /usr/lib64/opencog /usr/local/lib/opencog /usr/local/lib64/opencog)
+   /usr/lib/ /usr/lib64/ /usr/local/lib/ /usr/local/lib64/)

 find_library(ATOMSPACE_LIBRARY atomspace
    PATH ${ATOMSPACE_LIBPATH} PATH_SUFFIXES opencog)


Find static genericLogger library [ci skip]

--- cmake/FindgenericLogger.cmake
+++ cmake/FindgenericLogger.cmake
@@ -15,13 +15,23 @@
 #
 #   GENERICLOGGER_LIBRARIES
 #     Points to the genericLogger libraries that should be passed to
-#     target_link_libararies.
+#     target_link_libraries in dynamic mode.
+#
+#   GENERICLOGGER_LIBRARIES_STATIC
+#     Points to the genericLogger libraries static that should be passed to
+#     target_link_libraries in static mode.
 #
 #   GENERICLOGGER_LINK_FLAGS
 #     Linker flags when building linking against genericLogger. Defaults to "libgenericLogger". Take care, this is a list.
 #
+#   GENERICLOGGER_STATIC_LINK_FLAGS
+#     Linker flags when building linking against static genericLogger. Defaults to "libgenericLogger_static". Take care, this is a list.
+#
 #   GENERICLOGGER_LDFLAGS
 #     Stringified version of GENERICLOGGER_LINK_FLAGS
+#
+#   GENERICLOGGER_STATIC_LDFLAGS
+#     Stringified version of GENERICLOGGER_STATIC_LINK_FLAGS
 #
 INCLUDE (CMakeParseArguments)
 INCLUDE (FindPackageHandleStandardArgs)
@@ -70,7 +80,6 @@
     )
 ENDIF (GENERICLOGGER_ROOT_DIR)

-# Use at least the data library
 IF (NOT GENERICLOGGER_FIND_COMPONENTS)
   SET (GENERICLOGGER_FIND_COMPONENTS genericLogger)
 ENDIF (NOT GENERICLOGGER_FIND_COMPONENTS)
@@ -82,19 +91,32 @@
     SET (_GENERICLOGGER_COMPONENT_POSSIBLE_DEBUG_NAMES ${_GENERICLOGGER_COMPONENT_BASE}d)
     SET (_GENERICLOGGER_COMPONENT_POSSIBLE_RELEASE_NAMES ${_GENERICLOGGER_COMPONENT_BASE})

+    SET (_GENERICLOGGER_STATIC_COMPONENT_BASE "${_GENERICLOGGER_COMPONENT}_static")
+    SET (_GENERICLOGGER_STATIC_COMPONENT_POSSIBLE_DEBUG_NAMES ${_GENERICLOGGER_STATIC_COMPONENT_BASE}d)
+    SET (_GENERICLOGGER_STATIC_COMPONENT_POSSIBLE_RELEASE_NAMES ${_GENERICLOGGER_STATIC_COMPONENT_BASE})
+
     STRING (TOUPPER ${_GENERICLOGGER_COMPONENT} _GENERICLOGGER_COMPONENT_UPPER)
     SET (_GENERICLOGGER_LIBRARY_BASE GENERICLOGGER_${_GENERICLOGGER_COMPONENT_UPPER}_LIBRARY)
+    SET (_GENERICLOGGER_STATIC_LIBRARY_BASE GENERICLOGGER_STATIC_${_GENERICLOGGER_COMPONENT_UPPER}_LIBRARY)

     IF (GENERICLOGGER_ROOT_DIR)
       FIND_LIBRARY (${_GENERICLOGGER_LIBRARY_BASE}_DEBUG
 	NAMES ${_GENERICLOGGER_COMPONENT_POSSIBLE_DEBUG_NAMES}
 	PATHS ${GENERICLOGGER_ROOT_DIR} PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
 	NO_DEFAULT_PATH)
+      FIND_LIBRARY (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG
+	NAMES ${_GENERICLOGGER_STATIC_COMPONENT_POSSIBLE_DEBUG_NAMES}
+	PATHS ${GENERICLOGGER_ROOT_DIR} PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
+	NO_DEFAULT_PATH)
     ELSE (GENERICLOGGER_ROOT_DIR)
       FIND_LIBRARY (${_GENERICLOGGER_LIBRARY_BASE}_DEBUG
 	NAMES ${_GENERICLOGGER_COMPONENT_POSSIBLE_DEBUG_NAMES}
 	PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
 	)
+      FIND_LIBRARY (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG
+	NAMES ${_GENERICLOGGER_COMPONENT_STATIC_POSSIBLE_DEBUG_NAMES}
+	PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
+	)
     ENDIF (GENERICLOGGER_ROOT_DIR)

     IF (GENERICLOGGER_ROOT_DIR)
@@ -102,9 +124,17 @@
 	NAMES ${_GENERICLOGGER_COMPONENT_POSSIBLE_RELEASE_NAMES}
 	PATHS ${GENERICLOGGER_ROOT_DIR} PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
 	NO_DEFAULT_PATH)
+      FIND_LIBRARY (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE
+	NAMES ${_GENERICLOGGER_STATIC_COMPONENT_POSSIBLE_RELEASE_NAMES}
+	PATHS ${GENERICLOGGER_ROOT_DIR} PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
+	NO_DEFAULT_PATH)
     ELSE (ICU_ROOT_DIR)
       FIND_LIBRARY (${_GENERICLOGGER_LIBRARY_BASE}_RELEASE
 	NAMES ${_GENERICLOGGER_COMPONENT_POSSIBLE_RELEASE_NAMES}
+	PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
+	)
+      FIND_LIBRARY (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE
+	NAMES ${_GENERICLOGGER_STATIC_COMPONENT_POSSIBLE_RELEASE_NAMES}
 	PATH_SUFFIXES ${_GENERICLOGGER_POSSIBLE_LIB_SUFFIXES}
 	)
     ENDIF (GENERICLOGGER_ROOT_DIR)
@@ -128,26 +158,52 @@
       SET (GENERICLOGGER_${__COMPONENT_UPPER}_FOUND FALSE)
     ENDIF (${_GENERICLOGGER_LIBRARY_BASE}_DEBUG AND ${_GENERICLOGGER_LIBRARY_BASE}_RELEASE)

+    IF (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG AND ${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE)
+      SET (${_GENERICLOGGER_STATIC_LIBRARY_BASE}
+        debug ${${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG}
+        optimized ${${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE})
+      # Debug only
+    ELSEIF (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG)
+      SET (${_GENERICLOGGER_STATIC_LIBRARY_BASE} ${${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG})
+      # Release only
+    ELSEIF (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE)
+      SET (${_GENERICLOGGER_STATIC_LIBRARY_BASE} ${${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE})
+    ELSE (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG AND ${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE)
+      # Component missing: record it for a later report
+      LIST (APPEND _GENERICLOGGER_STATIC_MISSING_COMPONENTS ${_GENERICLOGGER_COMPONENT})
+      SET (GENERICLOGGER_STATIC_${__COMPONENT_UPPER}_FOUND FALSE)
+    ENDIF (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG AND ${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE)
+
     MARK_AS_ADVANCED (${_GENERICLOGGER_LIBRARY_BASE}_DEBUG ${_GENERICLOGGER_LIBRARY_BASE}_RELEASE)
+    MARK_AS_ADVANCED (${_GENERICLOGGER_STATIC_LIBRARY_BASE}_DEBUG ${_GENERICLOGGER_STATIC_LIBRARY_BASE}_RELEASE)

     # Make sure only libraries that have been actually found are registered
     IF (${_GENERICLOGGER_LIBRARY_BASE})
       LIST (APPEND _GENERICLOGGER_LIBRARIES ${${_GENERICLOGGER_LIBRARY_BASE}})
     ENDIF (${_GENERICLOGGER_LIBRARY_BASE})
+
+    IF (${_GENERICLOGGER_STATIC_LIBRARY_BASE})
+      LIST (APPEND _GENERICLOGGER_STATIC_LIBRARIES ${${_GENERICLOGGER_STATIC_LIBRARY_BASE}})
+    ENDIF (${_GENERICLOGGER_STATIC_LIBRARY_BASE})
+
   ENDFOREACH (_GENERICLOGGER_COMPONENT)

-  IF (NOT DEFINED _GENERICLOGGER_MISSING_COMPONENTS)
+  IF (NOT DEFINED _GENERICLOGGER_MISSING_COMPONENTS AND NOT DEFINED _GENERICLOGGER_STATIC_MISSING_COMPONENTS)
     # Success: all components were found
     SET (GENERICLOGGER_INCLUDE_DIRS "${GENERICLOGGER_INCLUDE_DIR}")
     SET (GENERICLOGGER_LIBRARIES ${_GENERICLOGGER_LIBRARIES})
-  ELSE (NOT DEFINED _GENERICLOGGER_MISSING_COMPONENTS)
+    SET (GENERICLOGGER_STATIC_LIBRARIES ${_GENERICLOGGER_STATIC_LIBRARIES})
+  ELSE ()
     MESSAGE (STATUS "Several GENERICLOGGER components were not found:")

     # Display missing components indented, each on a separate line
     FOREACH (_GENERICLOGGER_MISSING_COMPONENT ${_GENERICLOGGER_MISSING_COMPONENTS})
       MESSAGE (STATUS "  " ${_GENERICLOGGER_MISSING_COMPONENT})
-    ENDFOREACH (_GENERICLOGGER_MISSING_COMPONENT ${_GENERICLOGGER_MISSING_COMPONENTS})
-  ENDIF (NOT DEFINED _GENERICLOGGER_MISSING_COMPONENTS)
+    ENDFOREACH ()
+    FOREACH (_GENERICLOGGER_STATIC_MISSING_COMPONENT ${_GENERICLOGGER_STATIC_MISSING_COMPONENTS})
+      MESSAGE (STATUS "  " ${_GENERICLOGGER_STATIC_MISSING_COMPONENT})
+    ENDFOREACH ()
+  ENDIF ()

   #
   # Simulate hopefully correct flags based on heuristic discovery
@@ -164,6 +220,10 @@
     SET (_GENERICLOGGER_LINK_FLAGS ${GENERICLOGGER_LIBRARIES})
   ENDIF ()

+  IF (NOT _GENERICLOGGER_STATIC_LINK_FLAGS)
+    SET (_GENERICLOGGER_STATIC_LINK_FLAGS ${GENERICLOGGER_STATIC_LIBRARIES})
+  ENDIF ()
+
 ENDIF (GENERICLOGGER_INCLUDE_DIR)

 SET (_GENERICLOGGER_LDFLAGS " ")
@@ -171,6 +231,11 @@
   SET (_GENERICLOGGER_LDFLAGS "${_GENERICLOGGER_LDFLAGS} ${_genericlogger_link_flag}")
 ENDFOREACH ()

+SET (_GENERICLOGGER_STATIC_LDFLAGS " ")
+FOREACH (_genericlogger_static_link_flag ${_GENERICLOGGER_STATIC_LINK_FLAGS})
+  SET (_GENERICLOGGER_STATIC_LDFLAGS "${_GENERICLOGGER_STATIC_LDFLAGS} ${_genericlogger_static_link_flag}")
+ENDFOREACH ()
+
 MARK_AS_ADVANCED (GENERICLOGGER_ROOT_DIR GENERICLOGGER_INCLUDE_DIR)

 FIND_PACKAGE_HANDLE_STANDARD_ARGS (GENERICLOGGER
@@ -178,14 +243,16 @@
   GENERICLOGGER_INCLUDE_DIR
   GENERICLOGGER_LIBRARIES)

-IF (_GENERICLOGGER_LINK_FLAGS)
+IF (_GENERICLOGGER_LINK_FLAGS AND _GENERICLOGGER_STATIC_LINK_FLAGS)
   SET (GENERICLOGGER_FOUND 1 CACHE STRING "GENERICLOGGER is found")
 ENDIF ()

-SET (GENERICLOGGER_C_FLAGS_SHARED   "${_GENERICLOGGER_C_FLAGS_SHARED}"   CACHE STRING "C flags when compiling against shared GENERICLOGGER")
-SET (GENERICLOGGER_CXX_FLAGS_SHARED "${_GENERICLOGGER_CXX_FLAGS_SHARED}" CACHE STRING "C flags when compiling against shared GENERICLOGGER")
-SET (GENERICLOGGER_LINK_FLAGS       "${_GENERICLOGGER_LINK_FLAGS}"       CACHE STRING "Linker flags when linking against GENERICLOGGER")
-SET (GENERICLOGGER_LDFLAGS          "${_GENERICLOGGER_LDFLAGS}"          CACHE STRING "Stringified version of GENERICLOGGER_LINK_FLAGS")
+SET (GENERICLOGGER_C_FLAGS_SHARED    "${_GENERICLOGGER_C_FLAGS_SHARED}"    CACHE STRING "C flags when compiling against shared GENERICLOGGER")
+SET (GENERICLOGGER_CXX_FLAGS_SHARED  "${_GENERICLOGGER_CXX_FLAGS_SHARED}"  CACHE STRING "C flags when compiling against shared GENERICLOGGER")
+SET (GENERICLOGGER_LINK_FLAGS        "${_GENERICLOGGER_LINK_FLAGS}"        CACHE STRING "Linker flags when linking against GENERICLOGGER")
+SET (GENERICLOGGER_LDFLAGS           "${_GENERICLOGGER_LDFLAGS}"           CACHE STRING "Stringified version of GENERICLOGGER_LINK_FLAGS")
+SET (GENERICLOGGER_STATIC_LINK_FLAGS "${_GENERICLOGGER_STATIC_LINK_FLAGS}" CACHE STRING "Linker flags when linking against static GENERICLOGGER")
+SET (GENERICLOGGER_STATIC_LDFLAGS    "${_GENERICLOGGER_STATIC_LDFLAGS}"    CACHE STRING "Stringified version of GENERICLOGGER_STATIC_LINK_FLAGS")

 IF(GENERICLOGGER_FOUND)
   MESSAGE(STATUS "-----------------------------------------")
@@ -196,8 +263,11 @@
   MESSAGE(STATUS "   CXX_FLAGS_SHARED: ${GENERICLOGGER_CXX_FLAGS_SHARED}")
   MESSAGE(STATUS "        INCLUDE_DIR: ${GENERICLOGGER_INCLUDE_DIR}")
   MESSAGE(STATUS "          LIBRARIES: ${GENERICLOGGER_LIBRARIES}")
+  MESSAGE(STATUS "   STATIC LIBRARIES: ${GENERICLOGGER_STATIC_LIBRARIES}")
   MESSAGE(STATUS "         LINK_FLAGS: ${GENERICLOGGER_LINK_FLAGS}")
+  MESSAGE(STATUS "  STATIC LINK_FLAGS: ${GENERICLOGGER_STATIC_LINK_FLAGS}")
   MESSAGE(STATUS "            LDFLAGS: ${GENERICLOGGER_LDFLAGS}")
+  MESSAGE(STATUS "     STATIC LDFLAGS: ${GENERICLOGGER_STATIC_LDFLAGS}")
   MESSAGE(STATUS "-----------------------------------------")
 ENDIF()

@@ -206,4 +276,7 @@
   GENERICLOGGER_C_FLAGS_SHARED
   GENERICLOGGER_CXX_FLAGS_SHARED
   GENERICLOGGER_LINK_FLAGS
-  GENERICLOGGER_LDFLAGS)
+  GENERICLOGGER_LDFLAGS
+  GENERICLOGGER_STATIC_LINK_FLAGS
+  GENERICLOGGER_STATIC_LDFLAGS
+  )


Add Lib: Reformat CMake code

Add Lib: Reformat CMake code

--- cmake/Modules/LibAddLib.cmake
+++ cmake/Modules/LibAddLib.cmake
@@ -1,14 +1,13 @@
-function(add_lib name)
+function (add_lib name)
 	cmake_parse_arguments (ARG
-		"CPP" # optional keywords
-		"" # one value keywords
-		"SOURCES;LINK_LIBRARIES;LINK_ELEKTRA" # multi value keywords
-		${ARGN}
-	)
+			       "CPP" # optional keywords
+			       "" # one value keywords
+			       "SOURCES;LINK_LIBRARIES;LINK_ELEKTRA" # multi value keywords
+			       ${ARGN})

-	add_headers(ARG_SOURCES)
+	add_headers (ARG_SOURCES)
 	if (ARG_CPP)
-		add_cppheaders(ARG_SOURCES)
+		add_cppheaders (ARG_SOURCES)
 	endif (ARG_CPP)

 	if (BUILD_SHARED)
@@ -18,19 +17,14 @@
 		target_link_libraries (elektra-${name} elektra-core ${ARG_LINK_ELEKTRA})
 	endif (BUILD_SHARED)

-	set_property (GLOBAL APPEND PROPERTY "elektra-full_SRCS"
-		${ARG_SOURCES}
-		)
+	set_property (GLOBAL APPEND PROPERTY "elektra-full_SRCS" ${ARG_SOURCES})

-	set_property (GLOBAL APPEND PROPERTY "elektra-extension_LIBRARIES"
-		elektra-${name}
-		)
+	set_property (GLOBAL APPEND PROPERTY "elektra-extension_LIBRARIES" elektra-${name})

 	if (BUILD_SHARED)
-		target_link_libraries (elektra-${name}
-			${ARG_LINK_LIBRARIES})
+		target_link_libraries (elektra-${name} ${ARG_LINK_LIBRARIES})

 		install (TARGETS elektra-${name} DESTINATION lib${LIB_SUFFIX} EXPORT ElektraTargetsLibelektra)
 	endif (BUILD_SHARED)

-endfunction()
+endfunction ()