Refined the list of libraries to link

Refined the list of libraries to link

--- CMakeModules/FindOpenCascade.cmake
+++ CMakeModules/FindOpenCascade.cmake
@@ -55,77 +55,77 @@
 ENDMACRO()

-# Find release (optimized) libs
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKVRML_LIBRARY TKVrml)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTL_LIBRARY TKStl)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBREP_LIBRARY TKBRep)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKIGES_LIBRARY TKIGES)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSHHEALING_LIBRARY TKShHealing)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP_LIBRARY TKSTEP)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP209_LIBRARY TKSTEP209)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPATTR_LIBRARY TKSTEPAttr)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPBASE_LIBRARY TKSTEPBase)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXSBASE_LIBRARY TKXSBase)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSHAPESCHEMA_LIBRARY TKShapeSchema)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBO_LIBRARY TKBO)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_FWOSPLUGIN_LIBRARY FWOSPlugin)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_PTKERNEL_LIBRARY PTKernel)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBOOL_LIBRARY TKBool)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKCAF_LIBRARY TKCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKCDF_LIBRARY TKCDF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKERNEL_LIBRARY TKernel)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKFEAT_LIBRARY TKFeat)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKFILLET_LIBRARY TKFillet)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKG2D_LIBRARY TKG2d)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKG3d_LIBRARY TKG3D)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKGEOMALGO_LIBRARY TKGeomAlgo)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKGEOMBASE_LIBRARY TKGeomBase)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKHLR_LIBRARY TKHLR)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMATH_LIBRARY TKMath)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKOFFSET_LIBRARY TKOffset)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKPCAF_LIBRARY TKPCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKPRIM_LIBRARY TKPrim)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKPSHAPE_LIBRARY TKPShape)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSERVICE_LIBRARY TKService)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTOPALGO_LIBRARY TKTopAlgo)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMESH_LIBRARY TKMesh)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKV3D_LIBRARY TKV3d)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXCAF_LIBRARY TKXCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDEIGES_LIBRARY TKXDEIGES)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXLCAF_LIBRARY TKXLCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKLCAF_LIBRARY TKLCAF)
+
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBinL TKBinL)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBin TKBin)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBinTObj TKBinTObj)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBinXCAF TKBinXCAF)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBool TKBool)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBO TKBO)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBRep TKBRep)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKCAF TKCAF)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKCDF TKCDF)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKDCAF TKDCAF)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKDraw TKDraw)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKernel TKernel)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKFeat TKFeat)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKFillet TKFillet)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKG2d TKG2d)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKG3d TKG3d)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKGeomAlgo TKGeomAlgo)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKGeomBase TKGeomBase)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKHLR TKHLR)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKIGES TKIGES)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKLCAF TKLCAF)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMath TKMath)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMesh TKMesh)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMeshVS TKMeshVS)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKOffset TKOffset)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKOpenGl TKOpenGl)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKPrim TKPrim)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKQADraw TKQADraw)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKService TKService)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKShHealing TKShHealing)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKStdL TKStdL)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKStd TKStd)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP209 TKSTEP209)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPAttr TKSTEPAttr)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPBase TKSTEPBase)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP TKSTEP)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTL TKSTL)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTObjDRAW TKTObjDRAW)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTObj TKTObj)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTopAlgo TKTopAlgo)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTopTest TKTopTest)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKV3d TKV3d)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKVCAF TKVCAF)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKViewerTest TKViewerTest)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKVRML TKVRML)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXCAF TKXCAF)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDEDRAW TKXDEDRAW)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDEIGES TKXDEIGES)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDESTEP TKXDESTEP)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXMesh TKXMesh)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXmlL TKXmlL)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXml TKXml)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXmlTObj TKXmlTObj)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXmlXCAF TKXmlXCAF)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXSBase TKXSBase)
+FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXSDRAW TKXSDRAW)

 SET(OPENCASCADE_LIBRARY ${OPENCASCADE_LIBRARY}
-#    ${OPENCASCADE_TKBREP_LIBRARY}
-#    ${OPENCASCADE_TKIGES_LIBRARY}
-#    ${OPENCASCADE_TKSHHEALING_LIBRARY}
-#    ${OPENCASCADE_TKSTEP_LIBRARY}
-#    ${OPENCASCADE_TKSTEP209_LIBRARY}
-#    ${OPENCASCADE_TKSTEPATTR_LIBRARY}
-#    ${OPENCASCADE_TKSTEPBASE_LIBRARY}
-#    ${OPENCASCADE_TKXSBASE_LIBRARY}
-#    ${OPENCASCADE_TKBO_LIBRARY}
-#    ${OPENCASCADE_TKBOOL_LIBRARY}
-#    ${OPENCASCADE_TKCAF_LIBRARY}
-#    ${OPENCASCADE_TKCDF_LIBRARY}
-#    ${OPENCASCADE_TKERNEL_LIBRARY}
-#    ${OPENCASCADE_TKFEAT_LIBRARY}
-#    ${OPENCASCADE_TKFILLET_LIBRARY}
-#    ${OPENCASCADE_TKG2D_LIBRARY}
-#    ${OPENCASCADE_TKGEOMALGO_LIBRARY}
-#    ${OPENCASCADE_TKGEOMBASE_LIBRARY}
-#    ${OPENCASCADE_TKHLR_LIBRARY}
-#    ${OPENCASCADE_TKMATH_LIBRARY}
-#    ${OPENCASCADE_TKOFFSET_LIBRARY}
-#    ${OPENCASCADE_TKPRIM_LIBRARY}
-#    ${OPENCASCADE_TKSERVICE_LIBRARY}
-#    ${OPENCASCADE_TKTOPALGO_LIBRARY}
-#    ${OPENCASCADE_TKMESH_LIBRARY}
-#    ${OPENCASCADE_TKV3D_LIBRARY}
-#    ${OPENCASCADE_TKXCAF_LIBRARY}
-    ${OPENCASCADE_TKXDEIGES_LIBRARY}
-#    ${OPENCASCADE_TKLCAF_LIBRARY}
+    ${OPENCASCADE_TKernel}
+    ${OPENCASCADE_TKMath}
+    ${OPENCASCADE_TKXCAF}
+    ${OPENCASCADE_TKXSBase}
+    ${OPENCASCADE_TKSTEPAttr}
+    ${OPENCASCADE_TKSTEPBase}
+    ${OPENCASCADE_TKSTEP209}
+    ${OPENCASCADE_TKSTEP}
+    ${OPENCASCADE_TKXDESTEP}
+    ${OPENCASCADE_TKIGES}
+    ${OPENCASCADE_TKXDEIGES}
 )

 SET(OPENCASCADE_FOUND "NO")


Removed unnecessary iOS version message

Removed unnecessary iOS version message

--- support/iOS.cmake
+++ support/iOS.cmake
@@ -148,10 +148,6 @@
 set(MIN_IOS_VERSION "${IOS_SDK_MAJOR_VERSION}.${IOS_SDK_MINOR_VERSION}"
     CACHE STRING "Minimum iOS version")

-
-
-message(STATUS "iOS: ${IOS_SDK_MAJOR_VERSION}.${IOS_SDK_MINOR_VERSION}")
-
 set(CMAKE_C_FLAGS "-isystem ${CMAKE_IOS_SDK_ROOT}/usr/include ${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_FLAGS "-isystem ${CMAKE_IOS_SDK_ROOT}/usr/include ${CMAKE_CXX_FLAGS}")
 set(LINKER_FLAGS "-L${CMAKE_IOS_SDK_ROOT}/usr/lib \


Append, rather than overwrite, FIXTURES_REQUIRED

--- tests.cmake
+++ tests.cmake
@@ -453,8 +453,7 @@
         "create ${run}.texe"
         PROPERTIES
             FIXTURES_SETUP "${run}.texe"
-            FIXTURES_REQUIRED "${run}.to"
-            FIXTURES_REQUIRED "${run}0.to"
+            FIXTURES_REQUIRED "${run}.to;${run}0.to"
     )

     check_std_outputs(NAME "run ${run}" COMMAND ${TENYR_SIMULATOR}  ARGS -p tsim.dump_end_state=1   INPUT "${run}.texe")


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 02)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   14)
+SET(KWSYS_DATE_STAMP_DAY   15)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 01)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   15)
+SET(KWSYS_DATE_STAMP_DAY   16)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 12)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   04)
+SET(KWSYS_DATE_STAMP_DAY   05)


daily version number

daily version number

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 11)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   12)
+SET(KWSYS_DATE_STAMP_DAY   13)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 02)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   03)
+SET(KWSYS_DATE_STAMP_DAY   04)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 05)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   03)
+SET(KWSYS_DATE_STAMP_DAY   04)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   06)
+SET(KWSYS_DATE_STAMP_DAY   07)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 09)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   18)
+SET(KWSYS_DATE_STAMP_DAY   19)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 02)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   19)
+SET(KWSYS_DATE_STAMP_DAY   20)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 06)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   19)
+SET(KWSYS_DATE_STAMP_DAY   20)


STYLE: Nightly Date Stamp

STYLE: Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 11)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   27)
+SET(KWSYS_DATE_STAMP_DAY   28)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Utilities/kwsys/kwsysDateStamp.cmake
+++ Utilities/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 07)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   01)
+SET(KWSYS_DATE_STAMP_DAY   02)


interpret file lists as lists instead of strings

--- CMake/mitkFunctionWhitelists.cmake
+++ CMake/mitkFunctionWhitelists.cmake
@@ -83,14 +83,14 @@

   file(GLOB internalWhitelistFiles "${${ARGV0}_WHITELISTS_INTERNAL_PATH}/*.cmake")

-  foreach(whitelistFile "${internalWhitelistFiles}")
+  foreach(whitelistFile ${internalWhitelistFiles})
     get_filename_component(whitelistFile "${whitelistFile}" NAME_WE)
     list(APPEND whitelists "${whitelistFile}")
   endforeach()

   file(GLOB externalWhitelistFiles "${${ARGV0}_WHITELISTS_EXTERNAL_PATH}/*.cmake")

-  foreach(whitelistFile "${externalWhitelistFiles}")
+  foreach(whitelistFile ${externalWhitelistFiles})
     get_filename_component(whitelistFile "${whitelistFile}" NAME_WE)
     list(APPEND whitelists "${whitelistFile} (external)")
   endforeach()


From Eric Wing,
"These enhancements make it much easier to control which libraries get
found by FIND_ using environmental variables. The problem with the old
script was that CMake searches what it considers system paths first.
This makes it difficult to override in the case where you might have a
stable version in /usr/local, but are trying to build a bleeding edge
release in the non-standard location /bleeding-edge.

I went to the CMake mailing list hoping to find a good solution to
this. Unfortunately, there isn't one, and I have to do something
rather bone-headed in the Find module. Basically, I have to run FIND_
twice: once with default search paths turned off and my environmental
variables listed, and again with standard search paths reenabled. At
least it works.

I also added a few more environmental variables, specifically:
OPENTHREADS_INCLUDE_DIR
OPENTHREADS_LIBRARY_DIR

These two variables address the shortcoming of OPENTHREADS_DIR in the
case where the include path and library path don't share a common
parent.

Put all this together, and you can setup an automated shell script or
Microsoft .bat file to configure and build your application in an
automated step.

You still should be able to use the key CMake variables like
CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH to find things, but it will
occur after the environmental paths are searched. The reason for this
is that the OPENTHREADS_INCLUDE_DIR and OPENTHREADS_LIBRARY_DIR are
more specific. This prevents the accidental ordering problem where you
might use CMAKE_INCLUDE_PATH to find some other component like GLUT,
but didn't want to accidentally include an older version of
OpenThreads located in the same area.

As the ultimate override, you can still pass -DVAR=value arguments to
cmake and it will take these above all else. However, it's safer for
people to not use these in case we modify the script and change the
variable names.

Finally, I'm wondering if we can kill the ${CMAKE_INSTALL_PREFIX}
searches in the Find module. As I've said before, this is kind of a
hack and the variable wasn't really intended to be used in this way.
And I just got bitten by it in some bad corner cases. The problem is
that if you don't explicitly set the ${CMAKE_INSTALL_PREFIX}, CMake
sets a default value for it (such as /usr/local). The problem is that
/usr/local may not be the place you want searched. If you wait to set
the ${CMAKE_INSTALL_PREFIX} in the ccmake GUI, then FIND_ is already
run once on ${CMAKE_INSTALL_PREFIX=/usr/local. If you were planning to
change the value in the GUI, it's too late if you had a stuff in
/usr/local because FIND_ already found something and won't change the
value when you reconfigure since it is already set. You will have to
manually change the value yourself. Furthermore, as another problem
example, on the Mac, /Library/Frameworks is supposed to be searched
before /usr/local, but ${CMAKE_INSTALL_PREFIX} kept causing stuff in
/usr/local to be hit first which took me a really long time to
understand how this was happenning. The work around is that I must
push the ${CMAKE_INSTALL_PREFIX} search to the very end as not to
conflict with anything else. But I think it would be much better if we
removed it entirely.

And with so many different environmental variables at our disposal, I
don't think we need this one:

(Checked by CMake automatically:)
CMAKE_INCLUDE_PATH
CMAKE_SYSTEM_INCLUDE_PATH
CMAKE_LIBRARY_PATH
CMAKE_SYSTEM_LIBRARY_PATH
PATH
LIB

(Checked by us:)
OPENTHREADS_INCLUDE_DIR
OPENTHREADS_LIBRARY_DIR
OPENTHREADS_DIR
OSG_INCLUDE_DIR
OSG_LIBRARY_DIR
OSG_DIR
"

git-svn-id: 23b6355f2bb369032457de4eb5f713ee134f73a8@6549 16af8721-9629-0410-8352-f15c8da7e697

--- CMakeModules/FindOpenThreads.cmake
+++ CMakeModules/FindOpenThreads.cmake
@@ -20,70 +20,125 @@
 # Header files are presumed to be included like
 # #include <OpenThreads/Thread>

-# Try the user's environment request before anything else.
+# To make it easier for one-step automated configuration/builds,
+# we leverage environmental paths. This is preferable
+# to the -DVAR=value switches because it insulates the
+# users from changes we may make in this script.
+# It also offers a little more flexibility than setting
+# the CMAKE_*_PATH since we can target specific components.
+# However, the default CMake behavior will search system paths
+# before anything else. This is problematic in the cases
+# where you have an older (stable) version installed, but
+# are trying to build a newer version.
+# CMake doesn't offer a nice way to globally control this behavior
+# so we have to do a nasty "double FIND_" in this module.
+# The first FIND disables the CMAKE_ search paths and only checks
+# the environmental paths.
+# If nothing is found, then the second find will search the
+# standard install paths.
+# Explicit -DVAR=value arguments should still be able to override everything.

 FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-  ${CMAKE_INSTALL_PREFIX}/include
+	$ENV{OPENTHREADS_INCLUDE_DIR}
 	$ENV{OPENTHREADS_DIR}/include
 	$ENV{OPENTHREADS_DIR}
+	$ENV{OSG_INCLUDE_DIR}
 	$ENV{OSG_DIR}/include
 	$ENV{OSG_DIR}
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local/include
-	/usr/include
-	/sw/include # Fink
-	/opt/local/include # DarwinPorts
-	/opt/csw/include # Blastwave
-	/opt/include
-	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+	NO_DEFAULT_PATH
 )
+
+IF(NOT OPENTHREADS_INCLUDE_DIR)
+	FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
+		~/Library/Frameworks
+		/Library/Frameworks
+		/usr/local/include
+		/usr/include
+		/sw/include # Fink
+		/opt/local/include # DarwinPorts
+		/opt/csw/include # Blastwave
+		/opt/include
+		[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+		${CMAKE_INSTALL_PREFIX}/include # hack: this should be last because it can interfere badly with other search paths in the case where you do not explicitly set this value and CMake invokes its default value which may not be what you want.
+	)
+ENDIF(NOT OPENTHREADS_INCLUDE_DIR)

 FIND_LIBRARY(OPENTHREADS_LIBRARY
-	NAMES OpenThreads  OpenThreadsWin32
+	NAMES OpenThreads OpenThreadsWin32
 	PATHS
-	${CMAKE_INSTALL_PREFIX}/lib
+	$ENV{OPENTHREADS_LIBRARY_DIR}
 	$ENV{OPENTHREADS_DIR}/lib64
 	$ENV{OPENTHREADS_DIR}/lib
 	$ENV{OPENTHREADS_DIR}
+	$ENV{OSG_LIBRARY_DIR}
 	$ENV{OSG_DIR}/lib64
 	$ENV{OSG_DIR}/lib
 	$ENV{OSG_DIR}
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local/lib64
-	/usr/local/lib
-	/usr/lib64
-	/usr/lib
-	/sw/lib
-	/opt/local/lib
-	/opt/csw/lib
-	/opt/lib
-	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+	NO_DEFAULT_PATH
 )
+
+IF(NOT OPENTHREADS_LIBRARY)
+	FIND_LIBRARY(OPENTHREADS_LIBRARY
+		NAMES OpenThreads OpenThreadsWin32
+		PATHS
+		~/Library/Frameworks
+		/Library/Frameworks
+		/usr/local/lib64
+		/usr/local/lib
+		/usr/lib64
+		/usr/lib
+		/sw/lib64
+		/sw/lib
+		/opt/local/lib64
+		/opt/local/lib
+		/opt/csw/lib64
+		/opt/csw/lib
+		/opt/lib64
+		/opt/lib
+		[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+		${CMAKE_INSTALL_PREFIX}/lib64 # hack: this should be last because it can interfere badly with other search paths in the case where you do not explicitly set this value and CMake invokes its default value which may not be what you want.
+		${CMAKE_INSTALL_PREFIX}/lib # hack
+	)
+ENDIF(NOT OPENTHREADS_LIBRARY)
+
+
 FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
-	NAMES  OpenThreadsd  OpenThreadsWin32d
+	NAMES OpenThreadsd OpenThreadsWin32d
 	PATHS
-	${CMAKE_INSTALL_PREFIX}/lib
+	$ENV{OPENTHREADS_LIBRARY_DIR}
 	$ENV{OPENTHREADS_DIR}/lib64
 	$ENV{OPENTHREADS_DIR}/lib
 	$ENV{OPENTHREADS_DIR}
+	$ENV{OSG_LIBRARY_DIR}
 	$ENV{OSG_DIR}/lib64
 	$ENV{OSG_DIR}/lib
 	$ENV{OSG_DIR}
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local/lib64
-	/usr/local/lib
-	/usr/lib64
-	/usr/lib
-	/sw/lib
-	/opt/local/lib
-	/opt/csw/lib
-	/opt/lib
-	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+	NO_DEFAULT_PATH
 )
+
+IF(NOT OPENTHREADS_LIBRARY_DEBUG)
+	FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
+		NAMES OpenThreadsd OpenThreadsWin32d
+		PATHS
+		/usr/local/lib64
+		/usr/local/lib
+		/usr/lib64
+		/usr/lib
+		/sw/lib64
+		/sw/lib
+		/opt/local/lib64
+		/opt/local/lib
+		/opt/csw/lib64
+		/opt/csw/lib
+		/opt/lib64
+		/opt/lib
+		[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+		${CMAKE_INSTALL_PREFIX}/lib64 # hack: this should be last because it can interfere badly with other search paths in the case where you do not explicitly set this value and CMake invokes its default value which may not be what you want.
+		${CMAKE_INSTALL_PREFIX}/lib # hack
+	)
+ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
+

 IF(OPENTHREADS_LIBRARY)
   IF(NOT OPENTHREADS_LIBRARY_DEBUG)


ippicv: update 20151201 (9.0.1)

ippicv: update 20151201 (9.0.1)

--- 3rdparty/ippicv/downloader.cmake
+++ 3rdparty/ippicv/downloader.cmake
@@ -7,24 +7,24 @@

 function(_icv_downloader)
   # Commit SHA in the opencv_3rdparty repo
-  set(IPPICV_BINARIES_COMMIT "3d41df448b589aa076d9d27ace344d3ef709e4b9")
+  set(IPPICV_BINARIES_COMMIT "81a676001ca8075ada498583e4166079e5744668")
   # Define actual ICV versions
   if(APPLE)
-    set(OPENCV_ICV_PACKAGE_NAME "ippicv_macosx_20141027.tgz")
-    set(OPENCV_ICV_PACKAGE_HASH "9662fe0694a67e59491a0dcc82fa26e0")
+    set(OPENCV_ICV_PACKAGE_NAME "ippicv_macosx_20151201.tgz")
+    set(OPENCV_ICV_PACKAGE_HASH "4ff1fde9a7cfdfe7250bfcd8334e0f2f")
     set(OPENCV_ICV_PLATFORM "macosx")
     set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_osx")
   elseif(UNIX)
     if(ANDROID AND NOT (ANDROID_ABI STREQUAL x86 OR ANDROID_ABI STREQUAL x86_64))
       return()
     endif()
-    set(OPENCV_ICV_PACKAGE_NAME "ippicv_linux_20141027.tgz")
-    set(OPENCV_ICV_PACKAGE_HASH "8b449a536a2157bcad08a2b9f266828b")
+    set(OPENCV_ICV_PACKAGE_NAME "ippicv_linux_20151201.tgz")
+    set(OPENCV_ICV_PACKAGE_HASH "808b791a6eac9ed78d32a7666804320e")
     set(OPENCV_ICV_PLATFORM "linux")
     set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_lnx")
   elseif(WIN32 AND NOT ARM)
-    set(OPENCV_ICV_PACKAGE_NAME "ippicv_windows_20141027.zip")
-    set(OPENCV_ICV_PACKAGE_HASH "b59f865d1ba16e8c84124e19d78eec57")
+    set(OPENCV_ICV_PACKAGE_NAME "ippicv_windows_20151201.zip")
+    set(OPENCV_ICV_PACKAGE_HASH "04e81ce5d0e329c3fbc606ae32cad44d")
     set(OPENCV_ICV_PLATFORM "windows")
     set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_win")
   else()


ENH (#16): include functionality libs in linux installation

--- CMake/FunctionalityHelpers.cmake
+++ CMake/FunctionalityHelpers.cmake
@@ -83,8 +83,10 @@
   IF(PROJECT_NAME STREQUAL MITK)
     IF(WIN32 AND MITK_BUILD_SHARED_CORE)
       SET(FUNCTIONALITY_EXPORT "__declspec(dllexport)")
+    ENDIF(WIN32 AND MITK_BUILD_SHARED_CORE)
+    IF(MITK_BUILD_SHARED_CORE)
       SET(FUNCTIONALITY_LIB_TYPE "SHARED")
-    ENDIF(WIN32 AND MITK_BUILD_SHARED_CORE)
+    ENDIF(MITK_BUILD_SHARED_CORE)
   ENDIF(PROJECT_NAME STREQUAL MITK)

   CONFIGURE_FILE("${REGISTER_QFUNCTIONALITY_CPP_IN}" "${CMAKE_CURRENT_BINARY_DIR}/Register${FUNC_NAME}.cpp" @ONLY)


cpack settings

cpack settings

--HG--
branch : PlannerData

--- CMakeModules/CPackSettings.cmake
+++ CMakeModules/CPackSettings.cmake
@@ -9,13 +9,13 @@

 set(CPACK_SOURCE_IGNORE_FILES
     "/.hg"
-    "/.svn/"
     "/build/"
     ".pyc$"
     ".pyo$"
     "__pycache__"
     ".so$"
     ".dylib$"
+    ".orig$"
     ".DS_Store"
     ".tm_properties"
     "mkwebdocs.sh"


Fixed to work with system crossguid library.

--- CMakeModules/FindCROSSGUID.cmake
+++ CMakeModules/FindCROSSGUID.cmake
@@ -22,19 +22,69 @@
         /usr/${CMAKE_INSTALL_LIBDIR}/cmake
   )

-set(CROSSGUID_FOUND ${crossguid_FOUND})
+if (NOT CROSSGUID_FOUND)
+  # Fallback if no CONFIG is found

-get_target_property(CROSSGUID_INCLUDE_DIR crossguid INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(CROSSGUID_LIBRARY crossguid IMPORTED_LOCATION_RELEASE)
-if (NOT CROSSGUID_LIBRARY)
-get_target_property(CROSSGUID_LIBRARY crossguid IMPORTED_LOCATION_DEBUG)
+  find_path(CROSSGUID_INCLUDE_DIR crossguid/guid.hpp
+    PATHS $ENV{CROSSGUID_DIR}/include
+          $ENV{CROSSGUID_DIR}
+          ${COPASI_DEPENDENCY_DIR}/include
+          ${COPASI_DEPENDENCY_DIR}
+          ~/Library/Frameworks
+          /Library/Frameworks
+          /sw/include        # Fink
+          /opt/local/include # MacPorts
+          /opt/csw/include   # Blastwave
+          /opt/include
+          /usr/freeware/include
+    NO_DEFAULT_PATH)
+
+  if (NOT CROSSGUID_INCLUDE_DIR)
+    find_path(CROSSGUID_INCLUDE_DIR crossguid/guid.hpp)
+  endif (NOT CROSSGUID_INCLUDE_DIR)
+
+  find_library(CROSSGUID_LIBRARY
+    NAMES crossguid
+    PATHS $ENV{CROSSGUID_DIR}/lib
+          $ENV{CROSSGUID_DIR}
+          ${COPASI_DEPENDENCY_DIR}/lib
+          ${COPASI_DEPENDENCY_DIR}
+          ~/Library/Frameworks
+          /Library/Frameworks
+          /sw/lib         Fink
+          /opt/local/lib  MacPorts
+          /opt/csw/lib    Blastwave
+          /opt/lib
+          /usr/freeware/lib64
+    NO_DEFAULT_PATH)
+
+  if (NOT CROSSGUID_LIBRARY)
+    find_library(CROSSGUID_LIBRARY
+        NAMES ${CROSSGUID_LIBRARY_NAME})
+  endif (NOT CROSSGUID_LIBRARY)
+
+  if (CROSSGUID_LIBRARY AND UNIX AND NOT APPLE)
+    set(CROSSGUID_LIBRARY ${CROSSGUID_LIBRARY} -luuid)
+  endif ()
+
+  set(CROSSGUID_FOUND ${CROSSGUID_LIBRARY})
+else ()
+  set(CROSSGUID_FOUND ${crossguid_FOUND})
+
+  get_target_property(CROSSGUID_INCLUDE_DIR crossguid INTERFACE_INCLUDE_DIRECTORIES)
+  get_target_property(CROSSGUID_LIBRARY crossguid IMPORTED_LOCATION_RELEASE)
+
+  if (NOT CROSSGUID_LIBRARY)
+    get_target_property(CROSSGUID_LIBRARY crossguid IMPORTED_LOCATION_DEBUG)
+  endif()
+
+  get_target_property(CROSSGUID_INTERFACE_LINK_LIBRARIES crossguid INTERFACE_LINK_LIBRARIES)
+
+  if (CROSSGUID_INTERFACE_LINK_LIBRARIES)
+    set(CROSSGUID_LIBRARY ${CROSSGUID_LIBRARY} ${CROSSGUID_INTERFACE_LINK_LIBRARIES})
+  endif (CROSSGUID_INTERFACE_LINK_LIBRARIES)
 endif()

-get_target_property(CROSSGUID_INTERFACE_LINK_LIBRARIES crossguid INTERFACE_LINK_LIBRARIES)
-
-if (CROSSGUID_INTERFACE_LINK_LIBRARIES)
-  set(CROSSGUID_LIBRARY ${CROSSGUID_LIBRARY} ${CROSSGUID_INTERFACE_LINK_LIBRARIES})
-endif (CROSSGUID_INTERFACE_LINK_LIBRARIES)

 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(CROSSGUID REQUIRED CROSSGUID_INCLUDE_DIR CROSSGUID_LIBRARY)


Backing out r73 for the CMake install file, as this broke the install, causing only examples to be installed, but no headers, libraries, or shared objects (DLLs).

git-svn-id: 437764123c2e69732731433a8073bc2f24523c07@80 574e1c32-2fce-11df-82ed-5f3c927ac887

--- CMakeModules/ModuleInstall.cmake
+++ CMakeModules/ModuleInstall.cmake
@@ -1,32 +1,55 @@
-# INSTALL commands, borrowed from OSG's ModuleInstall, for executables
+# Borrowed from OSG...

 # Required Vars:
-# ${TARGET_TARGETNAME}
-# ${COMPONENT_NAME}
+# ${LIB_NAME}
+# ${LIB_PUBLIC_HEADERS}

+SET(INSTALL_INCDIR include)
+SET(INSTALL_BINDIR bin)
 IF(WIN32)
-	SET(INSTALL_INCDIR Include)
-	SET(INSTALL_BINDIR Bin)
-    SET(INSTALL_LIBDIR Bin)
-    SET(INSTALL_ARCHIVEDIR Lib)
+    SET(INSTALL_LIBDIR bin)
+    SET(INSTALL_ARCHIVEDIR lib)
 ELSE(WIN32)
-	SET(INSTALL_INCDIR include)
-	SET(INSTALL_BINDIR bin)
     SET(INSTALL_LIBDIR lib${LIB_POSTFIX})
     SET(INSTALL_ARCHIVEDIR lib${LIB_POSTFIX})
 ENDIF(WIN32)

+SET(HEADERS_GROUP "Header Files")
+
+SOURCE_GROUP(
+    ${HEADERS_GROUP}
+    FILES ${LIB_PUBLIC_HEADERS}
+)

 INSTALL(
-    TARGETS ${TARGET_TARGETNAME}
-    RUNTIME DESTINATION "${INSTALL_BINDIR}" COMPONENT ${COMPONENT_NAME}
-    #LIBRARY DESTINATION "${INSTALL_LIBDIR}" COMPONENT libpvle
-    #ARCHIVE DESTINATION "${INSTALL_ARCHIVEDIR}" COMPONENT libpvle-dev
+    TARGETS ${LIB_NAME}
+    RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libosgaudio
+    LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT libosgaudio
+    ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libosgaudio-dev
 )

-# # FIXME: Do not run for OS X framework
-# INSTALL(
-    # FILES ${LIB_PUBLIC_HEADERS}
-    # DESTINATION "${INSTALL_INCDIR}/${LIB_NAME}"
-    # COMPONENT libpvle-dev
-# )
+# FIXME: Do not run for OS X framework
+INSTALL(
+    FILES       ${LIB_PUBLIC_HEADERS}
+    DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}
+    COMPONENT libosgaudio-dev
+)
+
+# install backend headers to their subfolder
+# FMOD
+IF(0_ENABLE_SUBSYSTEM_FMOD)
+INSTALL(
+    FILES       ${LIB_PUBLIC_HEADERS_SUBSYSTEM}
+    DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}/BackendFMOD
+    COMPONENT libosgaudio-dev
+)
+ENDIF(0_ENABLE_SUBSYSTEM_FMOD)
+
+# OpenAL++
+IF(0_ENABLE_SUBSYSTEM_OPENAL)
+INSTALL(
+    FILES       ${LIB_PUBLIC_HEADERS_SUBSYSTEM}
+    DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}/BackendOpenALpp
+    COMPONENT libosgaudio-dev
+)
+ENDIF(0_ENABLE_SUBSYSTEM_OPENAL)


superbuild: Change GLM dependecy URL from master to GLM 0.9.9.8

--- scripts/superbuild/dependencies/dep_glm.cmake
+++ scripts/superbuild/dependencies/dep_glm.cmake
@@ -1,4 +1,4 @@
-## Copyright 2020 Intel Corporation
+## Copyright 2020-2021 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0

 set(COMPONENT_NAME glm)
@@ -14,7 +14,7 @@
   STAMP_DIR ${COMPONENT_NAME}/stamp
   SOURCE_DIR ${COMPONENT_NAME}/src
   BINARY_DIR ${COMPONENT_NAME}
-  URL "https://github.com/g-truc/glm/archive/master.zip"
+  URL "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip"
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND "${CMAKE_COMMAND}" -E copy_directory


Add support for test feature constraints

git-svn-id: 59f82343654cec32357d3b049d399063e4e4cfc7@30614 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/macros/macro_deal_ii_pickup_tests.cmake
+++ deal.II/cmake/macros/macro_deal_ii_pickup_tests.cmake
@@ -31,10 +31,36 @@

   FOREACH(_test ${_tests})

+    #
+    # Respect TEST_PICKUP_REGEX: Make sure we are allowed to pickup this
+    # test:
+    #
     IF( "${TEST_PICKUP_REGEX}" STREQUAL "" OR
         _test MATCHES "${TEST_PICKUP_REGEX}" )
       GET_FILENAME_COMPONENT(_test ${_test} NAME)
+      SET(_define_test TRUE)
+    ELSE()
+      SET(_define_test FALSE)
+    ENDIF()

+    #
+    # Query configuration and check whether we support it. Otherwise do
+    # not define test:
+    #
+    STRING(REGEX MATCHALL "WITH_([0-9]|[A-Z]|_)*=(ON|OFF)" _matches ${_test})
+    FOREACH(_match ${_matches})
+      STRING(REGEX REPLACE "^(WITH_([0-9]|[A-Z]|_)*)=(ON|OFF)$" "\\1"
+        _feature ${_match}
+        )
+      STRING(REGEX MATCH "(ON|OFF)$" _boolean ${_match})
+
+      IF( (DEAL_II_${_feature} AND NOT ${_boolean}) OR
+          (NOT DEAL_II_${_feature} AND ${_boolean}) )
+        SET(_define_test FALSE)
+      ENDIF()
+    ENDFOREACH()
+
+    IF(_define_test)
       #
       # TODO: mpirun support
       #


Why is this all so ugly? Bugfix: Only add a target library if there is
one...

git-svn-id: fbbf69ba8011aca0e74e1c67904b11cccbdbe66b@26765 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/macros/macro_deal_ii_setup_target.cmake
+++ deal.II/cmake/macros/macro_deal_ii_setup_target.cmake
@@ -30,16 +30,28 @@
       "${DEAL_II_USER_DEFINITIONS_RELEASE}"
     )

-  TARGET_LINK_LIBRARIES(${target}
-    debug
-      ${DEAL_II_LIBRARIES_DEBUG}
-      ${DEAL_II_EXTERNAL_LIBRARIES_DEBUG}
-    optimized
-      ${DEAL_II_LIBRARIES_RELEASE}
-      ${DEAL_II_EXTERNAL_LIBRARIES_RELEASE}
-    general
-      ${DEAL_II_EXTERNAL_LIBRARIES}
-    )
+  IF(NOT "${DEAL_II_LIBRARIES_DEBUG}${DEAL_II_EXTERNAL_LIBRARIES_DEBUG}" STREQUAL "")
+    TARGET_LINK_LIBRARIES(${target}
+      debug
+        ${DEAL_II_LIBRARIES_DEBUG}
+        ${DEAL_II_EXTERNAL_LIBRARIES_DEBUG}
+      )
+  ENDIF()
+
+  IF(NOT "${DEAL_II_LIBRARIES_RELEASE}${DEAL_II_EXTERNAL_LIBRARIES_RELEASE}" STREQUAL "")
+    TARGET_LINK_LIBRARIES(${target}
+      optimized
+        ${DEAL_II_LIBRARIES_RELEASE}
+        ${DEAL_II_EXTERNAL_LIBRARIES_RELEASE}
+      )
+  ENDIF()
+
+  IF(NOT "${DEAL_II_EXTERNAL_LIBRARIES}" STREQUAL "")
+    TARGET_LINK_LIBRARIES(${target}
+      general
+        ${DEAL_II_EXTERNAL_LIBRARIES}
+      )
+  ENDIF()

 ENDMACRO()


ENT-3298 Disable aligned allocation on new iOS toolchain C++17 feature needs iOS10 but the base target is below that, so disable

--- ios-13-0-dep-9-3-armv7-arm64-cxx17-bitcode-hide.cmake
+++ ios-13-0-dep-9-3-armv7-arm64-cxx17-bitcode-hide.cmake
@@ -41,5 +41,5 @@
 include("${CMAKE_CURRENT_LIST_DIR}/os/iphone.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx17.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/flags/bitcode.cmake") # after os/iphone.cmake
-
+include("${CMAKE_CURRENT_LIST_DIR}/flags/fno-aligned-allocation.cmake") # aligned allocation needs iOS >= 11.0
 include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_ios_development_team.cmake")


RemoteModule: Update GIT_TAG for Mosaic module

--- Modules/Remote/Mosaic.remote.cmake
+++ Modules/Remote/Mosaic.remote.cmake
@@ -5,5 +5,5 @@
 https://github.com/remicres/otb-mosaic
 "
   GIT_REPOSITORY https://github.com/remicres/otb-mosaic.git
-  GIT_TAG 5b180a274b731bfd366f731cb829797e6d1ec756
+  GIT_TAG 80637f8ede41f99b6ba147c9a5eef2346e5ae7f0
 )


ENH: Update SCIFIO to latest version on 08/23/2016

https://github.com/scifio/scifio-imageio/compare/f0741bc69d2031a7fa7682ab5e990a6c126e2b72...d6ce39d855d5078589efed93f785c7289769c3c6
Change-Id: Ib73afbb481ab65e683209598f3d561b3a09ada29

--- Modules/Remote/SCIFIO.remote.cmake
+++ Modules/Remote/SCIFIO.remote.cmake
@@ -1,5 +1,5 @@
 itk_fetch_module(SCIFIO
   "SCIFIO (Bioformats) ImageIO plugin for ITK"
   GIT_REPOSITORY ${git_protocol}://github.com/scifio/scifio-imageio.git
-  GIT_TAG f0741bc69d2031a7fa7682ab5e990a6c126e2b72
+  GIT_TAG d6ce39d855d5078589efed93f785c7289769c3c6
   )


CMake function `visionaray_add_cuda_executable`

--- cmake/modules/VisionarayAddTarget.cmake
+++ cmake/modules/VisionarayAddTarget.cmake
@@ -38,6 +38,19 @@
     endif()
 endfunction()

+function(visionaray_add_cuda_executable name)
+    if(NOT CUDA_FOUND OR NOT VSNRAY_ENABLE_CUDA)
+        return()
+    endif()
+
+    cuda_add_executable(${name} ${ARGN})
+    target_link_libraries(${name} ${__VSNRAY_LINK_LIBRARIES})
+
+    if(VSNRAY_MACOSX_BUNDLE)
+        set_target_properties(${name} PROPERTIES MACOSX_BUNDLE TRUE)
+    endif()
+endfunction()
+
 function(visionaray_add_library name)
     add_library(${name} ${ARGN})
     target_link_libraries(${name} ${__VSNRAY_LINK_LIBRARIES})


BUG: Fix linking SmoothingRecursiveYvvGaussianFilter with install tree.

This creates the missing library when ITK_USE_GPU is ON.

Change-Id: I092f3b111bd02c2d03fed3a15583ba35a6d3a9a4

--- Modules/Remote/SmoothingRecursiveYvvGaussianFilter.remote.cmake
+++ Modules/Remote/SmoothingRecursiveYvvGaussianFilter.remote.cmake
@@ -2,5 +2,5 @@
 itk_fetch_module(SmoothingRecursiveYvvGaussianFilter
   "GPU and CPU Young & Van Vliet Recursive Gaussian Smoothing Filter: http://hdl.handle.net/10380/3425"
   GIT_REPOSITORY https://github.com/Inria-Asclepios/SmoothingRecursiveYvvGaussianFilter
-  GIT_TAG b3b6cab4848b4ad88b31384ada303ea2eeb663e4
+  GIT_TAG 69a6d9569c3a160872ba579f96db789df2ef07e6
   )


added prefix in files.cmake

added prefix in files.cmake

--- Modules/Segmentation/files.cmake
+++ Modules/Segmentation/files.cmake
@@ -17,8 +17,8 @@
 Algorithms/mitkShowSegmentationAsSmoothedSurface.cpp
 Algorithms/mitkShowSegmentationAsSurface.cpp
 Algorithms/mitkVtkImageOverwrite.cpp
-Algorithms/DiffSliceOperation.cpp
-Algorithms/DiffSliceOperationApplier.cpp
+Algorithms/mitkDiffSliceOperation.cpp
+Algorithms/mitkDiffSliceOperationApplier.cpp
 Controllers/mitkSegmentationInterpolationController.cpp
 Controllers/mitkSurfaceInterpolationController.cpp
 # DataManagement/mitkApplyDiffImageOperation.cpp


Switch to ParaView master branch now

Switch to ParaView master branch now

--- versions.cmake
+++ versions.cmake
@@ -24,7 +24,7 @@

 add_revision(paraview
   GIT_REPOSITORY git://paraview.org/stage/ParaView.git
-  GIT_TAG lookup_table_cleanup)
+  GIT_TAG master)

 add_revision(matviz
   GIT_REPOSITORY https://github.com/cryos/matviz


OSX: set OPENIMAGEIO_ROOT_DIR in specialized Config_OSX.cmake

--- cmake/SpecializedConfig/Config_OSX.cmake
+++ cmake/SpecializedConfig/Config_OSX.cmake
@@ -11,11 +11,7 @@
 MESSAGE(STATUS "OSX_DEPENDENCY_ROOT_PATH : " ${OSX_DEPENDENCY_ROOT})
 set(OSX_SEARCH_PATH     ${OSX_DEPENDENCY_ROOT})

-set(FREEIMAGE_SEARCH_PATH "${OSX_SEARCH_PATH}")
-set(FreeImage_INC_SEARCH_PATH "${FREEIMAGE_SEARCH_PATH}/include")
-set(FreeImage_LIB_SEARCH_PATH "${FREEIMAGE_SEARCH_PATH}/lib")
-set(FREEIMAGE_INCLUDE_PATH "${FREEIMAGE_SEARCH_PATH}/include")
-set(FREEIMAGE_LIBRARY "${FREEIMAGE_SEARCH_PATH}/lib")
+set(OPENIMAGEIO_ROOT_DIR "${OSX_SEARCH_PATH}")

 set(BOOST_SEARCH_PATH         "${OSX_SEARCH_PATH}")
 set(BOOST_LIBRARYDIR          "${BOOST_SEARCH_PATH}/lib")


cmake: toolchain: fix unsupported warnings for C++ builds

Compile with arm-none-eabi-g++ (10.2.0 with -std=c++17) generates a
warning for every C++ source file:
"cc1plus: warning: command-line option '-Wno-pointer-sign' is valid for
C/ObjC but not for C++"

Get rid of those warnings by adding '-Wno-pointer-sign' to the list of
excluded CXX options.

Signed-off-by: Rihards Skuja <1819024bdc2021a832d60718e84459288c84ce50@mikrotik.com>

--- cmake/compiler/gcc/target_warnings.cmake
+++ cmake/compiler/gcc/target_warnings.cmake
@@ -125,4 +125,5 @@
 list(APPEND CXX_EXCLUDED_OPTIONS
   -Werror=implicit-int
   -Wold-style-definition
+  -Wno-pointer-sign
   )


px4fmu-v5_rtps fix config type (v4 -> v5)

--- cmake/configs/nuttx_px4fmu-v5_rtps.cmake
+++ cmake/configs/nuttx_px4fmu-v5_rtps.cmake
@@ -1,5 +1,5 @@
-include(configs/nuttx_px4fmu-v4_default)
+include(configs/nuttx_px4fmu-v5_default)

 list(APPEND config_module_list
 	modules/micrortps_bridge
-)+)


Remove module hunter_gate_settings

Remove module hunter_gate_settings

--- cmake/modules/hunter_gate_settings.cmake
+++ cmake/modules/hunter_gate_settings.cmake
@@ -1,30 +0,0 @@
-# Copyright (c) 2015, Ruslan Baratov
-# All rights reserved.
-
-include(hunter_internal_error)
-
-function(hunter_gate_settings varname)
-  set(settings "")
-  foreach(
-      hunter_var
-      HUNTER_CACHED_ROOT
-      HUNTER_SHA1
-      HUNTER_CONFIG_SHA1
-      HUNTER_VERSION
-      HUNTER_TOOLCHAIN_SHA1
-      HUNTER_STATUS_DEBUG
-      HUNTER_JOBS_NUMBER
-  )
-    list(APPEND settings "-D${hunter_var}=${${hunter_var}}")
-  endforeach()
-
-  if(NOT HUNTER_GATE_DONE)
-    get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET)
-    if(NOT _hunter_gate_done)
-      hunter_internal_error("HUNTER_GATE_DONE is OFF")
-    endif()
-  endif()
-
-  list(APPEND settings "-DHUNTER_GATE_DONE=YES")
-  set("${varname}" "${settings}" PARENT_SCOPE)
-endfunction()


Add OpenCV-Extra 4.0.0

Add OpenCV-Extra 4.0.0

--- cmake/projects/OpenCV-Extra/hunter.cmake
+++ cmake/projects/OpenCV-Extra/hunter.cmake
@@ -6,6 +6,17 @@
 include(hunter_add_version)
 include(hunter_download)
 include(hunter_pick_scheme)
+
+hunter_add_version(
+    PACKAGE_NAME
+    OpenCV-Extra
+    VERSION
+    "4.0.0"
+    URL
+    "https://github.com/opencv/opencv_contrib/archive/4.0.0.tar.gz"
+    SHA1
+    4c10c8cb288a320b47ec7e87a0fdcf5a8df0f49d
+)

 hunter_add_version(
     PACKAGE_NAME


BUG: FindPythonQt - Do not look for "util" library on apple platform

--- Utilities/CMake/FindPythonQt.cmake
+++ Utilities/CMake/FindPythonQt.cmake
@@ -18,7 +18,7 @@
 MARK_AS_ADVANCED(PYTHONQT_LIBRARY)

 # On linux, also find libutil
-IF(NOT WIN32)
+IF(UNIX AND NOT APPLE)
   FIND_LIBRARY(PYTHONQT_LIBUTIL util)
   MARK_AS_ADVANCED(PYTHONQT_LIBUTIL)
 ENDIF()


Revert "Add new swiftSyntax to LLDBDependencies.cmake"

The commits creating this library are temporarily deleted
in Swift.

This reverts commit 513630b6677e67183a9329c759f9dc404de2f203.

This revert depends on https://github.com/apple/swift/pull/5864,
which is now in the tree.

--- cmake/LLDBDependencies.cmake
+++ cmake/LLDBDependencies.cmake
@@ -180,7 +180,6 @@
     swiftSILOptimizer
     swiftASTSectionImporter
     swiftRemoteAST
-    swiftSyntax
     )
 endif()


* #216

* #216

--- cmake/Modules/AddIOWOW.cmake
+++ cmake/Modules/AddIOWOW.cmake
@@ -39,14 +39,14 @@
   LOG_CONFIGURE OFF
   LOG_INSTALL OFF
   CMAKE_ARGS ${CMAKE_ARGS}
-  BUILD_BYPRODUCTS "${CMAKE_BINARY_DIR}/lib/libiowow-1.a"
+  BUILD_BYPRODUCTS "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libiowow-1.a"
 )

 add_library(iowow_s STATIC IMPORTED GLOBAL)
 set_target_properties(
    iowow_s
    PROPERTIES
-   IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/lib/libiowow-1.a"
+   IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libiowow-1.a"
 )
 add_dependencies(iowow_s extern_iowow)


Missed commit of Packages.cmake in last commit

--- cmake/Modules/Packages.cmake
+++ cmake/Modules/Packages.cmake
@@ -230,7 +230,7 @@
     foreach(_DEF ${SSE_DEFINITIONS})
         add_definitions(-D${_DEF})
     endforeach()
-    unset(SEE_DEFINITIONS)
+    unset(SSE_DEFINITIONS)

 else()
     foreach(type SSE2 SSE3 SSSE3 SSE4_1 AVX AVX2)


added check for CMake 2.8.3 for CUDA support

--- cmake/OpenCVDetectCUDA.cmake
+++ cmake/OpenCVDetectCUDA.cmake
@@ -1,3 +1,8 @@
+if(${CMAKE_VERSION} VERSION_LESS "2.8.3")
+  message(STATUS WITH_CUDA flag requires CMake 2.8.3. CUDA support is disabled.)
+  return()
+endif()
+
 find_package(CUDA 4.1)

 if(CUDA_FOUND)


Update libprotobuf-lite.cmake

Update libprotobuf-lite.cmake

link log library on Android

--- cmake/libprotobuf-lite.cmake
+++ cmake/libprotobuf-lite.cmake
@@ -68,6 +68,9 @@
 if(protobuf_LINK_LIBATOMIC)
   target_link_libraries(libprotobuf-lite atomic)
 endif()
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
+	target_link_libraries(libprotobuf-lite log)
+endif()
 target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src)
 if(MSVC AND protobuf_BUILD_SHARED_LIBS)
   target_compile_definitions(libprotobuf-lite


Add `-Wimplicit-fallthrough` to Clang warnings

Clang doesn't enable this warning by default neither in `-Wall` nor `-Wextra`.

--- cmake/CompilerWarnings.cmake
+++ cmake/CompilerWarnings.cmake
@@ -47,6 +47,7 @@
       -Wnull-dereference # warn if a null dereference is detected
       -Wdouble-promotion # warn if float is implicit promoted to double
       -Wformat=2 # warn on security issues around functions that format output (ie printf)
+      -Wimplicit-fallthrough # warn on statements that fallthrough without an explicit annotation
   )

   if(WARNINGS_AS_ERRORS)


[cmake] Add the SDK directory after the toolchain directory when compiling host swift code.

This ensures that we pick up libraries from the toolchain before picking up
libraries from the SDK we are using. Normally it would not matter the order that
we add these -L files since the contents of the SDK and toolchain are
disjoint. Once we begin performing stage2 swift builds though, we no longer have
this property since we pass in the stage1's installed libraries as the SDK
directory and we have not split the two sets of libraries yet. The end result is
that if we have the -L in the previous order, we will pick up just built
compatibility libraries before we pick up the actual compatibility libraries
from the actual toolchain we are using to compile. This results in compilation
breakage.

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -600,13 +600,22 @@
     # find all of the necessary swift libraries on Darwin.
     if (NOT ASHL_PURE_SWIFT)
       if (CMAKE_Swift_COMPILER)
-        # Add in the SDK directory for the host platform and add an rpath.
-        target_link_directories(${name} PRIVATE
-          ${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}/usr/lib/swift)
         # Add in the toolchain directory so we can grab compatibility libraries
         get_filename_component(TOOLCHAIN_BIN_DIR ${CMAKE_Swift_COMPILER} DIRECTORY)
         get_filename_component(TOOLCHAIN_LIB_DIR "${TOOLCHAIN_BIN_DIR}/../lib/swift/macosx" ABSOLUTE)
         target_link_directories(${name} PUBLIC ${TOOLCHAIN_LIB_DIR})
+
+        # Add in the SDK directory for the host platform.
+        #
+        # NOTE: We do this /after/ target_link_directorying TOOLCHAIN_LIB_DIR to
+        # ensure that we first find libraries from the toolchain, rather than
+        # from the SDK. The reason why this is important is that when we perform
+        # a stage2 build, this path is into the stage1 build. This is not a pure
+        # SDK and also contains compatibility libraries. We need to make sure
+        # that the compiler sees the actual toolchain's compatibility libraries
+        # first before the just built compability libraries or build errors occur.
+        target_link_directories(${name} PRIVATE
+          ${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}/usr/lib/swift)
       endif()
     endif()

@@ -808,13 +817,22 @@
     # host side tools but link with clang, add the appropriate -L paths so we
     # find all of the necessary swift libraries on Darwin.
     if (CMAKE_Swift_COMPILER)
-      # Add in the SDK directory for the host platform and add an rpath.
-      target_link_directories(${executable} PRIVATE
-        ${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}/usr/lib/swift)
       # Add in the toolchain directory so we can grab compatibility libraries
       get_filename_component(TOOLCHAIN_BIN_DIR ${CMAKE_Swift_COMPILER} DIRECTORY)
       get_filename_component(TOOLCHAIN_LIB_DIR "${TOOLCHAIN_BIN_DIR}/../lib/swift/macosx" ABSOLUTE)
       target_link_directories(${executable} PUBLIC ${TOOLCHAIN_LIB_DIR})
+
+      # Add in the SDK directory for the host platform and add an rpath.
+      #
+      # NOTE: We do this /after/ target_link_directorying TOOLCHAIN_LIB_DIR to
+      # ensure that we first find libraries from the toolchain, rather than from
+      # the SDK. The reason why this is important is that when we perform a
+      # stage2 build, this path is into the stage1 build. This is not a pure SDK
+      # and also contains compatibility libraries. We need to make sure that the
+      # compiler sees the actual toolchain's compatibility libraries first
+      # before the just built compability libraries or build errors occur.
+      target_link_directories(${executable} PRIVATE
+        ${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}/usr/lib/swift)

       if (ASHT_HAS_LIBSWIFT AND SWIFT_TOOLS_ENABLE_LIBSWIFT)
         # Workaround to make lldb happy: we have to explicitly add all libswift modules


build: prevent accidental addition of LINK_LIBRARIES

Protect against LINK_LIBRARIES, directing the developer to
target_link_libraries.  This has no impact on the build currently.

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -1354,7 +1354,6 @@
 #     [SHARED]
 #     [STATIC]
 #     [DEPENDS dep1 ...]
-#     [LINK_LIBRARIES dep1 ...]
 #     [INTERFACE_LINK_LIBRARIES dep1 ...]
 #     [SWIFT_MODULE_DEPENDS dep1 ...]
 #     [LLVM_COMPONENT_DEPENDS comp1 ...]
@@ -1376,9 +1375,6 @@
 #
 # DEPENDS
 #   Targets that this library depends on.
-#
-# LINK_LIBRARIES
-#   Libraries this library depends on.
 #
 # LLVM_COMPONENT_DEPENDS
 #   LLVM components this library depends on.
@@ -1419,6 +1415,10 @@
                         ${ARGN})
   set(ASHL_SOURCES ${ASHL_UNPARSED_ARGUMENTS})

+  if(ASHL_LINK_LIBRARIES)
+    message(SEND_ERROR "library ${name} is using LINK_LIBRARIES parameter which is deprecated.  Please use target_link_libraries instead")
+  endif()
+
   translate_flags(ASHL "${options}")

   if(NOT ASHL_SHARED AND NOT ASHL_STATIC)
@@ -1435,7 +1435,6 @@
     SDK ${SWIFT_HOST_VARIANT_SDK}
     ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
     DEPENDS ${ASHL_DEPENDS}
-    LINK_LIBRARIES ${ASHL_LINK_LIBRARIES}
     LLVM_COMPONENT_DEPENDS ${ASHL_LLVM_COMPONENT_DEPENDS}
     FILE_DEPENDS ${ASHL_FILE_DEPENDS}
     C_COMPILE_FLAGS ${ASHL_C_COMPILE_FLAGS}
@@ -2249,13 +2248,17 @@
 function(add_swift_host_tool executable)
   set(options)
   set(single_parameter_options SWIFT_COMPONENT)
-  set(multiple_parameter_options)
+  set(multiple_parameter_options LINK_LIBRARIES)

   cmake_parse_arguments(ASHT
     "${options}"
     "${single_parameter_options}"
     "${multiple_parameter_options}"
     ${ARGN})
+
+  if(ASHT_LINK_LIBRARIES)
+    message(SEND_ERROR "${executable} is using LINK_LIBRARIES parameter which is deprecated.  Please use target_link_libraries instead")
+  endif()

   precondition(ASHT_SWIFT_COMPONENT
                MESSAGE "Swift Component is required to add a host tool")


[CMake] Functionalize tblgen().

[CMake] Functionalize tblgen().

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

--- cmake/modules/TableGen.cmake
+++ cmake/modules/TableGen.cmake
@@ -2,7 +2,7 @@
 # Extra parameters for `tblgen' may come after `ofn' parameter.
 # Adds the name of the generated file to TABLEGEN_OUTPUT.

-macro(tablegen project ofn)
+function(tablegen project ofn)
   file(GLOB local_tds "*.td")
   file(GLOB_RECURSE global_tds "${LLVM_MAIN_INCLUDE_DIR}/llvm/*.td")

@@ -40,10 +40,10 @@
   set_property(DIRECTORY APPEND
     PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${ofn}.tmp ${ofn})

-  set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${ofn})
+  set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${ofn} PARENT_SCOPE)
   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${ofn}
     PROPERTIES GENERATED 1)
-endmacro(tablegen)
+endfunction(tablegen)

 macro(add_public_tablegen_target target)
   # Creates a target for publicly exporting tablegen dependencies.


cmake: fix PCH generation

cmake: fix PCH generation

process defines from INTERFACE targets

--- cmake/OpenCVPCHSupport.cmake
+++ cmake/OpenCVPCHSupport.cmake
@@ -43,18 +43,9 @@
             LIST(APPEND ${_out_compile_flags} "-fPIC")
         ENDIF()

-        GET_PROPERTY(_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
-        if(_definitions)
-          foreach(_def ${_definitions})
-            LIST(APPEND ${_out_compile_flags} "\"-D${_def}\"")
-          endforeach()
-        endif()
-        GET_TARGET_PROPERTY(_target_definitions ${_PCH_current_target} COMPILE_DEFINITIONS)
-        if(_target_definitions)
-          foreach(_def ${_target_definitions})
-            LIST(APPEND ${_out_compile_flags} "\"-D${_def}\"")
-          endforeach()
-        endif()
+        # Processed via $<TARGET_PROPERTY:target,COMPILE_DEFINITIONS>
+        #GET_PROPERTY(_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+        #GET_TARGET_PROPERTY(_target_definitions ${_PCH_current_target} COMPILE_DEFINITIONS)

         GET_TARGET_PROPERTY(_cxx_standard ${_PCH_current_target} CXX_STANDARD)
         if (_cxx_standard)
@@ -304,12 +295,22 @@
     #message("_command  ${_input} ${_output}")
     _PCH_GET_COMPILE_COMMAND(_command  ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_output} )

+    set(_pch_generate_file_cmd "${CMAKE_CURRENT_BINARY_DIR}/${_name}.command.sh")
+    string(REPLACE " " "\\ " _command "${_command}")
+    string(REPLACE ";" " " _command "${_command}")
+    file(GENERATE OUTPUT "${_pch_generate_file_cmd}" CONTENT "#!/bin/sh
+if [ -n \"$VERBOSE\" ]; then
+  tail -n1 \$0
+fi
+${_command} -D$<JOIN:$<TARGET_PROPERTY:${_targetName},COMPILE_DEFINITIONS>, -D>
+")
     GET_FILENAME_COMPONENT(_outdir ${_output} PATH)
     ADD_CUSTOM_COMMAND(
       OUTPUT "${_output}"
       COMMAND ${CMAKE_COMMAND} -E make_directory "${_outdir}"
-      COMMAND ${_command}
-      DEPENDS "${_input}"
+      COMMAND chmod +x "${_pch_generate_file_cmd}"
+      COMMAND "${_pch_generate_file_cmd}"
+      DEPENDS "${_input}" "${_pch_generate_file_cmd}"
       DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_name}"
       DEPENDS ${_targetName}_pch_dephelp
       )


Check for guile before configuring in ADD_GUILE_MODULE

--- cmake/OpenCogFunctions.cmake
+++ cmake/OpenCogFunctions.cmake
@@ -73,8 +73,7 @@
 #   MODULE_FILE, is inferred from this argument, even if it is the only file to
 #   be installed.
 FUNCTION(ADD_GUILE_MODULE)
-    # NOTE: Change PREFIX_DIR_PATH variable if a choice is made to adapt
-    # guile's site-package convention.
+  IF(HAVE_GUILE)
     SET(PREFIX_DIR_PATH "${GUILE_SITE_DIR}")
     SET(options "")  # This is used only as a place-holder
     SET(oneValueArgs MODULE_DESTINATION)
@@ -135,6 +134,7 @@
             ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE})
         ENDIF()
     ENDIF()
+  ENDIF()
 ENDFUNCTION(ADD_GUILE_MODULE)

 FUNCTION(ADD_GUILE_TEST TEST_NAME FILE_NAME)


Fix PHP5 cmake module.

Fix PHP5 cmake module.

--- cmake_modules/FindPHP5.cmake
+++ cmake_modules/FindPHP5.cmake
@@ -104,9 +104,11 @@
 STRING(REPLACE " " "" PHP5_INCLUDES "${PHP5_INCLUDES}")
 STRING(REPLACE "\n" "" PHP5_INCLUDES "${PHP5_INCLUDES}")
 STRING(LENGTH "${PHP5_INCLUDES}" PHP5_INCLUDES_LENGTH )
-MATH(EXPR PHP5_INCLUDES_LENGTH ${PHP5_INCLUDES_LENGTH}-1)
-STRING(SUBSTRING "${PHP5_INCLUDES}" 1 ${PHP5_INCLUDES_LENGTH} PHP5_INCLUDES)
-LIST(GET PHP5_INCLUDES 0 PHP5_INCLUDE_DIR)
+IF(PHP5_INCLUDES)
+  MATH(EXPR PHP5_INCLUDES_LENGTH ${PHP5_INCLUDES_LENGTH}-1)
+  STRING(SUBSTRING "${PHP5_INCLUDES}" 1 ${PHP5_INCLUDES_LENGTH} PHP5_INCLUDES)
+  LIST(GET PHP5_INCLUDES 0 PHP5_INCLUDE_DIR)
+ENDIF(PHP5_INCLUDES)

 set(PHP5_MAIN_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/main)
 set(PHP5_TSRM_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/TSRM)


Update chimeraFunctions.cmake (#167)

Update chimeraFunctions.cmake (#167)

Removed a spurious re-resolution of the `sources.txt` file path.

--- cmake/chimeraFunctions.cmake
+++ cmake/chimeraFunctions.cmake
@@ -105,7 +105,7 @@
     # rerun the compilation of the library if sources are regenerated.
     add_custom_target("${binding_TARGET}_SOURCES" DEPENDS "${binding_SOURCES_TXT}")
     add_custom_command(
-        OUTPUT "${binding_DESTINATION}/sources.txt"
+        OUTPUT "${binding_SOURCES_TXT}"
         COMMAND "${chimera_EXECUTABLE}" ARGS ${binding_ARGS}
         COMMAND ${CMAKE_COMMAND} ARGS -E rename "${binding_SOURCES_TXT}.staging" "${binding_SOURCES_TXT}"
         DEPENDS "${binding_CONFIGURATION}" ${binding_SOURCES}


check whether the file exists before attempting to obtain its debug symbols (#3424)

--- cmake/debugInformation.cmake
+++ cmake/debugInformation.cmake
@@ -17,7 +17,11 @@
   set(FILE ${USER_OUTPUT_DIRECTORY}/${USER_TARGET}${CMAKE_EXECUTABLE_SUFFIX})
   set(STRIP_FILE ${STRIP_DIR}/${USER_TARGET}${CMAKE_EXECUTABLE_SUFFIX})

-  if (NOT MSVC AND CMAKE_STRIP AND READELF_EXECUTABLE AND STRIP_FILE)
+  if (NOT MSVC AND
+      CMAKE_STRIP AND
+      READELF_EXECUTABLE AND
+      STRIP_FILE AND
+      EXISTS ${FILE})
     execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${STRIP_DIR})
     execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${STRIP_FILE})


CMake: pass down the HOST_LIBRARY flag to _add_swift_library_single()

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -1168,6 +1168,7 @@
           ${SWIFTLIB_IS_STDLIB_CORE_keyword}
           ${SWIFTLIB_IS_SDK_OVERLAY_keyword}
           ${SWIFTLIB_TARGET_LIBRARY_keyword}
+          ${SWIFTLIB_HOST_LIBRARY_keyword}
           INSTALL_IN_COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
           DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"
         )


CMake: build target libraries together with the stdlib

This avoids building swiftRemoteMirror for all targets by default.

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -694,7 +694,7 @@

   # Don't build standard libraries by default.  We will enable building
   # standard libraries that the user requested; the rest can be built on-demand.
-  if(SWIFTLIB_SINGLE_IS_STDLIB)
+  if(SWIFTLIB_SINGLE_TARGET_LIBRARY)
     foreach(t "${target}" ${target_static})
       set_target_properties(${t} PROPERTIES EXCLUDE_FROM_ALL TRUE)
     endforeach()
@@ -1273,7 +1273,7 @@

       # Add Swift standard library targets as dependencies to the top-level
       # convenience target.
-      if(SWIFTLIB_IS_STDLIB)
+      if(SWIFTLIB_TARGET_LIBRARY)
         foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
           set(VARIANT_SUFFIX "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
           if(TARGET "swift-stdlib${VARIANT_SUFFIX}" AND TARGET "swift-test-stdlib${VARIANT_SUFFIX}")


[CMake] Android NDK r12 appends ".x" to libgcc dir

The Android NDK r12 release appends a ".x" to the libgcc directory;
it is now:

```
android-ndk-r12/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x
```

Update the linker path for the Android build to accomodate this change.

--- cmake/modules/AddSwift.cmake
+++ cmake/modules/AddSwift.cmake
@@ -290,7 +290,7 @@
   elseif("${LFLAGS_SDK}" STREQUAL "ANDROID")
     list(APPEND result
         "-ldl"
-        "-L${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/${SWIFT_ANDROID_NDK_GCC_VERSION}"
+        "-L${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/${SWIFT_ANDROID_NDK_GCC_VERSION}.x"
         "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so"
         "-L${SWIFT_ANDROID_ICU_UC}" "-L${SWIFT_ANDROID_ICU_I18N}")
   else()


Fix poco version detection issue

Fix poco version detection issue

--- cmake/modules/FindPoco.cmake
+++ cmake/modules/FindPoco.cmake
@@ -125,13 +125,15 @@
 # parsing version
 file(STRINGS ${_poco_version_h} _contents REGEX "^#define POCO_VERSION 0x")
 if(_contents)
-    message ( STATUS "POCO_VERSION (hex) is: ${_contents}")
-    string(REGEX REPLACE ".*#define POCO_VERSION 0x[0-9]([0-9])[0-9ABD]*$" "\\1" Poco_VERSION_MAJOR "${_contents}")
-    string(REGEX REPLACE ".*#define POCO_VERSION 0x[0-9][0-9][0-9]([0-9])[0-9ABD]*$" "\\1" Poco_VERSION_MINOR "${_contents}")
-    string(REGEX REPLACE ".*#define POCO_VERSION 0x[0-9][0-9][0-9][0-9][0-9]([0-9])[0-9ABD]*$" "\\1" Poco_VERSION_PATCH "${_contents}")
-
-     set(Poco_VERSION "${Poco_VERSION_MAJOR}.${Poco_VERSION_MINOR}.${Poco_VERSION_PATCH}" )
-#     message ( STATUS "poco version is ${Poco_VERSION}")
+    message ( STATUS "POCO_VERSION (hex) define macro is: ${_contents}")
+    string(REGEX REPLACE ".*#define POCO_VERSION 0x([0-9A-F][0-9A-F])[0-9A-F]*$" "\\1" Poco_VERSION_MAJOR "${_contents}")
+    math(EXPR Poco_VERSION_MAJOR "0x${Poco_VERSION_MAJOR}")
+    string(REGEX REPLACE ".*#define POCO_VERSION 0x[0-9A-F][0-9A-F]([0-9A-F][0-9A-F])[0-9A-F]*$" "\\1" Poco_VERSION_MINOR "${_contents}")
+    math(EXPR Poco_VERSION_MINOR "0x${Poco_VERSION_MINOR}")
+    string(REGEX REPLACE ".*#define POCO_VERSION 0x[0-9A-F][0-9A-F][0-9A-F][0-9A-F]([0-9A-F][0-9A-F])[0-9A-F]*$" "\\1" Poco_VERSION_PATCH "${_contents}")
+    math(EXPR Poco_VERSION_PATCH "0x${Poco_VERSION_PATCH}")
+    set(Poco_VERSION "${Poco_VERSION_MAJOR}.${Poco_VERSION_MINOR}.${Poco_VERSION_PATCH}" )
+#    message ( STATUS "poco version is ${Poco_VERSION}")
 else()
     set ( _Poco_NOTFOUND_MESSAGE "Include file ${_poco_version_h} does not contain expected version information")
 endif()


Fix FindRuby for JRuby

Fix FindRuby for JRuby

--- cmake/modules/FindRuby.cmake
+++ cmake/modules/FindRuby.cmake
@@ -57,10 +57,10 @@
 EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['vendorarchdir']"
   OUTPUT_VARIABLE RUBY_VENDORARCH_DIR ERROR_QUIET)

-IF(RUBY_VENDORARCH_DIR)
+IF(RUBY_VENDORARCH_DIR AND (NOT ("${RUBY_VENDORARCH_DIR}" STREQUAL "nil")))
     EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['vendorlibdir']"
        OUTPUT_VARIABLE RUBY_VENDORLIB_DIR)
-ELSE(RUBY_VENDORARCH_DIR)
+ELSE(RUBY_VENDORARCH_DIR AND (NOT ("${RUBY_VENDORARCH_DIR}" STREQUAL "nil")))

     # fall back to site*dir
     EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['sitearchdir']"
@@ -68,7 +68,7 @@

     EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['sitelibdir']"
        OUTPUT_VARIABLE RUBY_VENDORLIB_DIR)
-ENDIF(RUBY_VENDORARCH_DIR)
+ENDIF(RUBY_VENDORARCH_DIR AND (NOT ("${RUBY_VENDORARCH_DIR}" STREQUAL "nil")))

 # this is not needed if you use "print" inside the ruby statements
 # remove the new lines from the output by replacing them with empty strings
@@ -76,12 +76,23 @@
 #STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
 #STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")

+EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['ruby_install_name']"
+   OUTPUT_VARIABLE RUBY_INSTALL_NAME)
+IF(RUBY_INSTALL_NAME STREQUAL "jruby")
+  EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['includedir']"
+    OUTPUT_VARIABLE JRUBY_INC_DIR)
+  # Hmm, jruby reports lib/native/linux as 'includedir' but ruby.h is at lib/native/include
+  SET(RUBY_HDR_DIR "${RUBY_POSSIBLE_LIB_PATH}/native/include")
+ENDIF(RUBY_INSTALL_NAME STREQUAL "jruby")
+
+

 FIND_PATH(RUBY_INCLUDE_PATH
    NAMES ruby.h
   PATHS
    ${RUBY_HDR_DIR}
    ${RUBY_ARCH_DIR}
+   ${JRUBY_INC_DIR}
    /usr/lib/ruby/1.8/i586-linux-gnu/ )

 FIND_LIBRARY(RUBY_LIBRARY


Fixed erroneous debug compiler flag

Fixed erroneous debug compiler flag

--- cmake_modules/compiler.cmake
+++ cmake_modules/compiler.cmake
@@ -238,7 +238,7 @@

      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
      set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
-     set(CMAKE_CXX_FLAGS_DEBUG "-Og")
+     set(CMAKE_CXX_FLAGS_DEBUG "-g")

      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wold-style-cast -Wnon-virtual-dtor")


cmake: improved error message

cmake: improved error message

--- config/FindVIGRANUMPY_DEPENDENCIES.cmake
+++ config/FindVIGRANUMPY_DEPENDENCIES.cmake
@@ -235,8 +235,11 @@
         FORCE)
     SET(VIGRANUMPY_LIBRARIES ${PYTHON_LIBRARIES} ${Boost_PYTHON_LIBRARY})

-    if(TEST_VIGRANUMPY AND (NOT VIGRANUMPY_DEPENDENCIES_FOUND OR PYTHON_NOSETESTS_NOT_FOUND))
+    if(TEST_VIGRANUMPY AND NOT VIGRANUMPY_DEPENDENCIES_FOUND)
         MESSAGE(FATAL_ERROR "  vigranumpy dependencies NOT found while TEST_VIGRANUMPY=1")
+    endif()
+    if(TEST_VIGRANUMPY AND PYTHON_NOSETESTS_NOT_FOUND)
+        MESSAGE(FATAL_ERROR "  nose NOT found while TEST_VIGRANUMPY=1")
     endif()
 ELSE()
     MESSAGE(STATUS "Python not found. Make sure that Python is in your PATH or use 'cmake-gui' to set the PYTHON_EXECUTABLE variable manually.")


Update qRestAPI project

Update qRestAPI project

List of changes:

$ git shortlog c5e4c2a..ddc0cfc --no-merges
Hans Meine (10):
      ENH: make test error output more readable
      ENH: output test headers
      ENH: add comment about potential refactoring trap
      BUG: properly format numeric error codes in output
      BUG: add FIXMEs about inconsistent naming
      BUG: fix error handling in qMidasAPI
      ENH: assert that queryId points to a valid result
      BUG: fix success/error reporting of synchonousQuery()
      STYLE: remove excessive spaces
      BUG: correctly forward errors

Isaiah Norton (2):
      ENH: don't assert out when zero results returned
      ENH: safer parse: use QScriptEngine JSON.parse internal function

Jean-Christophe Fillion-Robin (4):
      Fix unused variable warnings
      qMidasAPI: synchronousQuery: Fix regression and ensure query is sent
      README: Update build and testing instructions
      Add license file

Max Smolens (2):
      Fix compiling with Qt5 without OpenSSL
      COMP: Fix misspelled definition

--- CMakeExternals/qRestAPI.cmake
+++ CMakeExternals/qRestAPI.cmake
@@ -24,7 +24,7 @@

 if(NOT DEFINED ${proj}_DIR)

-  set(revision_tag "c5e4c2a7d5")
+  set(revision_tag "ddc0cfcc220d0ccd02b4afdd699d1e780dac3fa3")
   if(${proj}_REVISION_TAG)
     set(revision_tag ${${proj}_REVISION_TAG})
   endif()


avoid repeated finding

avoid repeated finding

--- opensplice_cmake_module/cmake/Modules/FindOpenSplice.cmake
+++ opensplice_cmake_module/cmake/Modules/FindOpenSplice.cmake
@@ -40,6 +40,10 @@
 ###############################################################################

 # lint_cmake: -convention/filename, -package/stdargs
+
+if(DEFINED OpenSplice_FOUND)
+  return()
+endif()

 set(OpenSplice_FOUND FALSE)


COMP: Commit missing changes in files.cmake

--- Core/DataStructures/files.cmake
+++ Core/DataStructures/files.cmake
@@ -1,6 +1,7 @@
 SET(CPP_FILES
   mitkAbstractTransformGeometry.cpp
   mitkAffineTransformationOperation.cpp
+  mitkAnnotationProperty.cpp
   mitkApplicationCursor.cpp
   mitkApplyDiffImageOperation.cpp
   mitkBaseData.cpp


Nagios Monitoring 5.0.2-rc2 Release Candidate 2

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

--- version.cmake
+++ version.cmake
@@ -5,5 +5,5 @@
 set ( HPCC_NM_MINOR 0 )
 set ( HPCC_NM_POINT 2 )
 set ( HPCC_NM_MATURITY "rc" )
-set ( HPCC_NM_SEQUENCE 1 )
+set ( HPCC_NM_SEQUENCE 2 )
 ###


Bump GAPID version to v0.9.0

Bump GAPID version to v0.9.0

--- version.cmake
+++ version.cmake
@@ -15,8 +15,8 @@
 # True source of GAPID versions.
 # Increment these numbers immediately after releasing a new version.
 set(GAPID_VERSION_MAJOR 0)
-set(GAPID_VERSION_MINOR 6)
-set(GAPID_VERSION_POINT 2)
+set(GAPID_VERSION_MINOR 9)
+set(GAPID_VERSION_POINT 0)

 if (NOT DEFINED GAPID_BUILD_NUMBER)
     set(GAPID_BUILD_NUMBER 0)


Split branch for 3.8.x closedown

Split branch for 3.8.x closedown

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

--- version.cmake
+++ version.cmake
@@ -3,8 +3,8 @@
 ###
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 3 )
-set ( HPCC_MINOR 7 )
+set ( HPCC_MINOR 8 )
 set ( HPCC_POINT 0 )
-set ( HPCC_MATURITY "trunk" )
+set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 1 )
 ###


[jnc] rollback version to 1.7.9

[jnc] rollback version to 1.7.9

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

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

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


Some tweaks to sanitizer builds. (#3663)

- Don't restrict to debug builds. To reproduce issues it may be
necessary to run optimized buids, particularly for TSan.

- Support Android, where just -fsanitize=address results in a link error
with lld. See https://github.com/android/ndk/issues/1088

- Fix a typo in cmake messages.

--- build_tools/cmake/iree_copts.cmake
+++ build_tools/cmake/iree_copts.cmake
@@ -140,48 +140,45 @@

 include(CheckCXXCompilerFlag)
 if(${IREE_ENABLE_ASAN})
-  if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-    message(FATAL_ERROR "IREE_ENABLE_ASAN requires Debug build")
-  endif()
   set(CMAKE_REQUIRED_FLAGS "-fsanitize=address")
   check_cxx_compiler_flag(-fsanitize=address COMPILER_SUPPORTS_ASAN)
   unset(CMAKE_REQUIRED_FLAGS)
   if(${COMPILER_SUPPORTS_ASAN})
-    list(APPEND IREE_C_FLAGS_DEBUG_LIST "-fsanitize=address")
-    list(APPEND IREE_CXX_FLAGS_DEBUG_LIST "-fsanitize=address")
+    list(APPEND IREE_DEFAULT_COPTS "-fsanitize=address")
+    if(ANDROID)
+      list(APPEND IREE_DEFAULT_LINKOPTS "-fuse-ld=gold")
+    endif()
   else()
     message(FATAL_ERROR "The compiler does not support address sanitizer "
                         "or is missing configuration for address sanitizer")
   endif()
 endif()
 if(${IREE_ENABLE_MSAN})
-  if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-    message(FATAL_ERROR "IREE_ENABLE_MSAN requires Debug build")
-  endif()
   set(CMAKE_REQUIRED_FLAGS "-fsanitize=memory")
   check_cxx_compiler_flag(-fsanitize=memory COMPILER_SUPPORTS_MSAN)
   unset(CMAKE_REQUIRED_FLAGS)
   if(${COMPILER_SUPPORTS_MSAN})
-    list(APPEND IREE_C_FLAGS_DEBUG_LIST "-fsanitize=memory")
-    list(APPEND IREE_CXX_FLAGS_DEBUG_LIST "-fsanitize=memory")
+    list(APPEND IREE_DEFAULT_COPTS "-fsanitize=memory")
+    if(ANDROID)
+      list(APPEND IREE_DEFAULT_LINKOPTS "-fuse-ld=gold")
+    endif()
   else()
     message(FATAL_ERROR "The compiler does not support memory sanitizer "
-                        "or is missing configuration for address sanitizer")
+                        "or is missing configuration for memory sanitizer")
   endif()
 endif()
 if(${IREE_ENABLE_TSAN})
-  if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-    message(FATAL_ERROR "IREE_ENABLE_TSAN requires Debug build")
-  endif()
   set(CMAKE_REQUIRED_FLAGS "-fsanitize=thread")
   check_cxx_compiler_flag(-fsanitize=thread COMPILER_SUPPORTS_TSAN)
   unset(CMAKE_REQUIRED_FLAGS)
   if(${COMPILER_SUPPORTS_TSAN})
-    list(APPEND IREE_C_FLAGS_DEBUG_LIST "-fsanitize=thread")
-    list(APPEND IREE_CXX_FLAGS_DEBUG_LIST "-fsanitize=thread")
+    list(APPEND IREE_DEFAULT_COPTS "-fsanitize=thread")
+    if(ANDROID)
+      list(APPEND IREE_DEFAULT_LINKOPTS "-fuse-ld=gold")
+    endif()
   else()
     message(FATAL_ERROR "The compiler does not support thread sanitizer "
-                        "or is missing configuration for address sanitizer")
+                        "or is missing configuration for thread sanitizer")
   endif()
 endif()


Split off 6.0.0 branch

Split off 6.0.0 branch

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

--- version.cmake
+++ version.cmake
@@ -3,7 +3,7 @@
 ###
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 6 )
-set ( HPCC_MINOR 0 )
+set ( HPCC_MINOR 1 )
 set ( HPCC_POINT 0 )
 set ( HPCC_MATURITY "trunk" )
 set ( HPCC_SEQUENCE 0 )


Split off 7.10.30

Split off 7.10.30

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

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


Explicitly specify POSIX.1-2008 conformance - Fix build on glibc versions prior to 2.19

--- src/pal/src/configure.cmake
+++ src/pal/src/configure.cmake
@@ -6,7 +6,7 @@
 include(CheckStructHasMember)
 include(CheckTypeSize)

-set(CMAKE_REQUIRED_DEFINITIONS "-D_DEFAULT_SOURCE")
+set(CMAKE_REQUIRED_DEFINITIONS "-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L")
 check_include_files(ieeefp.h HAVE_IEEEFP_H)
 check_include_files(alloca.h HAVE_ALLOCA_H)
 check_include_files(sys/vmparam.h HAVE_SYS_VMPARAM_H)


hdmarker dep check

hdmarker dep check

--- external/vigra_cmake/VAD_hdmarker.cmake
+++ external/vigra_cmake/VAD_hdmarker.cmake
@@ -15,6 +15,11 @@

   vad_deps(${ARGN})

+  if (NOT OpenCV_FOUND AND NOT Ceres_FOUND)
+    message("hdmarker: OpenCV or Ceres missing!")
+    return()
+  endif()
+
   git_clone(hdmarker)

   add_subdirectory("${VAD_EXTERNAL_ROOT}/hdmarker" "${CMAKE_BINARY_DIR}/external/hdmarker")


Removed bzip2 and zlib

Removed bzip2 and zlib

--- cmake/BALLConfigBoost.cmake
+++ cmake/BALLConfigBoost.cmake
@@ -2,7 +2,6 @@

 # Mandatory boost components
 SET(BALL_BOOST_COMPONENTS
-	bzip2
 	chrono
 	date_time
 	iostreams
@@ -10,7 +9,6 @@
 	serialization
 	system
 	thread
-	zlib
 )

 # Additional Boost versions that should be included by CMake


Deal with failures of git describe

Deal with failures of git describe

--- cmake/CheckGitVersion.cmake
+++ cmake/CheckGitVersion.cmake
@@ -30,9 +30,10 @@
   get_git_head_revision(GIT_REFSPEC GIT_SHA1)

   # Get output of git describe
-  execute_process(COMMAND git describe --tags
+  execute_process(COMMAND sh -c "git describe --tags || (echo -n none-0-g ; git rev-parse --short HEAD)"
                   WORKING_DIRECTORY ${AliRoot_SOURCE_DIR}
                   OUTPUT_VARIABLE ALIROOT_GIT_DESCRIBE
+                  ERROR_QUIET
                   OUTPUT_STRIP_TRAILING_WHITESPACE)

   if(CMAKEDEBUG)


fix redhat and centos

fix redhat and centos

--- cmake/EnumerateSystem.cmake
+++ cmake/EnumerateSystem.cmake
@@ -16,17 +16,9 @@
         set(RPM_SYSTEM_NAME "fc${CMAKE_MATCH_1}")
         set(SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM")
       endif(LINUX_ISSUE MATCHES "Fedora")
-      # Scientific Linux case
-      if(LINUX_ISSUE MATCHES "Scientific Linux")
-        string(REGEX MATCH "release ([0-9]+\\.[0-9]+)" CENTOS "${LINUX_ISSUE}")
-        set(LINUX_NAME "ScientificLinux")
-        set(LINUX_VER "${CMAKE_MATCH_1}")
-        set(RPM_SYSTEM_NAME "rhel${CMAKE_MATCH_1}")
-        set(SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM")
-      endif(LINUX_ISSUE MATCHES "Scientific Linux")
       # CentOS case
       if(LINUX_ISSUE MATCHES "CentOS")
-        string(REGEX MATCH "release ([0-9]+\\.[0-9]+)" CENTOS "${LINUX_ISSUE}")
+        string(REGEX MATCH "release ([0-9]+)" CENTOS "${LINUX_ISSUE}")
         set(LINUX_NAME "CentOS")
         set(LINUX_VER "${CMAKE_MATCH_1}")
         set(RPM_SYSTEM_NAME "rhel${CMAKE_MATCH_1}")
@@ -34,7 +26,7 @@
       endif(LINUX_ISSUE MATCHES "CentOS")
       # Redhat case
       if(LINUX_ISSUE MATCHES "Red Hat")
-        string(REGEX MATCH "release ([0-9]+\\.[0-9]+)" REDHAT "${LINUX_ISSUE}")
+        string(REGEX MATCH "release ([0-9]+)" REDHAT "${LINUX_ISSUE}")
         set(LINUX_NAME "Redhat")
         set(LINUX_VER "${CMAKE_MATCH_1}")
         set(RPM_SYSTEM_NAME "rhel${CMAKE_MATCH_1}")


Perform small modification of FindLibConfig++.cmake

--- cmake/FindLibConfig++.cmake
+++ cmake/FindLibConfig++.cmake
@@ -3,5 +3,5 @@
 find_path(LIBCONFIG++_INCLUDE_DIR libconfig.h++)
 find_library(LIBCONFIG++_LIBRARY config++)
 if (LIBCONFIG++_INCLUDE_DIR AND LIBCONFIG++_LIBRARY)
-set(LIBCONFIG++_FOUND TRUE)
+	set(LIBCONFIG++_FOUND TRUE)
 endif (LIBCONFIG++_INCLUDE_DIR AND LIBCONFIG++_LIBRARY)


cmake: use INTERFACE_COMPILE_DEFINITIONS with definition

--- cmake/OpenCVDetectTBB.cmake
+++ cmake/OpenCVDetectTBB.cmake
@@ -88,7 +88,7 @@
       if(NOT (CMAKE_VERSION VERSION_LESS "3.16.0"))  # https://gitlab.kitware.com/cmake/cmake/-/issues/19434
         target_compile_definitions(tbb INTERFACE "__TBB_NO_IMPLICIT_LINKAGE=1")
       else()
-        set_target_properties(tbb PROPERTIES INTERFACE_COMPILE_OPTIONS "__TBB_NO_IMPLICIT_LINKAGE=1")
+        set_target_properties(tbb PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__TBB_NO_IMPLICIT_LINKAGE=1")
       endif()
     endif()
     message(STATUS "Found TBB (env): ${TBB_ENV_LIB}")


Add option to skip nested cmake structure on Windows

--- cmake/OpenCVGenConfig.cmake
+++ cmake/OpenCVGenConfig.cmake
@@ -122,7 +122,7 @@
 #  Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake  -> For use within binary installers/packages
 # --------------------------------------------------------------------------------------------
 if(WIN32)
-  if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+  if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG)
     ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" "${OPENCV_LIB_INSTALL_PATH}" "OpenCVConfig.root-WIN32.cmake.in")
   else()
     ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" "" "")


cmake: Move libapp.a into it's own directory

Move libapp.a into it's own directory. This would make it's placement
consistent with how zephyr.elf is placed.

E.g. it might now look like:

ls b/*

b/build.ninja  b/CMakeCache.txt  b/cmake_install.cmake  b/rules.ninja

b/app:
libapp.a

b/CMakeFiles:
3.12.0   cmake.check_cache  CMakeOutput.log  TargetDirectories.txt
app.dir  CMakeError.log     CMakeTmp

b/zephyr:
arch                 kernel                       subsys
boards               lib                          tests
cmake                liboffsets.a                 zephyr.bin
CMakeFiles           libzephyr.a                  zephyr.elf
cmake_install.cmake  linker.cmd                   zephyr.hex
ext                  linker_pass_final.cmd        zephyr.map
include              linker_pass_final.cmd.dep    zephyr_prebuilt.elf
isrList.bin          misc                         zephyr.stat

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

--- cmake/app/boilerplate.cmake
+++ cmake/app/boilerplate.cmake
@@ -338,6 +338,7 @@
 endif()

 zephyr_library_named(app)
+set_property(TARGET app PROPERTY ARCHIVE_OUTPUT_DIRECTORY app)

 add_subdirectory(${ZEPHYR_BASE} ${__build_dir})


Add option to run gcovr with llvm-cov

Add option to run gcovr with llvm-cov

--- cmake/kl/CodeCoverage.cmake
+++ cmake/kl/CodeCoverage.cmake
@@ -114,7 +114,7 @@
         message(FATAL_ERROR "gcovr not found!")
     endif()

-    set(options XML)
+    set(options XML LLVM)
     set(one_value_args COMMAND OUTPUT_NAME)
     set(multi_value_args FILTERS EXCLUDE ARGS)
     cmake_parse_arguments(arg "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN})
@@ -154,6 +154,10 @@
         set(report_type HTML)
     endif()

+    if(arg_LLVM)
+ 	    set(gcov_executable "--gcov-executable=\"llvm-cov\" gcov")
+ 	endif()
+
     list(APPEND cmd COMMAND ${arg_COMMAND} ${arg_ARGS})
     list(APPEND cmd COMMAND
         ${GCOVR_EXECUTABLE}
@@ -162,6 +166,7 @@
         ${arg_FILTERS}
         ${arg_EXCLUDE}
         --output=${output_file}
+        ${gcov_executable}
     )

     add_custom_target(${_target}


fixed defines for GBS

fixed defines for GBS

--- include.cmake
+++ include.cmake
@@ -118,7 +118,7 @@
     set(GSYS_ENV $ENV{GSYS})

     if ("${GSYS_ENV}" STREQUAL "leg")
-        add_definitions(LEG CIA_LEX)
+        add_definitions(-DLEG -DCIA_LEX)
         add_definitions(-Werror-implicit-function-declaration -Wreturn-type -Wmissing-declarations -m64)
         add_definitions(-Werror-implicit-function-declaration -Wreturn-type -Wmissing-prototypes -Wmissing-declarations -m64)
         # original:
@@ -127,7 +127,7 @@
     endif()

     if ("${GSYS_ENV}" STREQUAL "deg")
-        add_definitions(DEG CIA_DEX)
+        add_definitions(-DDEG -DCIA_DEX)
         add_definitions(-Werror-implicit-function-declaration -Wreturn-type -Wmissing-declarations -m64)
         add_definitions(-Werror-implicit-function-declaration -Wreturn-type -Wmissing-prototypes -Wmissing-declarations -m64)
     endif()


GAMS_BUILD: location of OPT apifiles changed from GPRODUCTS to BTREE

--- include.cmake
+++ include.cmake
@@ -116,7 +116,7 @@
     include_directories(${GPRODUCTS_ENV}/gclib
                         ${GPRODUCTS_ENV}/apiwrap/gmdobj
                         ${GPRODUCTS_ENV}/apiwrap/joat
-                        ${GPRODUCTS_ENV}/apiwrap/optobj)
+                        ${BTREE}/optobj/${GSYS})

     set(SOURCE ${SOURCE} ${GPRODUCTS_ENV}/gclib/gclgms.c
                          ${GPRODUCTS_ENV}/gclib/gcmt.c
@@ -124,7 +124,7 @@
                          ${GPRODUCTS_ENV}/apiwrap/joat/cfgmcc.c
                          ${GPRODUCTS_ENV}/apiwrap/joat/gevmcc.c
                          ${GPRODUCTS_ENV}/apiwrap/joat/gmomcc.c
-                         ${GPRODUCTS_ENV}/apiwrap/optobj/optcc.c)
+                         ${BTREE}/optobj/optcc.c)

     include_directories(${GPRODUCTS_ENV}/apiexamples/C++/api)
     set(SOURCE ${SOURCE} ${GPRODUCTS_ENV}/apiexamples/C++/api/gamsoptions.cpp


Add 3.8 python option

Add 3.8 python option

--- Superbuild/PythonExternal.cmake
+++ Superbuild/PythonExternal.cmake
@@ -34,7 +34,7 @@
 ENDIF()

 set(USER_PYTHON_VERSION ${DEFAULT_PYTHON_VERSION} CACHE STRING "Branch name corresponding to Python version number")
-set_property(CACHE USER_PYTHON_VERSION PROPERTY STRINGS 3.4.3 3.5.6 3.6.3 3.6.7 3.7.1)
+set_property(CACHE USER_PYTHON_VERSION PROPERTY STRINGS 3.4.3 3.5.6 3.6.7 3.7.1 3.8.2)

 string(REPLACE "." ";" USER_PYTHON_VERSION_LIST ${USER_PYTHON_VERSION})
 list(GET USER_PYTHON_VERSION_LIST 0 USER_PYTHON_VERSION_MAJOR)


set CH_IRRLICHTINC only once Linux/Darwin have located the sdk

--- src/unit_VEHICLE/cmake/FindChronoEngine.cmake
+++ src/unit_VEHICLE/cmake/FindChronoEngine.cmake
@@ -349,11 +349,7 @@

     if (${CH_USE_UNIT_IRRLICHT})
         SET(CH_IRRLICHT_SDKDIR ""  CACHE PATH   "Where is your Irrlicht SDK installed? You must set this path to compile demos with 3D display.")
-        IF(EXISTS "${CH_IRRLICHT_SDKDIR}/include")
-            SET(CH_IRRLICHTINC "${CH_IRRLICHT_SDKDIR}/include")
-        ELSE()
-            SET(CH_IRRLICHTINC "${CH_IRRLICHT_SDKDIR}")
-        ENDIF()
+
         IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
             IF ("${CH_COMPILER}" STREQUAL "COMPILER_MSVC")
                 FIND_LIBRARY( CH_IRRLICHTLIB NAMES Irrlicht PATHS "${CH_IRRLICHT_SDKDIR}/lib/Win32-visualstudio")
@@ -378,6 +374,12 @@
             SET(MAC_LIBS ${COCOA_LIBRARY} ${OPENGL_LIBRARY} ${IOKIT_LIBRARY})
             SET(CH_IRRLICHTLIB ${CH_IRRLICHTLIB} ${MAC_LIBS})
         ENDIF()
+
+        IF(EXISTS "${CH_IRRLICHT_SDKDIR}/include")
+            SET(CH_IRRLICHTINC "${CH_IRRLICHT_SDKDIR}/include")
+        ELSE()
+            SET(CH_IRRLICHTINC "${CH_IRRLICHT_SDKDIR}")
+        ENDIF()

         MARK_AS_ADVANCED(CH_IRRLICHTLIB)


PERF: Prevent FindKWStyle.cmake from being called multiple times

Every run of FindKWStyle.cmake has the additional cost of executing
kwstyle to get its version. This change prevents FindKWStyle.cmake from
being called twice, except on a fresh configuration.

Change-Id: Ied7949bad56363f73a8e89485207536bcea097ae

--- Utilities/KWStyle/KWStyle.cmake
+++ Utilities/KWStyle/KWStyle.cmake
@@ -1,12 +1,13 @@
-
-find_package(KWStyle 1.0.1
-  QUIET
-  )
-option(ITK_USE_KWSTYLE
-  "Enable the use of KWStyle for checking coding style."
-  ${KWSTYLE_FOUND} # default
-  )
-mark_as_advanced(ITK_USE_KWSTYLE)
+if(NOT DEFINED ITK_USE_KWSTYLE)
+  find_package(KWStyle 1.0.1
+    QUIET
+    )
+  option(ITK_USE_KWSTYLE
+    "Enable the use of KWStyle for checking coding style."
+    ${KWSTYLE_FOUND} # default
+    )
+  mark_as_advanced(ITK_USE_KWSTYLE)
+endif(NOT DEFINED ITK_USE_KWSTYLE)

 if(ITK_USE_KWSTYLE)
   find_package(KWStyle 1.0.1


:lipstick: Fit into 80 columns

:lipstick: Fit into 80 columns

--- scripts/PackageLookup.cmake
+++ scripts/PackageLookup.cmake
@@ -15,7 +15,8 @@
 include(CachedVariables)
 include(Utilities)
 add_to_envvar(PKG_CONFIG_PATH "${EXTERNAL_ROOT}/lib/pkgconfig" PREPEND OS UNIX)
-add_to_envvar(PKG_CONFIG_PATH "${EXTERNAL_ROOT}/lib64/pkgconfig" PREPEND OS UNIX)
+add_to_envvar(PKG_CONFIG_PATH
+    "${EXTERNAL_ROOT}/lib64/pkgconfig" PREPEND OS UNIX)
 add_to_envvar(LD_LIBRARY_PATH "${EXTERNAL_ROOT}/lib" PREPEND OS UNIX)
 add_to_envvar(LD_LIBRARY_PATH "${EXTERNAL_ROOT}/lib64" PREPEND OS UNIX)
 add_to_envvar(DYLD_LIBRARY_PATH "${EXTERNAL_ROOT}/lib" PREPEND OS APPLE)
@@ -87,6 +88,7 @@
     set(recursive FALSE)
     _get_sane_name(${package} SANENAME)
     if(${SANENAME}_RECURSIVE) # Called by recursive step
+        delete_package_variables(${package})
         set(recursive TRUE)
         if(${package}_NOFIND)
             set(${package}_FOUND TRUE CACHE BOOL "")
@@ -152,9 +154,11 @@
     else()
         if(NOT ${package}_QUIET)
             if(${package}_FOUND)
-                message(STATUS "${package} is built locally as an external project")
+                message(STATUS
+                    "${package} is built locally as an external project")
             elseif(NOT ${package}_DOWNLOAD_BY_DEFAULT)
-                message(STATUS "Will attempt to download and install ${package}")
+                message(STATUS
+                    "Will attempt to download and install ${package}")
             else()
                 message(STATUS "Will download, build,"
                    " and install a local version of ${package}")
@@ -182,7 +186,8 @@
         set(filename "${EXTERNAL_ROOT}/hooks/install/${package}.cmake")
     else()
         set(hooks POST_LOOKUP INSTALL)
-        message(FATAL_ERROR "Hook argument(${hook}) should be one of ${hooks}.")
+        message(FATAL_ERROR
+            "Hook argument(${hook}) should be one of ${hooks}.")
     endif()
     list(LENGTH ARGN nargs)
     set(variable hook_script)
@@ -228,7 +233,8 @@
         "ARGUMENTS;COMPONENTS"
         ${ARGN}
     )
-    # Set explicitly to TRUE or FALSE to simplify setting ${package}_LOOKUP_BUILD
+    # Set explicitly to TRUE or FALSE to simplify setting
+    # ${package}_LOOKUP_BUILD
     if(${package}_KEEP)
         set(${package}_KEEP TRUE)
     else()
@@ -281,7 +287,8 @@

 # Adds an external step to an external project to rerun cmake
 macro(add_recursive_cmake_step name)
-    cmake_parse_arguments(recursive "NOCHECK" "FOUND_VAR;PACKAGE_NAME" "" ${ARGN})
+    cmake_parse_arguments(recursive
+        "NOCHECK" "FOUND_VAR;PACKAGE_NAME" "" ${ARGN})
     set(recurse_name "${name}")
     if(recursive_PACKAGE_NAME)
         set(recurse_name "${recursive_PACKAGE_NAME}")
@@ -300,11 +307,12 @@
         set(cmakefile "${PROJECT_BINARY_DIR}/CMakeFiles/external")
         set(cmakefile "${cmakefile}/${name}_recursive.cmake")
         file(WRITE "${cmakefile}"
-            "set(CMAKE_PROGRAM_PATH \"${EXTERNAL_ROOT}/bin\" CACHE PATH \"\")\n"
-            "set(CMAKE_LIBRARY_PATH \"${EXTERNAL_ROOT}/lib\" CACHE PATH \"\")\n"
-            "set(CMAKE_INCLUDE_PATH \"${EXTERNAL_ROOT}/include\" CACHE PATH \"\")\n"
-            "set(CMAKE_PREFIX_PATH \"${EXTERNAL_ROOT}\" CACHE PATH \"\")\n"
-            "set(${SANENAME}_RECURSIVE TRUE CACHE INTERNAL \"\")\n"
+          "set(CMAKE_PROGRAM_PATH \"${EXTERNAL_ROOT}/bin\" CACHE PATH \"\")\n"
+          "set(CMAKE_LIBRARY_PATH \"${EXTERNAL_ROOT}/lib\" CACHE PATH \"\")\n"
+          "set(CMAKE_INCLUDE_PATH"
+            "\"${EXTERNAL_ROOT}/include\" CACHE PATH \"\")\n"
+          "set(CMAKE_PREFIX_PATH \"${EXTERNAL_ROOT}\" CACHE PATH \"\")\n"
+          "set(${SANENAME}_RECURSIVE TRUE CACHE INTERNAL \"\")\n"
         )
         if(NOT recursive_NOCHECK)
             file(APPEND "${cmakefile}"
@@ -313,14 +321,18 @@
         endif()
         ExternalProject_Add_Step(
             ${name} reCMake
-            COMMAND ${CMAKE_COMMAND} -C "${cmakefile}" --no-varn-unused-cli "${CMAKE_SOURCE_DIR}"
+            COMMAND
+                ${CMAKE_COMMAND} -C "${cmakefile}"
+                    --no-varn-unused-cli "${CMAKE_SOURCE_DIR}"
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
             ${recursive_UNPARSED_ARGUMENTS}
         )
         if(${${SANENAME}_REQUIREDONRECURSE})
             if(NOT ${found_var} OR "${${found_var}}" STREQUAL "")
                 unset(${SANENAME}_REQUIREDONRECURSE CACHE)
-                message(FATAL_ERROR "[${name}] Could not be downloaded and installed")
+                message(FATAL_ERROR
+                    "[${name}] Could not be downloaded and installed"
+                )
             endif()
         endif()
     endif()
@@ -330,7 +342,8 @@
 # A script that is executed once a package has been built locally
 # This function should be called from the lookup recipe
 function(write_lookup_hook hook package)
-    cmake_parse_arguments(_wpls${package} "APPEND" "SCRIPTNAME;CONFIGURE" "" ${ARGN})
+    cmake_parse_arguments(_wpls${package}
+        "APPEND" "SCRIPTNAME;CONFIGURE" "" ${ARGN})
     if(_wpls${package}_APPEND AND _wpls${package}_CONFIGURE)
         message(FATAL_ERROR "Only one of APPEND and CONFIGURE is valid")
     endif()


BUG: Same CMake command error than previous commit (in CIP)

--- SuperBuild/External_CIP.cmake
+++ SuperBuild/External_CIP.cmake
@@ -25,7 +25,7 @@
   ExternalProject_Add(${proj}
     ${${proj}_EP_ARGS}
     GIT_REPOSITORY "${git_protocol}://github.com/acil-bwh/ChestImagingPlatform.git"
-    GIT_TAG "13494a966c073ebc6d654202ba8222ffe076adcf" # Develop
+    GIT_TAG "2425a3327d1e6f6d159c66ba650e3ab39689c0b0" # Develop
     #DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E echo "Remove this line and uncomment GIT_REPOSITORY and GIT_TAG"
     SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
     BINARY_DIR ${proj}-build


tests now supported with a shared object test library being generated

--- src/CMake/UseCyclus.cmake
+++ src/CMake/UseCyclus.cmake
@@ -64,11 +64,12 @@
       COMMENT "Executing ${CYCPP} ${HIN} ${PREPROCESSOR} ${HFLAG} ${ORIG} ${INCL_ARGS}"
       )
     ADD_CUSTOM_COMMAND(
-      OUTPUT ${CCOUT}
+      OUTPUT ${CCOUT}
+      OUTPUT ${HOUT}
       COMMAND ${CYCPP} ${HIN} ${PREPROCESSOR} ${HFLAG} ${ORIG} ${INCL_ARGS}
       COMMAND ${CYCPP} ${CCIN} ${PREPROCESSOR} ${CCFLAG} ${ORIG} ${INCL_ARGS}
+      DEPENDS ${HIN}
       DEPENDS ${CCIN}
-      DEPENDS ${HIN}
       COMMENT "Executing ${CYCPP} ${HIN} ${PREPROCESSOR} ${HFLAG} ${ORIG} ${INCL_ARGS}"
       COMMENT "Executing ${CYCPP} ${CCIN} ${PREPROCESSOR} ${CCFLAG} ${ORIG} ${INCL_ARGS}"
       )
@@ -100,13 +101,67 @@
   ENDIF(EXISTS "${HOUT}")

   # add tests
-  IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_name}_tests.cc")
+  SET(CCTIN "${CMAKE_CURRENT_SOURCE_DIR}/${_name}_tests.cc")
+  SET(CCTOUT "${BUILD_DIR}/${_name}_tests.cc")
+  SET(HTIN "${CMAKE_CURRENT_SOURCE_DIR}/${_name}_tests.h")
+  SET(HTOUT "${BUILD_DIR}/${_name}_tests.h")
+  SET(CMD "cp")
+  IF(EXISTS "${CCTIN}")
+    MESSAGE(STATUS "Copying ${CCTIN} to ${CCTOUT}.")
+    # FILE(COPY ${CCTIN} DESTINATION ${BUILD_DIR})
+    EXECUTE_PROCESS(COMMAND ${CMD} ${CCTIN} ${CCTOUT})
+    IF(EXISTS "${HTIN}")
+      MESSAGE(STATUS "Copying ${HTIN} to ${HTOUT}.")
+      # FILE(COPY ${HTIN} DESTINATION ${BUILD_DIR})
+      EXECUTE_PROCESS(COMMAND ${CMD} ${HTIN} ${HTOUT})
+      ADD_CUSTOM_COMMAND(
+      	OUTPUT ${HTOUT}
+      	OUTPUT ${CCTOUT}
+	COMMAND ${CMD} ${HTIN} ${HTOUT}
+	COMMAND ${CMD} ${CCTIN} ${CCTOUT}
+	DEPENDS ${HIN}
+	DEPENDS ${CCIN}
+	DEPENDS ${HTIN}
+	DEPENDS ${CCTIN}
+	COMMENT "Copying ${HTIN} to ${HTOUT}."
+	COMMENT "Copying ${CCTIN} to ${CCTOUT}."
+	)
+      # ADD_CUSTOM_TARGET(
+      # 	${_dir}TestCp ALL
+      # 	COMMAND ${CMD} ${HTIN} ${HTOUT}
+      # 	COMMAND ${CMD} ${CCTIN} ${CCTOUT}
+      # 	DEPENDS ${HTIN}
+      # 	DEPENDS ${CCTIN}
+      # 	COMMENT "Copying ${HTIN} to ${HTOUT}."
+      # 	COMMENT "Copying ${CCTIN} to ${CCTOUT}."
+      # 	)
+      SET("${_dir}TestHeader"
+	"${HTOUT}"
+	CACHE INTERNAL "CMake is really silly, the silliest, tin fact" FORCE
+	)
+    ELSE(EXISTS "${HTIN}")
+      ADD_CUSTOM_COMMAND(
+	OUTPUT ${CCTOUT}
+	COMMAND ${CMD} ${CCTIN} ${CCTOUT}
+	DEPENDS ${CCTIN}
+	DEPENDS ${CCIN}
+	COMMENT "Copying ${CCTIN} to ${CCTOUT}."
+	)
+      # ADD_CUSTOM_TARGET(
+      # 	${_dir}TestCp ALL
+      # 	COMMAND ${CMD} ${CCTIN} ${CCTOUT}
+      # 	DEPENDS ${CCTIN}
+      # 	COMMENT "Copying ${CCTIN} to ${CCTOUT}."
+      # 	)
+    ENDIF(EXISTS "${HTIN}")
     SET("${_dir}TestSource"
-      "${CMAKE_CURRENT_SOURCE_DIR}/${_name}_tests.cc"
-      "${CMAKE_CURRENT_SOURCE_DIR}/${_name}.cc"
-      CACHE INTERNAL "CMake is really silly, the silliest, in fact" FORCE
+      "${CCOUT}"
+      "${CCTOUT}"
+      CACHE INTERNAL "CMake is really silly, the silliest, tin fact" FORCE
       )
-  ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_name}_tests.cc")
+    ADD_LIBRARY(${_dir}Tests ${${_dir}TestSource})
+    TARGET_LINK_LIBRARIES(${_dir}Tests dl cycluscore ${CYCLUS_GTEST_LIBRARIES})
+  ENDIF(EXISTS "${CCTIN}")

   MESSAGE(STATUS "Finished construction of build files for agent: ${_dir}")
 ENDMACRO()


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 lib${lib_root}
+    LIBRARY DESTINATION cyclus/lib${lib_root}
     COMPONENT ${lib_root}
     )
   SET(


Fixed info line in cmake script when reporting CUDA architecture.

--- cmake/oskar_compiler_options.cmake
+++ cmake/oskar_compiler_options.cmake
@@ -28,7 +28,7 @@
     add_definitions(-Wall)
     add_definitions(-Wextra)
     add_definitions(-pedantic)
-
+
     add_definitions(-Wcast-align)
     add_definitions(-Wcast-qual)
     #add_definitions(-Wconversion)
@@ -46,7 +46,7 @@
     add_definitions(-Wall)
     add_definitions(-Wcheck)
     add_definitions(-wd2259)
-    add_definitions(-wd1125)
+    add_definitions(-wd1125)

 # === Microsoft visual studio compiler.
 elseif (MSVC) # visual studio compiler.
@@ -102,7 +102,7 @@

     message("================================================================================")
     if (NOT DEFINED CUDA_ARCH)
-        message("-- INFO: Building CUDA device code for native architecture.")
+        message("-- INFO: Building CUDA device code for architecture 1.0.")
         message("-- INFO: The target CUDA architecture can be changed by using the option:")
         message("-- INFO:   -DCUDA_ARCH=<arch>")
         message("-- INFO: where <arch> is one of:")


OpenCV 3.4.3-p4

OpenCV 3.4.3-p4

--- cmake/projects/OpenCV/hunter.cmake
+++ cmake/projects/OpenCV/hunter.cmake
@@ -21,6 +21,17 @@
     "https://github.com/hunter-packages/opencv/archive/v4.0.0-p0.tar.gz"
     SHA1
     90680ea3b971c2323e0049c48fa7867a1fd9f3fe
+)
+
+hunter_add_version(
+    PACKAGE_NAME
+    OpenCV
+    VERSION
+    "3.4.3-p4"
+    URL
+    "https://github.com/hunter-packages/opencv/archive/v3.4.3-p4.tar.gz"
+    SHA1
+    f1af13fd24cdb433240b1046b5e1391bb19ee748
 )

 hunter_add_version(


test.cmake: fix configuration in some corner cases

When people use qi_create_gtest(<target> NO_ADD_TESTS)
but use -DQI_WITH_TESTS=OFF we used to call
qi_use_lib(<target> GTEST) which failed because the target
did not exist.

Note that the workaround is to use qi_create_test_helper(),
so this fix is not really necessary

Change-Id: I406f3d2d5524137610f0a679f0176de954862927
Reviewed-on: http://gerrit.aldebaran.lan/61029
Tested-by: gerrit
Reviewed-by: vbarbaresi <371b46c96c99af52f4f920034e4fcb63ece5bdb5@aldebaran-robotics.com>

--- cmake/qibuild/internal/tests.cmake
+++ cmake/qibuild/internal/tests.cmake
@@ -32,7 +32,9 @@
     if(ARG_GMOCK_TEST)
       list(APPEND _deps GMOCK GMOCK_MAIN)
     endif()
-    qi_use_lib(${target_name} ${_deps})
+    if(TARGET ${target_name})
+      qi_use_lib(${target_name} ${_deps})
+    endif()
     return()
   endif()


fixed cmake default build type

fixed cmake default build type

--- cmake/setup_cached_variables.cmake
+++ cmake/setup_cached_variables.cmake
@@ -92,11 +92,11 @@
 #
 # Setup CMAKE_BUILD_TYPE:
 #
-
 SET(CMAKE_BUILD_TYPE
-  "DebugRelease"
+  ${DEAL_II_BUILD_TYPE}
   CACHE STRING
   "Choose the type of build, options are: Debug, Release and DebugRelease."
+  FORCE
   )

 # This is cruel, I know. But it is better to only have a known number of


Add Winmm.lib for timeBeginPeriod

Add Winmm.lib for timeBeginPeriod

--- data/findOpenFrameworks-v0.9.cmake
+++ data/findOpenFrameworks-v0.9.cmake
@@ -231,6 +231,7 @@
 find_library(ODBCCP_32 odbccp32)
 find_library(GLU_32 GLu32)
 find_library(WINMM winmm)
+find_library(WINMM Winmm)

 list(APPEND OF_LIBS
     ${MSIMG32}
@@ -253,9 +254,10 @@
     ${ODBC_32}
     ${ODBCCP_32}
     ${GLU_32}
-    )
-
-#OPENFRAMEORKS
+    ${WINMM}
+    )
+
+# OPENFRAMEORKS
 list(APPEND OF_INCLUDE_PATH
     ${OF_PATH}/libs/openFrameworks
     ${OF_PATH}/libs/openFrameworks/types


Adding the dl library only on UNIX platform

--- FindVTune.cmake
+++ FindVTune.cmake
@@ -42,7 +42,10 @@
   VTUNE_INCLUDE_DIR VTUNE_ITTNOTIFY_LIBRARY)

 set(VTUNE_INCLUDE_DIRS ${VTUNE_INCLUDE_DIR})
-set(VTUNE_LIBRARIES ${VTUNE_ITTNOTIFY_LIBRARY} dl)
+set(VTUNE_LIBRARIES ${VTUNE_ITTNOTIFY_LIBRARY})
+if(UNIX)
+  list(APPEND VTUNE_LIBRARIES dl)
+endif()
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DINTEL_NO_ITTNOTIFY_API")
 set(CMAKE_CXX_FLAGS_RELEASE
   "${CMAKE_CXX_FLAGS_RELEASE} -DINTEL_NO_ITTNOTIFY_API")


creates shared library for jsoncpp

creates shared library for jsoncpp

--- jsoncpp.cmake
+++ jsoncpp.cmake
@@ -30,7 +30,7 @@
         -DCMAKE_PREFIX_PATH=${BUILDEM_DIR}
         -DCMAKE_EXE_LINKER_FLAGS=${BUILDEM_LDFLAGS}
         -DDEPENDENCY_SEARCH_PREFIX=${BUILDEM_DIR}
-        -DCMAKE_CXX_FLAGS_RELEASE=-O3
+        -DJSONCPP_LIB_BUILD_SHARED=ON
         -DCMAKE_CXX_FLAGS_DEBUG="${CMAKE_CXX_FLAGS_DEBUG}"
     BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
@@ -38,7 +38,7 @@

 set_target_properties(${jsoncpp_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)

-set (json_LIB ${BUILDEM_DIR}/lib/libjsoncpp.a)
+set (json_LIB ${BUILDEM_DIR}/lib/libjsoncpp.so)
 set (json_INCLUDES ${BUILDEM_DIR}/include)

 message ("Including JSON include files from here: ${json_INCLUDES}")


fixed indentation

fixed indentation

--- cmake/FindCyclus.cmake
+++ cmake/FindCyclus.cmake
@@ -20,8 +20,8 @@
         FIND_PROGRAM(CYCLUS_BIN cyclus)
         IF(CYCLUS_BIN)
             EXECUTE_PROCESS(COMMAND cyclus --install-path
-            OUTPUT_VARIABLE CYCLUS_ROOT_DIR
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
+                OUTPUT_VARIABLE CYCLUS_ROOT_DIR
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
         ELSE(CYCLUS_BIN)
             SET(CYCLUS_ROOT_DIR "$ENV{HOME}/.local")
         ENDIF(CYCLUS_BIN)


r9509/sofa : cmake: fix FindOPENGL.cmake for macOS

Former-commit-id: 463ff3cebb0286f8d57447eb040e1ed6169d50cc

--- cmake/FindOPENGL.cmake
+++ cmake/FindOPENGL.cmake
@@ -28,7 +28,7 @@
 			find_path(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX")
 			#find_library(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX")
 			#find_library(OPENGL_glu_LIBRARY AGL DOC "AGL lib for OSX")
-			find_library(OPENGL_LIBRARY OpenGL DOC "OpenGL lib for OSX")
+			find_library(OPENGL_LIBRARIES OpenGL DOC "OpenGL lib for OSX")
 		else(APPLE)
 			find_path(OPENGL_INCLUDE_DIR GL/gl.h)
 			#find_library(OPENGL_gl_LIBRARY NAMES opengl32 OpenGL GL MesaGL)


Fix OPENVR_PLATFORM setting for OS X.

Fix OPENVR_PLATFORM setting for OS X.

--- cmake/FindOpenVR.cmake
+++ cmake/FindOpenVR.cmake
@@ -50,8 +50,9 @@

 set(_platform)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	# TODO
-	set(_platform_base macosx)
+	set(_platform_base osx)
+	# SteamVR only supports 32-bit on OS X
+	set(OPENVR_PLATFORM osx32)
 else()
 	if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 		set(_platform_base linux)