Android: Fixed rdp file association

Android: Fixed rdp file association

--- client/Android/aFreeRDP/AndroidManifest.xml.cmake
+++ client/Android/aFreeRDP/AndroidManifest.xml.cmake
@@ -25,18 +25,10 @@
 				</intent-filter>
 				<intent-filter>
 					<action android:name="android.intent.action.VIEW" />
-					<category android:name="android.intent.category.DEFAULT" />
-					<data
-						android:scheme="file"
-					    android:mimeType="application/x-rdp" />
-				</intent-filter>
-				<intent-filter>
-					<action android:name="android.intent.action.VIEW" />
-					<category android:name="android.intent.category.DEFAULT" />
-					<data
-				  		android:scheme="file"
-						android:pathPattern=".*\\.rdp"
-						android:mimeType="*/*" />
+					<category android:name="android.intent.category.DEFAULT" />
+	                <category android:name="android.intent.category.BROWSABLE" />
+	                <data android:scheme="http" android:host="*" android:pathPattern=".*\\.rdp" />
+    	            <data android:scheme="file" android:host="*" android:pathPattern=".*\\.rdp" />
 				</intent-filter>
 			</activity>


fix libzmqPkgConfigFallback.cmake for find library in macOS and MinGW

--- libzmqPkgConfigFallback.cmake
+++ libzmqPkgConfigFallback.cmake
@@ -2,9 +2,9 @@
 pkg_check_modules(PC_LIBZMQ QUIET libzmq)

 set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION})
-find_library(ZeroMQ_LIBRARY NAMES libzmq.so
+find_library(ZeroMQ_LIBRARY NAMES libzmq.so libzmq.dylib libzmq.dll
              PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS})
-find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq.a
+find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq.a libzmq.dll.a
              PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS})

 add_library(libzmq SHARED IMPORTED)


ENH: CMake config changes.

ENH: CMake config changes.

--- SegmentationEditor/WST.cmake
+++ SegmentationEditor/WST.cmake
@@ -14,17 +14,17 @@
 #

 IF (VTK_WRAP_TCL)
-  OPTION(WST_WRAP_TCL
+  OPTION(SEGMENTER_WRAP_TCL
          "Wrap classes into the TCL interpreted language."
          OFF)

-  IF (WST_WRAP_TCL)
+  IF (SEGMENTER_WRAP_TCL)

     IF (NOT VTK_WRAP_TCL_EXE)

       MESSAGE("Error. Unable to find VTK_WRAP_TCL_EXE, please edit this value to specify the correct location of the VTK Tcl wrapper.")
       MARK_AS_ADVANCED(CLEAR VTK_WRAP_TCL_EXE)
-      SET (WST_CAN_BUILD 0 CACHE INTERNAL)
+      SET (SEGMENTER_CAN_BUILD 0 CACHE INTERNAL)

     ELSE (NOT VTK_WRAP_TCL_EXE)

@@ -39,5 +39,5 @@
     ENDIF (NOT VTK_WRAP_TCL_EXE)

   SUBDIR_DEPENDS(Wrapping/Tcl Common)
-  ENDIF (WST_WRAP_TCL)
+  ENDIF (SEGMENTER_WRAP_TCL)
 ENDIF (VTK_WRAP_TCL)


0023066: [CEA 1509] CMake - Installation of a SALOME module should be movable

--- salome_adm/cmake_files/SalomeMacros.cmake
+++ salome_adm/cmake_files/SalomeMacros.cmake
@@ -752,7 +752,8 @@
   ENDIF()
   SET(_${PROJECT_NAME}_EXTRA_ENV_FULL "SET\(${PROJECT_NAME}_EXTRA_ENV ${_${PROJECT_NAME}_EXTRA_ENV}\)")
   FOREACH(_res ${_${PROJECT_NAME}_EXTRA_ENV})
-    SET(_${PROJECT_NAME}_EXTRA_ENV_FULL "${_${PROJECT_NAME}_EXTRA_ENV_FULL}\nSET\(${PROJECT_NAME}_EXTRA_ENV_${_res} ${_${PROJECT_NAME}_EXTRA_ENV_${_res}}\)")
+    STRING(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${PACKAGE_PREFIX_DIR}" _res_path "${_${PROJECT_NAME}_EXTRA_ENV_${_res}}")
+    SET(_${PROJECT_NAME}_EXTRA_ENV_FULL "${_${PROJECT_NAME}_EXTRA_ENV_FULL}\nSET\(${PROJECT_NAME}_EXTRA_ENV_${_res} ${_res_path}\)")
   ENDFOREACH()
 ENDMACRO(SALOME_ACCUMULATE_ENVIRONMENT)


Add libogg and libvorbis to CMake-based bootstrapper

--- bootstrap/windows.cmake
+++ bootstrap/windows.cmake
@@ -1,13 +1,14 @@
 cmake_minimum_required(VERSION 3.3)

 string(REPLACE "," ";" PACKAGES "${BUILD}")
-set(BUILD_DIR ${CMAKE_BINARY_DIR}/build)
-set(CACHE_DIR ${CMAKE_BINARY_DIR}/cache)
+set(BUILD_DIR ${CMAKE_BINARY_DIR}/.build)
+set(CACHE_DIR ${CMAKE_BINARY_DIR}/.cache)
+set(PREFIX_DIR ${CMAKE_BINARY_DIR})
 set(GENERATOR "Visual Studio 15 2017 Win64")

 function(y_cmake _dir)
   cmake_parse_arguments(_arg "" "" "OPTIONS" ${ARGN})
-  execute_process(COMMAND ${CMAKE_COMMAND} -G ${GENERATOR} ${BUILD_DIR}/${_dir} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} ${_arg_OPTIONS}
+  execute_process(COMMAND ${CMAKE_COMMAND} -G ${GENERATOR} ${BUILD_DIR}/${_dir} -DCMAKE_INSTALL_PREFIX=${PREFIX_DIR} ${_arg_OPTIONS}
     WORKING_DIRECTORY ${BUILD_DIR}/${_dir})
   execute_process(COMMAND ${CMAKE_COMMAND} --build ${BUILD_DIR}/${_dir} --config Release --target INSTALL -- /nologo /verbosity:minimal
     WORKING_DIRECTORY ${BUILD_DIR}/${_dir})
@@ -35,14 +36,27 @@
 endfunction()

 function(y_extract _name)
+  cmake_parse_arguments(_arg "" "DIR" "" ${ARGN})
   file(MAKE_DIRECTORY ${BUILD_DIR})
-  cmake_parse_arguments(_arg "" "DIR" "" ${ARGN})
   if(_arg_DIR AND EXISTS ${BUILD_DIR}/${_arg_DIR})
     message(STATUS "Removing: ${_arg_DIR}")
     file(REMOVE_RECURSE ${_arg_DIR})
   endif()
   message(STATUS "Extracting: ${_name}")
   execute_process(COMMAND ${CMAKE_COMMAND} -E tar xz ${CACHE_DIR}/${_name} WORKING_DIRECTORY ${BUILD_DIR})
+endfunction()
+
+function(y_git_clone _url)
+  cmake_parse_arguments(_arg "" "DIR" "" ${ARGN})
+  if(NOT Git_FOUND)
+    find_package(Git REQUIRED)
+  endif()
+  file(MAKE_DIRECTORY ${BUILD_DIR})
+  if(_arg_DIR AND EXISTS ${BUILD_DIR}/${_arg_DIR})
+    message(STATUS "Removing: ${_arg_DIR}")
+    file(REMOVE_RECURSE ${_arg_DIR})
+  endif()
+  execute_process(COMMAND ${GIT_EXECUTABLE} clone ${_url} WORKING_DIRECTORY ${BUILD_DIR})
 endfunction()

 macro(_y_add_package _package)
@@ -54,10 +68,10 @@
 endmacro()

 function(y_package _package)
+  cmake_parse_arguments(_arg "" "" "REQUIRES" ${ARGN})
   if("all" IN_LIST PACKAGES)
     _y_add_package(${_package})
   elseif(${_package} IN_LIST PACKAGES)
-    cmake_parse_arguments(_arg "" "" "REQUIRES" ${ARGN})
     foreach(_dependency ${_arg_REQUIRES})
       if(NOT ${_dependency} IN_LIST _y_packages)
         list(APPEND _dependencies ${_dependency})
@@ -79,11 +93,16 @@
 y_package(opengl)
 y_package(zlib)

+if("libogg" IN_LIST _y_packages)
+  y_git_clone("https://git.xiph.org/ogg.git" DIR "ogg")
+  y_cmake("ogg")
+endif()
+
 if("nasm" IN_LIST _y_packages)
   set(_version "2.13.03")
   y_download("https://www.nasm.us/pub/nasm/releasebuilds/${_version}/win64/nasm-${_version}-win64.zip" SHA1 "149a814fa53980976a7fc081231f59cfbcd02543")
   y_extract("nasm-${_version}-win64.zip" DIR "nasm-${_version}")
-  file(INSTALL ${BUILD_DIR}/nasm-${_version}/nasm.exe DESTINATION ${CMAKE_BINARY_DIR}/bin)
+  file(INSTALL ${BUILD_DIR}/nasm-${_version}/nasm.exe DESTINATION ${PREFIX_DIR}/bin)
 endif()

 if("openal" IN_LIST _y_packages)
@@ -91,8 +110,8 @@
   y_download("http://openal-soft.org/openal-binaries/openal-soft-${_version}-bin.zip" SHA1 "0d2edd1b77cbb998f12e064d0eefea3508446776")
   y_download("https://openal.org/downloads/oalinst.zip" SHA1 "45e08368c6755c58902b7746ff3e51ad2df8a8b8")
   y_extract("openal-soft-${_version}-bin.zip")
-  file(INSTALL ${BUILD_DIR}/openal-soft-${_version}-bin/include DESTINATION ${CMAKE_BINARY_DIR})
-  file(INSTALL ${BUILD_DIR}/openal-soft-${_version}-bin/libs DESTINATION ${CMAKE_BINARY_DIR})
+  file(INSTALL ${BUILD_DIR}/openal-soft-${_version}-bin/include DESTINATION ${PREFIX_DIR})
+  file(INSTALL ${BUILD_DIR}/openal-soft-${_version}-bin/libs DESTINATION ${PREFIX_DIR})
   y_extract("oalinst.zip")
   execute_process(COMMAND ${BUILD_DIR}/oalinst.exe /s)
 endif()
@@ -101,9 +120,9 @@
   y_download("https://khronos.org/registry/OpenGL/api/GL/glext.h")
   y_download("https://khronos.org/registry/OpenGL/api/GL/wglext.h")
   y_download("https://khronos.org/registry/EGL/api/KHR/khrplatform.h")
-  file(INSTALL ${CACHE_DIR}/glext.h DESTINATION ${CMAKE_BINARY_DIR}/include/GL)
-  file(INSTALL ${CACHE_DIR}/wglext.h DESTINATION ${CMAKE_BINARY_DIR}/include/GL)
-  file(INSTALL ${CACHE_DIR}/khrplatform.h DESTINATION ${CMAKE_BINARY_DIR}/include/KHR)
+  file(INSTALL ${CACHE_DIR}/glext.h DESTINATION ${PREFIX_DIR}/include/GL)
+  file(INSTALL ${CACHE_DIR}/wglext.h DESTINATION ${PREFIX_DIR}/include/GL)
+  file(INSTALL ${CACHE_DIR}/khrplatform.h DESTINATION ${PREFIX_DIR}/include/KHR)
 endif()

 if("zlib" IN_LIST _y_packages)
@@ -126,3 +145,8 @@
   y_extract("libpng-${_version}.tar.xz" DIR "libpng-${_version}")
   y_cmake("libpng-${_version}" OPTIONS -DPNG_TESTS=OFF -DSKIP_INSTALL_EXECUTABLES=ON -DSKIP_INSTALL_EXPORT=ON -DSKIP_INSTALL_FILES=ON -DSKIP_INSTALL_PROGRAMS=ON)
 endif()
+
+if("libvorbis" IN_LIST _y_packages)
+  y_git_clone("https://git.xiph.org/vorbis.git" DIR "vorbis")
+  y_cmake("vorbis" OPTIONS -DOGG_ROOT=${PREFIX_DIR})
+endif()


FIX (#3156): Fix for a "bug" in CMake, which does not include all transitive link libraries for a given target, in this case the TARGET_LINK_LIBRARIES were not set correctly for cppUnit in debug mode.

--- openCherry/CMake/MacroCreatePlugin.cmake
+++ openCherry/CMake/MacroCreatePlugin.cmake
@@ -154,6 +154,12 @@
                         optimized "PocoUtil" debug "PocoUtil${OPENCHERRY_DEBUG_POSTFIX}"
                         optimized "PocoXML" debug "PocoXML${OPENCHERRY_DEBUG_POSTFIX}")

+  # Fix a "bug" in CMake, which does not include all transitive link libraries for a given target
+  LIST(FIND PLUGIN_LINK_LIBRARIES org_opencherry_test _is_unittest_plugin)
+  IF(NOT _is_unittest_plugin EQUAL -1)
+    TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} optimized CppUnit debug CppUnitd)
+  ENDIF()
+
   #SET_TARGET_PROPERTIES(${PLUGIN_TARGET} PROPERTIES PREFIX lib IMPORT_PREFIX lib)
   SET_TARGET_PROPERTIES(${PLUGIN_TARGET} PROPERTIES PREFIX lib)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 08)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 06)

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


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 08)

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


Improve sf_count_t detection

Improve sf_count_t detection

--- cmake/check.cmake
+++ cmake/check.cmake
@@ -35,7 +35,6 @@
 check_include_file(sys/types.h      HAVE_SYS_TYPES_H)
 check_include_file(sys/wait.h       HAVE_SYS_WAIT_H)
 check_include_file(unistd.h         HAVE_UNISTD_H)
-
 check_type_size(int64_t                 SIZEOF_INT64_T)
 check_type_size(double                  SIZEOF_DOUBLE)
 check_type_size(float                   SIZEOF_FLOAT)
@@ -44,13 +43,37 @@
 check_type_size(long                    SIZEOF_LONG)
 check_type_size(long\ long              SIZEOF_LONG_LONG)
 check_type_size(offt64_t                SIZEOF_OFF64_T)
-check_type_size(${TYPEOF_SF_COUNT_T}    SIZEOF_SF_COUNT_T)
 check_type_size(off_t                   SIZEOF_OFF_T)
 check_type_size(short                   SIZEOF_SHORT)
 check_type_size(size_t                  SIZEOF_SIZE_T)
 check_type_size(ssize_t                 SIZEOF_SSIZE_T)
 check_type_size(void*                   SIZEOF_VOIDP)
 check_type_size(wchar_t                 SIZEOF_WCHAR_T)
+
+if (WIN32)
+set (TYPEOF_SF_COUNT_T "__int64")
+set (SF_COUNT_MAX "0x7FFFFFFFFFFFFFFFLL")
+set (SIZEOF_SF_COUNT_T 8)
+else ()
+
+if ((SIZEOF_OFF_T EQUAL 8) OR (SIZEOF_LOFF_T EQUAL 8) OR (SIZEOF_OFF64_T EQUAL 8))
+set (TYPEOF_SF_COUNT_T "int64_t")
+set (SF_COUNT_MAX "0x7FFFFFFFFFFFFFFFLL")
+set (SIZEOF_SF_COUNT_T 8)
+else ()
+# TODO: Check 64-bit support
+endif ()
+
+# Fallback to long
+if (NOT TYPEOF_SF_COUNT_T)
+set (TYPEOF_SF_COUNT_T "long")
+set (SF_COUNT_MAX "0x7FFFFFFF")
+set (SIZEOF_SF_COUNT_T 4)
+endif ()
+
+check_type_size(${TYPEOF_SF_COUNT_T} SIZEOF_SF_COUNT_T)
+
+endif ()

 find_library (M_LIBRARY m)
 # M is found


Fix  CUDA_VERSION Comparsion (#165)

Fix  CUDA_VERSION Comparsion (#165)

--- cmake/flags.cmake
+++ cmake/flags.cmake
@@ -88,15 +88,15 @@

 # Common gpu architectures: Kepler, Maxwell
 foreach(capability 30 35 50)
-    list(APPEND __arch_flags " -gencode arch=compute_${capability},code=sm_${capability}")
+      list(APPEND __arch_flags " -gencode arch=compute_${capability},code=sm_${capability}")
 endforeach()

-if (CUDA_VERSION VERSION_GREATER "7.0")
+if (CUDA_VERSION VERSION_GREATER "7.0" OR CUDA_VERSION VERSION_EQUAL "7.0")
       list(APPEND __arch_flags " -gencode arch=compute_52,code=sm_52")
 endif()

 # Modern gpu architectures: Pascal
-if (CUDA_VERSION VERSION_GREATER "8.0")
+if (CUDA_VERSION VERSION_GREATER "8.0" OR CUDA_VERSION VERSION_EQUAL "8.0")
       list(APPEND __arch_flags " -gencode arch=compute_60,code=sm_60")
 endif()


KAA-1348 Fix unknown CMake command cmake_parse_arguments

--- client/client-multi/client-c/listfiles/UnitTest.cmake
+++ client/client-multi/client-c/listfiles/UnitTest.cmake
@@ -20,6 +20,7 @@
     set(MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-reachable=yes --trace-children=yes -v")

     include(CTest)
+    include(CMakeParseArguments)
 endif()

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


PHASTA project paths

PHASTA project paths

--- phSolver/compressible/test/testing.cmake
+++ phSolver/compressible/test/testing.cmake
@@ -1,11 +1,11 @@
 set(CDIR ${CASES}/compressible)
 add_test(copyInpCfg
-  cp ${CMAKE_SOURCE_DIR}/phSolver/common/input.config ${CDIR})
+  cp ${PHASTA_SOURCE_DIR}/phSolver/common/input.config ${CDIR})
 add_test(resetNumStart
   cp ${CDIR}/numstart.dat ${CDIR}/2-procs_case/numstart.dat)
 add_test(
   NAME compressible
-  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 2 ${CMAKE_BINARY_DIR}/bin/phastaC.exe
+  COMMAND ${MPIRUN} ${MPIRUN_PROCFLAG} 2 ${PHASTA_BINARY_DIR}/bin/phastaC.exe
   WORKING_DIRECTORY ${CASES}/compressible
 )
 add_test(compareCompressible


Check correct variable when determining if there was an error, take 2.

--- test/remote/SvnPackage.cmake
+++ test/remote/SvnPackage.cmake
@@ -178,7 +178,7 @@
     execute_process (COMMAND "${svn}" delete "${svndir}/${relpath}"
       OUTPUT_VARIABLE output ERROR_VARIABLE output RESULT_VARIABLE result)
     file (APPEND "${changeslogfile}" "${output}")
-    if (result_var)
+    if (result)
       set (${result_var} ${result} PARENT_SCOPE)
       return ()
     endif ()


Adding missing FindPackageHandlesStandardArgs include. (#36)

This seems to be needed in some versions of cmake.

Co-authored-by: Ben Mort <a7ebd3512288aeb6d9d3e819510e2059f518efb3@users.noreply.gitlab.com>

--- oskar/ms/cmake/FindCASACORE.cmake
+++ oskar/ms/cmake/FindCASACORE.cmake
@@ -78,6 +78,7 @@

 # handle the QUIETLY and REQUIRED arguments and set CASACORE_FOUND to TRUE if
 # all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(CASACORE DEFAULT_MSG
     CASACORE_LIBRARIES CASACORE_INCLUDE_DIR)


fix HAVE_INT128_TRAITS cmake test

fix HAVE_INT128_TRAITS cmake test

Summary:
C++17 defined integer traits for `__int128` as well as a (trivial) std::hash,
this diff adds the check in `FOLLY_SUPPLY_MISSING_INT128_TRAITS`.

There was an unintended linebreak in the cmake test which rendered it non
functional. This diff fixes it.

Original issue:
https://github.com/facebook/folly/commit/b2b96f59c57cd7aba686cc4f61ceba0314cdeb72#comments

Reviewed By: yfeldblum

Differential Revision: D7138006

fbshipit-source-id: ca1841b9ca847f1f6570b58e95380f50fe092345

--- CMake/FollyConfigChecks.cmake
+++ CMake/FollyConfigChecks.cmake
@@ -131,8 +131,8 @@
                      __int128>::value,
       \"signed form of 'unsigned __uint128' must be '__int128'.\");
     static_assert(
-        sizeof(::std::hash<__int128>{}(0)) > 0, \"std::hash<__int128> is
-        disabled.\");
+        sizeof(::std::hash<__int128>{}(0)) > 0, \
+        \"std::hash<__int128> is disabled.\");
     int main() { return 0; }"
     HAVE_INT128_TRAITS
   )


[OGRE-273] Correct the case of the Ogre framework name to match what we build.

--HG--
branch : v1-9

--- CMake/Packages/FindOGRE.cmake
+++ CMake/Packages/FindOGRE.cmake
@@ -162,7 +162,7 @@
 	use_pkgconfig(OGRE_PKGC "OGRE${OGRE_LIB_SUFFIX}")

 	# try to find framework on OSX
-	findpkg_framework(OGRE)
+	findpkg_framework(Ogre)
 else()
 	set(OGRE_LIBRARY_FWK "")
 endif()


Revert "Disable error from default template arguments in functions"

This reverts commit 93802ad1162132f4454a9f1678eea34ec8eb573f. This
didn't fix the problem, just introduces another error.

--- CMake/SurgSimBuildFlags.cmake
+++ CMake/SurgSimBuildFlags.cmake
@@ -89,13 +89,10 @@
 	# Enable parallel builds:
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")

-	if(SURGSIM_WARNINGS_AS_ERRORS)
+	if (SURGSIM_WARNINGS_AS_ERRORS)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
 	endif(SURGSIM_WARNINGS_AS_ERRORS)

-	# Allow for default template arguments in function templates, permitted in C++11
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w14519 /wd4519")
-
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")  # is this needed?
 	set(CMAKE_DEBUG_POSTFIX "d")


FIX: Add default module libs to samples when building static configuration.

--- cmake/CEGUIMacros.cmake
+++ cmake/CEGUIMacros.cmake
@@ -81,6 +81,14 @@
         ${CEGUI_SAMPLEHELPER_LIBNAME}
     )

+    if (NOT BUILD_SHARED_LIBS)
+        target_link_libraries(${CEGUI_TARGET_NAME}
+            "CEGUI${CEGUI_OPTION_DEFAULT_XMLPARSER}"
+            "CEGUI${CEGUI_OPTION_DEFAULT_IMAGECODEC}"
+            ${CEGUI_FALAGARD_WR_LIBNAME}
+        )
+    endif()
+
     if (UNIX AND NOT APPLE AND NOT WIN32)
         install(TARGETS ${CEGUI_TARGET_NAME}
             RUNTIME DESTINATION bin


static and dynamic build fix

static and dynamic build fix

--- cmake/CEGUIMacros.cmake
+++ cmake/CEGUIMacros.cmake
@@ -137,14 +137,31 @@
 #
 macro (cegui_add_dependency _TARGET_NAME _DEP_NAME)
 # Optional additional arguments: "SCOPE" "IS_SYSTEM"
+    get_target_property(_DYNAMIC_EXISTS ${_TARGET_NAME} TYPE)
+    get_target_property(_STATIC_EXISTS ${_TARGET_NAME}_Static TYPE)
     if ("${ARGC}" GREATER 2)
         if (("${ARGC}" GREATER 3) AND "${ARGV3}")
-            target_include_directories(${_TARGET_NAME} SYSTEM "${ARGV2}" ${${_DEP_NAME}_INCLUDE_DIR})
+            if (_DYNAMIC_EXISTS)
+                target_include_directories(${_TARGET_NAME} SYSTEM "${ARGV2}" ${${_DEP_NAME}_INCLUDE_DIR})
+            endif()
+            if (_STATIC_EXISTS)
+                target_include_directories(${_TARGET_NAME}_Static SYSTEM "${ARGV2}" ${${_DEP_NAME}_INCLUDE_DIR})
+            endif()
         else ()
-            target_include_directories(${_TARGET_NAME} "${ARGV2}" ${${_DEP_NAME}_INCLUDE_DIR})
+            if (_DYNAMIC_EXISTS)
+                target_include_directories(${_TARGET_NAME} "${ARGV2}" ${${_DEP_NAME}_INCLUDE_DIR})
+            endif()
+            if (_STATIC_EXISTS)
+                target_include_directories(${_TARGET_NAME}_Static "${ARGV2}" ${${_DEP_NAME}_INCLUDE_DIR})
+            endif()
         endif ()
     else ()
-        target_include_directories(${_TARGET_NAME} PRIVATE ${${_DEP_NAME}_INCLUDE_DIR})
+        if (_DYNAMIC_EXISTS)
+            target_include_directories(${_TARGET_NAME} PRIVATE ${${_DEP_NAME}_INCLUDE_DIR})
+        endif()
+        if (_STATIC_EXISTS)
+            target_include_directories(${_TARGET_NAME}_Static PRIVATE ${${_DEP_NAME}_INCLUDE_DIR})
+        endif()
     endif ()

     ###########################################################################
@@ -172,8 +189,6 @@
     ###########################################################################
     #    ADD DEPENDENCY DEFS TO STATIC VERSION OF TARGET (if it exists)
     ###########################################################################
-    get_target_property(_STATIC_EXISTS ${_TARGET_NAME}_Static TYPE)
-
     if (_STATIC_EXISTS)
         if (${_DEP_NAME}_DEFINITIONS)
             set_property( TARGET ${_TARGET_NAME}_Static APPEND PROPERTY COMPILE_DEFINITIONS ${${_DEP_NAME}_DEFINITIONS} )
@@ -688,4 +703,4 @@
             message(SEND_ERROR "${_DEFAULTVAR} is set to ${_MODNAME} but this module is not going to be built (see ${_BUILDVAR})")
         endif()
     endif()
-endmacro()+endmacro()


Handle directory contents that change (without the directory changing) better

--- cmake/FindJsonCpp.cmake
+++ cmake/FindJsonCpp.cmake
@@ -63,20 +63,39 @@
 # and we need to call it at least once every CMake invocation to create the original
 # imported targets, since those don't stick around like cache variables.
 find_package(jsoncpp QUIET NO_MODULE)
-#message("Searching for config file result: jsoncpp_FOUND ${jsoncpp_FOUND}")
-
-if(jsoncpp_FOUND AND NOT "[${jsoncpp_DIR}]" STREQUAL "${JSONCPP_CACHED_JSONCPP_DIR_DETAILS}")
-	# If we found something, and it's not the exact same as what we've found before...
-	# NOTE: The contents of this "if" block update only (internal) cache variables!
-	# (since this will only get run the first CMake pass that finds jsoncpp or that finds a different install)
-	#message("Updating jsoncpp cache variables!")
-	set(JSONCPP_CACHED_JSONCPP_DIR_DETAILS "[${jsoncpp_DIR}]" CACHE INTERNAL "" FORCE)
+
+if(jsoncpp_FOUND)
+	# Build a string to help us figure out when to invalidate our cache variables.
+	# start with where we found jsoncpp
+	set(__jsoncpp_info_string "[${jsoncpp_DIR}]")
+
+	# part of the string to indicate if we found a real jsoncpp_lib (and what kind)
+	_jsoncpp_check_for_real_jsoncpplib()
+	if(__jsoncpp_have_jsoncpplib)
+		list(APPEND __jsoncpp_info_string "[${__jsoncpp_lib_type}]")
+	else()
+		list(APPEND __jsoncpp_info_string "[]")
+	endif()
+	# part of the string to indicate if we found jsoncpp_lib_static
+	if(TARGET jsoncpp_lib_static)
+		list(APPEND __jsoncpp_info_string "[T]")
+	else()
+		list(APPEND __jsoncpp_info_string "[]")
+	endif()
+endif()
+
+
+# If we found something, and it's not the exact same as what we've found before...
+# NOTE: The contents of this "if" block update only (internal) cache variables!
+# (since this will only get run the first CMake pass that finds jsoncpp or that finds a different/updated install)
+if(jsoncpp_FOUND AND NOT __jsoncpp_info_string STREQUAL "${JSONCPP_CACHED_JSONCPP_DIR_DETAILS}")
+	#message("Updating jsoncpp cache variables! ${__jsoncpp_info_string}")
+	set(JSONCPP_CACHED_JSONCPP_DIR_DETAILS "${__jsoncpp_info_string}" CACHE INTERNAL "" FORCE)
 	unset(JSONCPP_IMPORTED_LIBRARY_SHARED)
 	unset(JSONCPP_IMPORTED_LIBRARY_STATIC)
 	unset(JSONCPP_IMPORTED_LIBRARY)
 	unset(JSONCPP_IMPORTED_INCLUDE_DIRS)
 	unset(JSONCPP_IMPORTED_LIBRARY_IS_SHARED)
-	_jsoncpp_check_for_real_jsoncpplib()

 	# if(__jsoncpp_have_jsoncpplib) is equivalent to if(TARGET jsoncpp_lib) except it excludes our
 	# "invented" jsoncpp_lib interface targets, made for convenience purposes after this block.


Fixed LPSolve detection for CMake.

Fixed LPSolve detection for CMake.

--- cmake/FindLPSolve.cmake
+++ cmake/FindLPSolve.cmake
@@ -55,12 +55,18 @@
 			CHECK_CXX_SOURCE_COMPILES("${LPSOLVE_TRY_CODE}" LPSOLVE_LINKS_ALONE)
 			SET(CMAKE_REQUIRED_LIBRARIES "")

+			## Try to find out if lpsolve can link with some extra libs
 			IF (NOT LPSOLVE_LINKS_ALONE)
-				## Try to find out if lpsolve can link standalone
-				SET(CMAKE_REQUIRED_LIBRARIES ${LPSOLVE_LIBRARIES} "dl")
-				CHECK_CXX_SOURCE_COMPILES("${LPSOLVE_TRY_CODE}" LPSOLVE_LINKS_WITH_LDL)
+				FIND_LIBRARY(LPSOLVE_LIB_DL "dl")
+				FIND_LIBRARY(LPSOLVE_LIB_COLAMD "colamd")
+
+				LIST(APPEND LPSOLVE_LIBRARIES "${LPSOLVE_LIB_DL}" "${LPSOLVE_LIB_COLAMD}")
+
+				SET(CMAKE_REQUIRED_LIBRARIES ${LPSOLVE_LIBRARIES})
+				CHECK_CXX_SOURCE_COMPILES("${LPSOLVE_TRY_CODE}" LPSOLVE_LINKS_WITH_EXTRA_LIBS)
 				SET(CMAKE_REQUIRED_LIBRARIES "")
-				IF (NOT LPSOLVE_LINKS_WITH_LDL)
+
+				IF (NOT LPSOLVE_LINKS_WITH_EXTRA_LIBS)
 					MESSAGE(SEND_ERROR "Could not link against lpsolve55!")
 				ENDIF()
 			ENDIF()


Update FindMSGPACK.cmake pkg-config search module

--- cmake/FindMSGPACK.cmake
+++ cmake/FindMSGPACK.cmake
@@ -1,6 +1,8 @@
 find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
-  pkg_check_modules(SHARED_MSGPACK REQUIRED msgpack)
+  pkg_search_module(PC_MSGPACK QUIET
+      msgpackc>=${Msgpack_FIND_VERSION}
+      msgpack>=${Msgpack_FIND_VERSION})
 endif()

 find_path(MSGPACK_INCLUDE_DIR msgpack.h


incorrect minizip cmake variable used

incorrect minizip cmake variable used

--- cmake/FindMiniZip.cmake
+++ cmake/FindMiniZip.cmake
@@ -15,9 +15,9 @@
     set(MINIZIP_INCLUDE_DIR ${MINIZIP_INCLUDE_DIR}/minizip CACHE PATH "minizip includes")
 endif ()

-find_library(MINIZIP_LIBRARY NAMES minizip)
+find_library(MINIZIP_LIBRARIES NAMES minizip)

-if (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY)
+if (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARIES)
   set(MINIZIP_FOUND TRUE)
 endif ()


[cmake] force rm.

[cmake] force rm.

--- cmake/Windeployqt.cmake
+++ cmake/Windeployqt.cmake
@@ -41,7 +41,7 @@
 	# execute windeployqt in a tmp directory after build
     add_custom_command(TARGET ${target}
         POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/windeployqt"
+        COMMAND ${CMAKE_COMMAND} -E rm -rf "${CMAKE_CURRENT_BINARY_DIR}/windeployqt"
         COMMAND set PATH="${_qt_bin_dir}"
         COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/windeployqt"
         COMMAND "${WINDEPLOYQT_EXECUTABLE}" --dir "${CMAKE_CURRENT_BINARY_DIR}/windeployqt" --verbose 0 --no-compiler-runtime --no-translations --no-angle --release --no-opengl-sw "$<TARGET_FILE:${target}>"


reorder libs

reorder libs

--- cmake/custom/test.cmake
+++ cmake/custom/test.cmake
@@ -58,9 +58,9 @@

         target_link_libraries(
             fortran_test
+            ${BALBOA_LIBS}
             xcint_fortran
             ${NUMGRID_LIBS}
-            ${BALBOA_LIBS}
             )

         set_target_properties(fortran_test PROPERTIES LINKER_LANGUAGE Fortran)


Added path for GLEWmx for Tegra

Added path for GLEWmx for Tegra

--- common/FindGLEWmx.cmake
+++ common/FindGLEWmx.cmake
@@ -40,6 +40,7 @@
         /usr/lib64
         /usr/lib
         /usr/lib/x86_64-linux-gnu
+        /usr/lib/arm-linux-gnueabihf
         /usr/local/lib64
         /usr/local/lib
         /sw/lib


Updates to the CMake files

Updates to the CMake files

--- Resources/CMake/FindSupportLibraries.cmake
+++ Resources/CMake/FindSupportLibraries.cmake
@@ -11,6 +11,7 @@
 SET (Boost_USE_SYSTEM TRUE)
 SET (Boost_USE_UNIT_TEST_FRAMEWORK TRUE)
 SET (Boost_USE_TEST_EXEC_MONITOR TRUE)
+SET (Boost_USE_PROGRAM_OPTIONS TRUE)

 INCLUDE (${MXA_CMAKE_DIR}/MXAFindBoost.cmake)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})  # Include the Boost Headers


cmake: Fix description and display name.

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

 ### general settings
 set(CPACK_PACKAGE_NAME ${APPLICATION_NAME})
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The lightweight C unit testing library")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Unit testing framework for C with mock objects")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
 set(CPACK_PACKAGE_VENDOR "Andreas Schneider")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
@@ -29,7 +29,7 @@
     find_package(NSIS)
     if (NSIS_MAKE)
         set(CPACK_GENERATOR "${CPACK_GENERATOR};NSIS")
-        set(CPACK_NSIS_DISPLAY_NAME ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
+        set(CPACK_NSIS_DISPLAY_NAME "CMocka")
         set(CPACK_NSIS_COMPRESSOR "/SOLID zlib")
         set(CPACK_NSIS_MENU_LINKS "http://cmocka.org/" "cmocka homepage")
     endif (NSIS_MAKE)


ENH: Prefer https vs http for ctest submission.

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -1,7 +1,7 @@
 set(CTEST_PROJECT_NAME "ITK")
 set(CTEST_NIGHTLY_START_TIME "1:00:00 UTC")

-set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "open.cdash.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=Insight")
 set(CTEST_DROP_SITE_CDASH TRUE)


Add ability to specify SCRIPT template file when creating environment

--- scripts/EnvironmentScript.cmake
+++ scripts/EnvironmentScript.cmake
@@ -83,8 +83,11 @@
 include(CMakeParseArguments)

 function(create_environment_script)
-    cmake_parse_arguments(env "PYTHON" "PATH;EXECUTABLE;WORKING_DIRECTORY"
-        "" ${ARGN})
+    cmake_parse_arguments(env
+        "PYTHON"
+        "SCRIPT;PATH;EXECUTABLE;WORKING_DIRECTORY"
+        "" ${ARGN}
+    )
     if(NOT env_PATH)
         set(env_PATH "${CMAKE_CURRENT_BINARY_DIR}/envscript.sh")
     endif()
@@ -95,10 +98,13 @@
     if(NOT env_PYTHON)
         set(env_PYTHON "")
     endif()
+    if(NOT env_SCRIPT)
+        set(env_SCRIPT "${_PATH_TO_LOCALBASH_IN}")
+    endif()

     get_filename_component(filename "${env_PATH}" NAME)
     get_filename_component(directory "${env_PATH}" PATH)
-    configure_file("${_PATH_TO_LOCALBASH_IN}"
+    configure_file("${env_SCRIPT}"
         "${PROJECT_BINARY_DIR}/CMakeFiles/${filename}"
         @ONLY
     )


hm it seems cmake does not understand CYGWIN (=> UNIX)

--HG--
extra : convert_revision : svn%3A283d02a7-25f6-0310-bc7c-ecb5cbfe19da/trunk/kdesupport/eigen2%40910164

--- test/testsuite.cmake
+++ test/testsuite.cmake
@@ -1,7 +1,7 @@

 ####################################################################
 #
-# Usage:
+# Usage:
 #  - create a new folder, let's call it cdash
 #  - in that folder, do:
 #    ctest -S path/to/eigen2/test/testsuite.cmake[,option1=value1[,option2=value2]]
@@ -51,25 +51,25 @@
   # pick first
   string(REGEX MATCH "([^,]*)(,.*)?" DUMMY ${ARGLIST})
   SET(TOP ${CMAKE_MATCH_1})
-
+
   # remove first
   string(REGEX MATCHALL "[^,]*,(.*)" DUMMY ${ARGLIST})
   SET(ARGLIST ${CMAKE_MATCH_1})
-
+
   # decompose as a pair key=value
   string(REGEX MATCH "([^=]*)(=.*)?" DUMMY ${TOP})
   SET(KEY ${CMAKE_MATCH_1})
-
+
   string(REGEX MATCH "[^=]*=(.*)" DUMMY ${TOP})
   SET(VALUE ${CMAKE_MATCH_1})
-
+
   # set the variable to the specified value
   if(VALUE)
     SET(${KEY} ${VALUE})
   else(VALUE)
     SET(${KEY} ON)
   endif(VALUE)
-
+
 endwhile(${ARGLIST} MATCHES ".+.*")

 ####################################################################
@@ -158,7 +158,7 @@

 # this is the initial cache to use for the binary tree, be careful to escape
 # any quotes inside of this string if you use it
-if(WIN32 AND NOT CYGWIN)
+if(WIN32 AND NOT UNIX)
   #message(SEND_ERROR "win32")
   set(CTEST_CMAKE_COMMAND "${CTEST_CMAKE_COMMAND} -G \"NMake Makefiles\" -DCMAKE_MAKE_PROGRAM=nmake")
   SET (CTEST_INITIAL_CACHE "
@@ -168,12 +168,12 @@
     BUILDNAME:STRING=${EIGEN_BUILD_STRING}
     SITE:STRING=${EIGEN_SITE}
   ")
-else(WIN32 AND NOT CYGWIN)
+else(WIN32 AND NOT UNIX)
   SET (CTEST_INITIAL_CACHE "
     BUILDNAME:STRING=${EIGEN_BUILD_STRING}
     SITE:STRING=${EIGEN_SITE}
   ")
-endif(WIN32 AND NOT CYGWIN)
+endif(WIN32 AND NOT UNIX)

 # set any extra environment variables to use during the execution of the script here:


use NO_MODULE to prevent recursive find_package

The recursive find_package occurred when the
Module called find_package on the same name with
a different cast on a system with a case
insensitive filesystem, like with os x.

--- opensplice_cmake_module/cmake/Modules/FindOpenSplice.cmake
+++ opensplice_cmake_module/cmake/Modules/FindOpenSplice.cmake
@@ -67,7 +67,7 @@
   set(OpenSplice_FOUND TRUE)
 else()
   # try to find_package() it
-  find_package(opensplice REQUIRED COMPONENTS CXX)
+  find_package(opensplice NO_MODULE REQUIRED COMPONENTS CXX PATHS /usr /usr/local)
   if(OPENSPLICE_FOUND)
     message(STATUS "Found PrismTech OpenSplice: ${opensplice_DIR}")
     set(OpenSplice_HOME "${OPENSPLICE_PREFIX}")


Better CMAKE

Better CMAKE

--- boards/avr.cmake
+++ boards/avr.cmake
@@ -38,24 +38,21 @@

     add_custom_target (
         flash
-        sudo ${AVRDUDE} -p ${MCU} -v -c ${PROGRAMMER} -P ${PORT} -U flash:w:"${CMAKE_PROJECT_NAME}.hex"
+        sudo ${AVRDUDE} -p ${MCU} -v -c ${PROGRAMMER} -P ${PORT} -B5 -U flash:w:"${CMAKE_PROJECT_NAME}.hex"
         DEPENDS hex
         COMMENT "Flashing ${CMAKE_PROJECT_NAME}.hex"
         )

     add_custom_target (
         get_fuses
-        sudo ${AVRDUDE} -p ${MCU} -c ${PROGRAMMER} -P ${PORT} -n
-            -U lfuse:r:-:b
-            -U hfuse:r:-:b
+        sudo ${AVRDUDE} -p ${MCU} -c ${PROGRAMMER} -P ${PORT} -n -U lfuse:r:-:b -U hfuse:r:-:b
             COMMENT "Get fuses from ${MCU}"
         )

     if( DEFINED L_FUSE )
         add_custom_target (
             set_fuses
-            sudo ${AVRDUDE} -p ${MCU} -c ${PROGRAMMER} -P ${PORT}
-                -U lfuse:w:${L_FUSE}:m
+            sudo ${AVRDUDE} -p ${MCU} -c ${PROGRAMMER} -P ${PORT} -U lfuse:w:${L_FUSE}:m
                 COMMENT "Setup:\n Low Fuse: ${L_FUSE}"
             )
     endif( DEFINED L_FUSE )


Some more work on getting the Mac OS X version to build fine (#87).

--- cmake/common.cmake
+++ cmake/common.cmake
@@ -433,6 +433,18 @@
                                                                  ${MAC_OS_X_PROJECT_BINARY_DIR}/Contents/PlugIns/${MAIN_PROJECT_NAME}/${PLUGIN_FILENAME})
         ENDFOREACH()

+        # Make sure that the plugin refers to our embedded version of the other
+        # binary plugins on which it depends
+
+        FOREACH(OPENCOR_BINARY_DEPENDENCY ${OPENCOR_BINARY_DEPENDENCIES})
+            STRING(REPLACE "${PLUGIN_BUILD_DIR}/" "" OPENCOR_BINARY_DEPENDENCY "${OPENCOR_BINARY_DEPENDENCY}")
+
+            ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
+                               COMMAND install_name_tool -change ${OPENCOR_BINARY_DEPENDENCY}
+                                                                 @executable_path/../PlugIns/${MAIN_PROJECT_NAME}/${OPENCOR_BINARY_DEPENDENCY}
+                                                                 ${MAC_OS_X_PROJECT_BINARY_DIR}/Contents/PlugIns/${MAIN_PROJECT_NAME}/${PLUGIN_FILENAME})
+        ENDFOREACH()
+
         # Make sure that the plugin refers to our embedded version of the Qt
         # libraries on which it depends


Some minor cleaning up [ci skip].

Some minor cleaning up [ci skip].

--- cmake/common.cmake
+++ cmake/common.cmake
@@ -77,21 +77,8 @@
     ENDIF()

     SET(REQUIRED_QT_MODULES
-        Concurrent
-        Core
-        Gui
-        Help
-        ${MAC_EXTRAS}
         Network
-        OpenGL
-        PrintSupport
-        Svg
-        UiTools
-        WebKit
-        WebKitWidgets
         Widgets
-        Xml
-        XmlPatterns
     )

     FOREACH(REQUIRED_QT_MODULE ${REQUIRED_QT_MODULES})


Some more cleaning up for the Mac OS X deployment.

--- cmake/common.cmake
+++ cmake/common.cmake
@@ -324,7 +324,7 @@
     # A few Mac OS X specific things

     IF(APPLE)
-        # Clean our plugin
+        # Clean up our plugin's id

         SET(PLUGIN_FILENAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PLUGIN_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})

@@ -379,7 +379,7 @@
     ENDIF()
 ENDMACRO()

-MACRO(DEPLOY_MAC_OS_X_LIBRARY LIBRARY)
+MACRO(DEPLOY_MAC_OS_X_LIBRARY LIBRARY_NAME)
     # Various initialisations

     SET(TYPE)
@@ -424,7 +424,7 @@
         ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
                            COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBRARY_LIB_DIR})
     ELSE()
-        SET(QT_LIBRARY_HOME_DIR ${MAC_OS_X_PROJECT_BINARY_DIR}/Contents/Frameworks/${LIBRARY}.framework)
+        SET(QT_LIBRARY_HOME_DIR ${MAC_OS_X_PROJECT_BINARY_DIR}/Contents/Frameworks/${LIBRARY_NAME}.framework)
         SET(LIBRARY_LIB_DIR ${QT_LIBRARY_HOME_DIR}/Versions/${QT_VERSION_MAJOR})

         ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
@@ -436,21 +436,21 @@

     IF("${TYPE}" STREQUAL "Library")
         IF("${DIR}" STREQUAL "")
-            SET(LIBRARY_LIB_FILEPATH ${LIBRARY_LIB_DIR}/${LIBRARY}.${QT_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX})
-
-            ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
-                               COMMAND ${CMAKE_COMMAND} -E copy ${QT_LIBRARY_DIR}/${LIBRARY}.${QT_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_LIB_FILEPATH})
+            SET(LIBRARY_LIB_FILEPATH ${LIBRARY_LIB_DIR}/${LIBRARY_NAME}.${QT_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+            ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
+                               COMMAND ${CMAKE_COMMAND} -E copy ${QT_LIBRARY_DIR}/${LIBRARY_NAME}.${QT_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_LIB_FILEPATH})
         ELSE()
-            SET(LIBRARY_LIB_FILEPATH ${LIBRARY_LIB_DIR}/${LIBRARY})
-
-            ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
-                               COMMAND ${CMAKE_COMMAND} -E copy ${DIR}/${LIBRARY} ${LIBRARY_LIB_FILEPATH})
-        ENDIF()
-    ELSE()
-        SET(LIBRARY_LIB_FILEPATH ${LIBRARY_LIB_DIR}/${LIBRARY})
+            SET(LIBRARY_LIB_FILEPATH ${LIBRARY_LIB_DIR}/${LIBRARY_NAME})
+
+            ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
+                               COMMAND ${CMAKE_COMMAND} -E copy ${DIR}/${LIBRARY_NAME} ${LIBRARY_LIB_FILEPATH})
+        ENDIF()
+    ELSE()
+        SET(LIBRARY_LIB_FILEPATH ${LIBRARY_LIB_DIR}/${LIBRARY_NAME})

         ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
-                           COMMAND ${CMAKE_COMMAND} -E copy ${QT_LIBRARY_DIR}/${LIBRARY}.framework/Versions/${QT_VERSION_MAJOR}/${LIBRARY} ${LIBRARY_LIB_FILEPATH})
+                           COMMAND ${CMAKE_COMMAND} -E copy ${QT_LIBRARY_DIR}/${LIBRARY_NAME}.framework/Versions/${QT_VERSION_MAJOR}/${LIBRARY_NAME} ${LIBRARY_LIB_FILEPATH})
     ENDIF()

     # Strip the library from anything that is not essential
@@ -461,17 +461,17 @@
     # Do things that are only related to Qt libraries

     IF("${DIR}" STREQUAL "")
-        # Make sure that the library refers to our embedded version
-
-#        IF("${TYPE}" STREQUAL "Library")
-#            ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
-#                               COMMAND install_name_tool -id @executable_path/../Frameworks/${LIBRARY}.${QT_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}
-#                                                             ${LIBRARY_LIB_FILEPATH})
-#        ELSE()
-#            ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
-#                               COMMAND install_name_tool -id @executable_path/../Frameworks/${LIBRARY}.framework/Versions/${QT_VERSION_MAJOR}/${LIBRARY}
-#                                                             ${LIBRARY_LIB_FILEPATH})
-#        ENDIF()
+        # Clean up the library's id
+
+        IF("${TYPE}" STREQUAL "Library")
+            ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
+                               COMMAND install_name_tool -id ${LIBRARY_NAME}.${QT_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}
+                                                             ${LIBRARY_LIB_FILEPATH})
+        ELSE()
+            ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
+                               COMMAND install_name_tool -id ${LIBRARY_NAME}
+                                                             ${LIBRARY_LIB_FILEPATH})
+        ENDIF()

         # Make sure that the library refers to our embedded version of the Qt
         # libraries on which it depends


- cotire v1.7.10.

- cotire v1.7.10.

--- cmake/cotire.cmake
+++ cmake/cotire.cmake
@@ -3,7 +3,7 @@
 # See the cotire manual for usage hints.
 #
 #=============================================================================
-# Copyright 2012-2016 Sascha Kratky
+# Copyright 2012-2017 Sascha Kratky
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -43,7 +43,7 @@
 endif()

 set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
-set (COTIRE_CMAKE_MODULE_VERSION "1.7.9")
+set (COTIRE_CMAKE_MODULE_VERSION "1.7.10")

 # activate select policies
 if (POLICY CMP0025)
@@ -104,6 +104,11 @@
 if (POLICY CMP0054)
 	# only interpret if() arguments as variables or keywords when unquoted
 	cmake_policy(SET CMP0054 NEW)
+endif()
+
+if (POLICY CMP0055)
+	# strict checking for break() command
+	cmake_policy(SET CMP0055 NEW)
 endif()

 include(CMakeParseArguments)
@@ -293,7 +298,7 @@
 	set (${_valuesVar} ${_values} PARENT_SCOPE)
 endfunction()

-function (cotire_resolve_config_properites _configurations _propertiesVar)
+function (cotire_resolve_config_properties _configurations _propertiesVar)
 	set (_properties "")
 	foreach (_property ${ARGN})
 		if ("${_property}" MATCHES "<CONFIG>")
@@ -309,8 +314,8 @@
 	set (${_propertiesVar} ${_properties} PARENT_SCOPE)
 endfunction()

-function (cotire_copy_set_properites _configurations _type _source _target)
-	cotire_resolve_config_properites("${_configurations}" _properties ${ARGN})
+function (cotire_copy_set_properties _configurations _type _source _target)
+	cotire_resolve_config_properties("${_configurations}" _properties ${ARGN})
 	foreach (_property ${_properties})
 		get_property(_isSet ${_type} ${_source} PROPERTY ${_property} SET)
 		if (_isSet)
@@ -320,13 +325,18 @@
 	endforeach()
 endfunction()

-function (cotire_get_target_usage_requirements _target _targetRequirementsVar)
+function (cotire_get_target_usage_requirements _target _config _targetRequirementsVar)
 	set (_targetRequirements "")
 	get_target_property(_librariesToProcess ${_target} LINK_LIBRARIES)
 	while (_librariesToProcess)
 		# remove from head
 		list (GET _librariesToProcess 0 _library)
 		list (REMOVE_AT _librariesToProcess 0)
+		if (_library MATCHES "^\\$<\\$<CONFIG:${_config}>:([A-Za-z0-9_:-]+)>$")
+			set (_library "${CMAKE_MATCH_1}")
+		elseif (_config STREQUAL "None" AND _library MATCHES "^\\$<\\$<CONFIG:>:([A-Za-z0-9_:-]+)>$")
+			set (_library "${CMAKE_MATCH_1}")
+		endif()
 		if (TARGET ${_library})
 			list (FIND _targetRequirements ${_library} _index)
 			if (_index LESS 0)
@@ -441,7 +451,7 @@
 	# interface compile options from linked library targets
 	if (_target)
 		set (_linkedTargets "")
-		cotire_get_target_usage_requirements(${_target} _linkedTargets)
+		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
 		foreach (_linkedTarget ${_linkedTargets})
 			get_target_property(_targetOptions ${_linkedTarget} INTERFACE_COMPILE_OPTIONS)
 			if (_targetOptions)
@@ -573,7 +583,7 @@
 	# interface include directories from linked library targets
 	if (_target)
 		set (_linkedTargets "")
-		cotire_get_target_usage_requirements(${_target} _linkedTargets)
+		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
 		foreach (_linkedTarget ${_linkedTargets})
 			get_target_property(_linkedTargetType ${_linkedTarget} TYPE)
 			if (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE AND NOT CMAKE_VERSION VERSION_LESS "3.4.0" AND
@@ -627,7 +637,7 @@
 	if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES)
 		list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES})
 	endif()
-	if (WIN32)
+	if (WIN32 AND NOT MINGW)
 		# convert Windows paths in include directories to CMake paths
 		if (_includeDirs)
 			set (_paths "")
@@ -703,7 +713,7 @@
 	endif()
 	# interface compile definitions from linked library targets
 	set (_linkedTargets "")
-	cotire_get_target_usage_requirements(${_target} _linkedTargets)
+	cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
 	foreach (_linkedTarget ${_linkedTargets})
 		get_target_property(_definitions ${_linkedTarget} INTERFACE_COMPILE_DEFINITIONS)
 		if (_definitions)
@@ -859,6 +869,9 @@
 		list (APPEND ${_cmdVar} "--warn-uninitialized")
 	endif()
 	list (APPEND ${_cmdVar} "-DCOTIRE_BUILD_TYPE:STRING=$<CONFIGURATION>")
+	if (XCODE)
+		list (APPEND ${_cmdVar} "-DXCODE:BOOL=TRUE")
+	endif()
 	if (COTIRE_VERBOSE)
 		list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=ON")
 	elseif("${CMAKE_GENERATOR}" MATCHES "Makefiles")
@@ -902,16 +915,16 @@
 		foreach (_include ${_includeDirs})
 			if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
 				file (TO_NATIVE_PATH "${_include}" _include)
-				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}")
+				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
 			else()
 				set (_index -1)
 				if ("${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" MATCHES ".+")
 					list (FIND ${_systemIncludesVar} "${_include}" _index)
 				endif()
 				if (_index GREATER -1)
-					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${_include}")
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
 				else()
-					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}")
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
 				endif()
 			endif()
 		endforeach()
@@ -1657,6 +1670,10 @@
 			get_filename_component(_pchName "${_pchFile}" NAME)
 			set (_xLanguage_C "c-header")
 			set (_xLanguage_CXX "c++-header")
+			set (_pchSuppressMessages FALSE)
+			if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
+				set(_pchSuppressMessages TRUE)
+			endif()
 			if (_flags)
 				# append to list
 				if ("${_language}" STREQUAL "CXX")
@@ -1664,13 +1681,17 @@
 				endif()
 				list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-create" "${_pchName}" "-fsyntax-only" "${_hostFile}")
 				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-					list (APPEND _flags "-Wpch-messages")
+					if (NOT _pchSuppressMessages)
+						list (APPEND _flags "-Wpch-messages")
+					endif()
 				endif()
 			else()
 				# return as a flag string
 				set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-create \"${_pchName}\"")
 				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-					set (_flags "${_flags} -Wpch-messages")
+					if (NOT _pchSuppressMessages)
+						set (_flags "${_flags} -Wpch-messages")
+					endif()
 				endif()
 			endif()
 		endif()
@@ -1781,17 +1802,25 @@
 			if (_pchFile)
 				get_filename_component(_pchDir "${_pchFile}" DIRECTORY)
 				get_filename_component(_pchName "${_pchFile}" NAME)
+				set (_pchSuppressMessages FALSE)
+				if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
+					set(_pchSuppressMessages TRUE)
+				endif()
 				if (_flags)
 					# append to list
 					list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-use" "${_pchName}")
 					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-						list (APPEND _flags "-Wpch-messages")
+						if (NOT _pchSuppressMessages)
+							list (APPEND _flags "-Wpch-messages")
+						endif()
 					endif()
 				else()
 					# return as a flag string
 					set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-use \"${_pchName}\"")
 					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-						set (_flags "${_flags} -Wpch-messages")
+						if (NOT _pchSuppressMessages)
+							set (_flags "${_flags} -Wpch-messages")
+						endif()
 					endif()
 				endif()
 			else()
@@ -1839,6 +1868,14 @@
 	if (_option_COMPILER_ID MATCHES "MSVC")
 		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
 		unset (ENV{VS_UNICODE_OUTPUT})
+	elseif (_option_COMPILER_ID MATCHES "GNU|Clang")
+		if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR
+			_option_COMPILER_EXECUTABLE MATCHES "ccache")
+			# Newer versions of Clang and GCC seem to embed a compilation timestamp into the precompiled header binary,
+			# which results in "file has been modified since the precompiled header was built" errors if ccache is used.
+			# We work around the problem by disabling ccache upon pre-compiling the prefix header.
+			set (ENV{CCACHE_DISABLE} "true")
+		endif()
 	endif()
 	execute_process(
 		COMMAND ${_cmd}
@@ -2191,7 +2228,7 @@
 		XCODE MSVC CMAKE_GENERATOR CMAKE_BUILD_TYPE CMAKE_CONFIGURATION_TYPES
 		CMAKE_${_language}_COMPILER_ID CMAKE_${_language}_COMPILER_VERSION
 		CMAKE_${_language}_COMPILER_LAUNCHER CMAKE_${_language}_COMPILER CMAKE_${_language}_COMPILER_ARG1
-		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_${_language}_SEP
+		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_SEP_${_language}
 		CMAKE_INCLUDE_SYSTEM_FLAG_${_language}
 		CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG
 		CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG
@@ -3036,8 +3073,8 @@
 			set (_outputDir "${COTIRE_UNITY_OUTPUT_DIRECTORY}")
 		else()
 			# append relative COTIRE_UNITY_OUTPUT_DIRECTORY to target's actual output directory
-			cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
-			cotire_resolve_config_properites("${_configurations}" _properties ${_outputDirProperties})
+			cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
+			cotire_resolve_config_properties("${_configurations}" _properties ${_outputDirProperties})
 			foreach (_property ${_properties})
 				get_property(_outputDir TARGET ${_target} PROPERTY ${_property})
 				if (_outputDir)
@@ -3057,11 +3094,11 @@
 				RUNTIME_OUTPUT_DIRECTORY "${_outputDir}")
 		endif()
 	else()
-		cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 			${_outputDirProperties})
 	endif()
 	# copy output name
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_<CONFIG>
 		LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_<CONFIG>
 		OUTPUT_NAME OUTPUT_NAME_<CONFIG>
@@ -3069,7 +3106,7 @@
 		PREFIX <CONFIG>_POSTFIX SUFFIX
 		IMPORT_PREFIX IMPORT_SUFFIX)
 	# copy compile stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		COMPILE_DEFINITIONS COMPILE_DEFINITIONS_<CONFIG>
 		COMPILE_FLAGS COMPILE_OPTIONS
 		Fortran_FORMAT Fortran_MODULE_DIRECTORY
@@ -3081,12 +3118,12 @@
 		C_VISIBILITY_PRESET CXX_VISIBILITY_PRESET VISIBILITY_INLINES_HIDDEN
 		C_CLANG_TIDY CXX_CLANG_TIDY)
 	# copy compile features
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED
 		CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED
 		COMPILE_FEATURES)
 	# copy interface stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN
 		COMPATIBLE_INTERFACE_STRING
 		INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS
@@ -3094,7 +3131,7 @@
 		INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
 		INTERFACE_AUTOUIC_OPTIONS NO_SYSTEM_FROM_IMPORTED)
 	# copy link stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		BUILD_WITH_INSTALL_RPATH INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
 		LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED
 		LINK_FLAGS LINK_FLAGS_<CONFIG>
@@ -3103,18 +3140,18 @@
 		LINK_SEARCH_START_STATIC LINK_SEARCH_END_STATIC
 		STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_<CONFIG>
 		NO_SONAME SOVERSION VERSION
-		LINK_WHAT_YOU_USE)
+		LINK_WHAT_YOU_USE BUILD_RPATH)
 	# copy cmake stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		IMPLICIT_DEPENDS_INCLUDE_TRANSFORM RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK)
 	# copy Apple platform specific stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		BUNDLE BUNDLE_EXTENSION FRAMEWORK FRAMEWORK_VERSION INSTALL_NAME_DIR
 		MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH
 		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
-		IOS_INSTALL_COMBINED)
+		IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE)
 	# copy Windows platform specific stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		GNUtoMS
 		COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
 		COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>
@@ -3128,9 +3165,9 @@
 		VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES
 		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
 		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
-		VS_SDK_REFERENCES)
+		VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY)
 	# copy Android platform specific stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		ANDROID_API ANDROID_API_MIN ANDROID_GUI
 		ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES
 		ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR


Remove support for crosscompilation in luajit.cmake

Note: it was incomplete, made thing unnecessary complex and it did not
align with the CMake way (c) for crosscompilation.

--- cmake/luajit.cmake
+++ cmake/luajit.cmake
@@ -129,6 +129,7 @@
 message (STATUS "Use LuaJIT library: ${LUAJIT_LIB}")

 macro(luajit_build)
+    set (luajit_cc ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1})
     # Cmake rules concerning strings and lists of strings are weird.
     #   set (foo "1 2 3") defines a string, while
     #   set (foo 1 2 3) defines a list.
@@ -169,30 +170,14 @@
         set (luajit_xcflags ${luajit_xcflags}
             -DLUAJIT_USE_VALGRIND -DLUAJIT_USE_SYSMALLOC)
     endif()
-    set (luajit_target_cc ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1})
-    if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
-        # Regular mode - use CMake compiler for building host utils.
-        set (luajit_host_cc ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1})
-    else()
-        # Crosscompile mode - use a host CC compiler for building host utils.
-        # Since CMake does not support cross compilation properly
-        # we have to use system CC here.
-        set (luajit_host_cc "cc")
-    endif()
-    if (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64" AND
-            ${CMAKE_SIZEOF_VOID_P} EQUAL 4)
-        # The host compiler must have same pointer size as the target compiler.
-        set (luajit_host_cc "${luajit_host_cc} -m32")
-    endif()
     set (luajit_buildoptions
         BUILDMODE=static
-        CC="${luajit_host_cc}"
+        CC="${luajit_cc}"
         CFLAGS="${luajit_cflags}"
         LDFLAGS="${luajit_ldflags}"
         CCOPT="${luajit_ccopt}"
         CCDEBUG="${luajit_ccdebug}"
         XCFLAGS="${luajit_xcflags}"
-        TARGET_CC="${luajit_target_cc}"
         Q='')
     if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
         add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/luajit/src/libluajit.a


Install debug plugins, from wlad.

Install debug plugins, from wlad.

--- cmake/plugin.cmake
+++ cmake/plugin.cmake
@@ -174,6 +174,7 @@
       OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")
     # Install dynamic library
     MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR})
+    INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug)
   ENDIF()
 ENDMACRO()


Find the python version specified in ROS_PYTHON_VERSION (#939)

* Find the appropriate python interpreter based on ROS_PYTHON_VERSION.

Signed-off-by: Chris Lalancette <281cd07d7578d97c83271fbbf2faddb83ab3791c@openrobotics.org>

* Use ROS_PYTHON_VERSION to find the correct python version.

If it is not set, fallback to the "default" for the platform.

Signed-off-by: Chris Lalancette <281cd07d7578d97c83271fbbf2faddb83ab3791c@openrobotics.org>

* Use the PYTHON_VERSION cache variable.

This allows us to re-use the PYTHON_VERSION cache variable
when looking at the ROS_PYTHON_VERSION environment variable.

Signed-off-by: Chris Lalancette <281cd07d7578d97c83271fbbf2faddb83ab3791c@openrobotics.org>

* Simplify even further.

We don't need the intermediate variable since $ENV{ROS_PYTHON_VERSION}
will just evaluate to an empty string if it is not set.

Signed-off-by: Chris Lalancette <281cd07d7578d97c83271fbbf2faddb83ab3791c@openrobotics.org>

--- cmake/python.cmake
+++ cmake/python.cmake
@@ -1,11 +1,7 @@
 # the CMake variable PYTHON_INSTALL_DIR has the same value as the Python function catkin.builder.get_python_install_dir()

-set(PYTHON_VERSION "" CACHE STRING "Specify specific Python version to use ('major.minor' or 'major')")
-if(PYTHON_VERSION)
-  find_package(PythonInterp "${PYTHON_VERSION}" REQUIRED)
-else()
-  find_package(PythonInterp REQUIRED)
-endif()
+set(PYTHON_VERSION "$ENV{ROS_PYTHON_VERSION}" CACHE STRING "Specify specific Python version to use ('major.minor' or 'major')")
+find_package(PythonInterp ${PYTHON_VERSION} REQUIRED)

 message(STATUS "Using PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")


Use virgil-crypto lib v1.3.4

Use virgil-crypto lib v1.3.4

--- cmake/virgil.cmake
+++ cmake/virgil.cmake
@@ -86,7 +86,7 @@
         if (NOT TARGET ${VIRGIL}_project)
             ExternalProject_Add (${VIRGIL}_project
                 GIT_REPOSITORY "https://github.com/VirgilSecurity/virgil-crypto.git"
-                GIT_TAG "v1.3.2"
+                GIT_TAG "v1.3.4"
                 PREFIX "${CMAKE_CURRENT_BINARY_DIR}/ext/virgil-crypto"
                 CMAKE_ARGS ${CMAKE_ARGS}
             )


Use virgil-crypto lib 1.3.1, use virgil-sdk-cpp lib v3.0.0

--- cmake/virgil.cmake
+++ cmake/virgil.cmake
@@ -86,7 +86,7 @@
         if (NOT TARGET ${VIRGIL}_project)
             ExternalProject_Add (${VIRGIL}_project
                 GIT_REPOSITORY "https://github.com/VirgilSecurity/virgil-crypto.git"
-                GIT_TAG "v1.3.0"
+                GIT_TAG "v1.3.1"
                 PREFIX "${CMAKE_CURRENT_BINARY_DIR}/ext/virgil-crypto"
                 CMAKE_ARGS ${CMAKE_ARGS}
             )
@@ -130,7 +130,7 @@
         if (NOT TARGET ${VIRGIL}_project)
             ExternalProject_Add (${VIRGIL}_project
                 GIT_REPOSITORY "https://github.com/VirgilSecurity/virgil-sdk-cpp.git"
-                GIT_TAG "release"
+                GIT_TAG "v3.0.0"
                 PREFIX "${CMAKE_CURRENT_BINARY_DIR}/ext/virgil-sdk"
                 CMAKE_ARGS ${CMAKE_ARGS}
             )


Modify OpenVDB CMake module to require a C++14 compiler

Signed-off-by: Dan Bailey <39b6ae1dd30d9ab3cd77a2d084b277520f14c203@ilm.com>

--- cmake/FindOpenVDB.cmake
+++ cmake/FindOpenVDB.cmake
@@ -480,7 +480,7 @@
       INTERFACE_INCLUDE_DIRECTORIES "${OpenVDB_INCLUDE_DIR}"
       IMPORTED_LINK_DEPENDENT_LIBRARIES "${_OPENVDB_HIDDEN_DEPENDENCIES}" # non visible deps
       INTERFACE_LINK_LIBRARIES "${_OPENVDB_VISIBLE_DEPENDENCIES}" # visible deps (headers)
-      INTERFACE_COMPILE_FEATURES cxx_std_11
+      INTERFACE_COMPILE_FEATURES cxx_std_14
    )
   endif()
 endforeach()


Adding LL USB component for F1 controllers

--- cmake/FindSTM32LL.cmake
+++ cmake/FindSTM32LL.cmake
@@ -9,8 +9,8 @@
     SET(LL_PREFIX stm32f0xx_)

 ELSEIF(STM32_FAMILY STREQUAL "F1")
-    SET(LL_COMPONENTS	adc bus cortex crc dac dma exti gpio i2c
-						i2s iwdg pwr rcc rtc spi system tim usart utils wwdg)
+    SET(LL_COMPONENTS	adc bus cortex crc dac dma exti gpio i2c i2s
+						iwdg pwr rcc rtc spi system tim usart usb utils wwdg)

     SET(LL_REQUIRED_COMPONENTS bus cortex pwr rcc system utils)


moved endif in installfast.cmake script

moved endif in installfast.cmake script

--- cmake/InstallFAST.cmake
+++ cmake/InstallFAST.cmake
@@ -62,6 +62,7 @@
 install(FILES ${PROJECT_BINARY_DIR}/lib/fast.py
     DESTINATION fast/python
 )
+endif()

 # Copy configuration file
 # Create new configuration file for install
@@ -77,4 +78,4 @@
     RENAME fast_configuration.txt
     DESTINATION fast/
 )
-endif()
+


cmake: fix install path

cmake: fix install path

CMake doesn't work with empty paths ("") or paths which contains "./"

--- cmake/OpenCVUtils.cmake
+++ cmake/OpenCVUtils.cmake
@@ -84,14 +84,10 @@
   endforeach()
 endmacro()

-macro(ocv_path_join result_var P1 P2)
-  string(REGEX REPLACE "^[/]+" "" P2 "${P2}")
-  if("${P1}" STREQUAL "")
-    if("${P2}" STREQUAL "")
-      set(${result_var} ".")
-    else()
-      set(${result_var} "${P2}")
-    endif()
+macro(ocv_path_join result_var P1 P2_)
+  string(REGEX REPLACE "^[/]+" "" P2 "${P2_}")
+  if("${P1}" STREQUAL "" OR "${P1}" STREQUAL ".")
+    set(${result_var} "${P2}")
   elseif("${P1}" STREQUAL "/")
     set(${result_var} "/${P2}")
   elseif("${P2}" STREQUAL "")
@@ -99,6 +95,11 @@
   else()
     set(${result_var} "${P1}/${P2}")
   endif()
+  string(REGEX REPLACE "([/\\]?)[\\.][/\\]" "\\1" ${result_var} "${${result_var}}")
+  if("${${result_var}}" STREQUAL "")
+    set(${result_var} ".")
+  endif()
+  #message(STATUS "'${P1}' '${P2_}' => '${${result_var}}'")
 endmacro()

 # rename modules target to world if needed


Fixed typo.

Fixed typo.

--- cmake/TbagModules.cmake
+++ cmake/TbagModules.cmake
@@ -626,7 +626,7 @@
     tbag_modules__add_whole_archive (${sfml_graphics_EXT_STATIC_LIB})

     if (WIN32)
-        list (APPEND TBAG_PROJECT_LDFLAGS winmm.lib, gdi32.lib)
+        list (APPEND TBAG_PROJECT_LDFLAGS winmm.lib gdi32.lib)
     elseif (UNIX)
         if (APPLE)
             list (APPEND TBAG_PROJECT_LDFLAGS -ObjC


Search for the gnat library under the names of gnat and gnat-4.1 (added
because this is the name used by Fedora).

svn path=/trunk/; revision=7422

--- cmake/modules/ada.cmake
+++ cmake/modules/ada.cmake
@@ -26,11 +26,13 @@
 endif(DEFAULT_NO_BINDINGS)

 if(ENABLE_ada)
-  find_library(GNAT_LIB gnat)
+  find_library(GNAT_LIB NAMES gnat gnat-4.1)
   if(NOT GNAT_LIB)
     message(STATUS "WARNING: "
       "gnat library not found. Disabling ada bindings")
-      set(ENABLE_ada OFF CACHE BOOL "Enable Ada bindings" FORCE)
+    set(ENABLE_ada OFF CACHE BOOL "Enable Ada bindings" FORCE)
+  else(NOT GNAT_LIB)
+    message(STATUS "FOUND gnat library ${GNAT_LIB}")
   endif(NOT GNAT_LIB)
 endif(ENABLE_ada)


FIX (#1731): Allow my.cdash for external dart clients

--- DartConfig.cmake
+++ DartConfig.cmake
@@ -8,27 +8,27 @@
 SET (NIGHTLY_START_TIME "21:00:00 CET")
 SET (DART_TESTING_TIMEOUT 900)

-IF(FALSE)
-
 # configure dart for submission to kitware
 IF(USE_KITWARE_DARTBOARD)
-	#
-	# Dart server to submit results (used by client)
-	#
-	SET (DROP_METHOD http)
-	SET (DROP_SITE "public.kitware.com")
-	SET (DROP_LOCATION "/cgi-bin/HTTPUploadDartFile.cgi")
-	SET (DROP_SITE_USER "ftpuser")
-	SET (DROP_SITE_PASSWORD "public")
-	SET (TRIGGER_SITE "http://public.kitware.com/cgi-bin/Submit-MITK-TestingResults.pl")
-	SET (ROLLUP_URL "http://${DROP_SITE}/cgi-bin/MITK-rollup-dashboard.sh")
-        SET (NIGHTLY_START_TIME "21:00:00 EST")
-	#
-        # SET (CVS_WEB_URL "http://mbi-srv/docs/programming/cvs/viewcvs/cgi/viewcvs.cgi/ip%2b%2b/")
-	# SET (DOXYGEN_URL "http://mbi-srv.inet.dkfz-heidelberg.de/docs/image_processing/mitk/doxygen/" )
+#
+# Dart server to submit results (used by client)
+#
+    SET(DROP_METHOD "http")
+    SET(DROP_SITE "my.cdash.org")
+    SET(DROP_LOCATION "/submit.php?project=MITK")
+
+    SET(CTEST_DROP_METHOD "http")
+    SET(CTEST_DROP_SITE "my.cdash.org")
+    SET(CTEST_DROP_LOCATION "/submit.php?project=MITK")
+    SET(CTEST_DROP_SITE_CDASH TRUE)
+
+    SET(CTEST_NIGHTLY_START_TIME "21:00 CET")
+    SET (NIGHTLY_START_TIME "21:00:00 CET")
+#
+#    SET (CVS_WEB_URL "http://mbi-srv/docs/programming/cvs/viewcvs/cgi/viewcvs.cgi/ip%2b%2b/")
+#    SET (DOXYGEN_URL "http://mbi-srv.inet.dkfz-heidelberg.de/docs/image_processing/mitk/doxygen/" )

 ENDIF(USE_KITWARE_DARTBOARD)
-ENDIF(FALSE)

 IF(EXISTS ${MBI_DART_WORKDIR}/notes.txt)
   MAKE_DIRECTORY(${MBI_DART_WORKDIR}/bin/Testing/Notes)


Enable the ITKIOTransformMINC module for xfm transform files

--- SuperBuild/External_ITK.cmake
+++ SuperBuild/External_ITK.cmake
@@ -21,6 +21,10 @@

 if(NOT DEFINED Module_SimpleITKFilters)
   set(Module_SimpleITKFilters ON)
+endif()
+
+if (NOT DEFINED Module_ITKIOTransformMINC)
+  set(Module_ITKIOTransformMINC ON)
 endif()

 set(Module_SimpleITKFilters_GIT_TAG ce51d77771a54e7e0791fadb15e50dc38cbd8358 )


Prefer downloading external test data from data.kitware.com

--- tests/TestData.cmake
+++ tests/TestData.cmake
@@ -13,8 +13,8 @@

 # set the default mirror
 set(ExternalData_URL_TEMPLATES
+  "https://data.kitware.com/api/v1/file/hashsum/%(algo)/%(hash)/download"
   "https://midas3.kitware.com/midas/api/rest?method=midas.bitstream.download&checksum=%(hash)&algorithm=%(algo)"
-  "https://data.kitware.com/api/v1/file/hashsum/%(algo)/%(hash)/download"
 )

 # Expose the absolute path to the data file source tree because


Restore comment spacing style

Restore comment spacing style

--- standard/InstallHeaders.cmake
+++ standard/InstallHeaders.cmake
@@ -33,14 +33,14 @@
       continue()
     endif()

-    #When the path to the file is absolute, we don't know what we should be installing
-    #it relative to. Warn
+    # When the path to the file is absolute, we don't know what we should be installing
+    # it relative to. Warn
     if(IS_ABSOLUTE ${src})
       message(WARNING "Not sure where to install file with absolute path ${src}")
       continue()
     endif()

-    #Determine which path the file is relative to and use intermediate directories as the install path
+    # Determine which path the file is relative to and use intermediate directories as the install path
     foreach(_search_dir "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
       get_filename_component(src_abs ${src} ABSOLUTE BASE_DIR ${_search_dir})
       if(EXISTS ${src_abs})


[OGRE-133] GL3Plus RenderSystem is missing from FindOGRE.cmake

--- CMake/Packages/FindOGRE.cmake
+++ CMake/Packages/FindOGRE.cmake
@@ -28,7 +28,9 @@
 #  Plugin_BSPSceneManager, Plugin_CgProgramManager,
 #  Plugin_OctreeSceneManager, Plugin_OctreeZone,
 #  Plugin_ParticleFX, Plugin_PCZSceneManager,
-#  RenderSystem_GL, RenderSystem_Direct3D9,
+#  RenderSystem_GL, RenderSystem_GL3Plus,
+#  RenderSystem_GLES, RenderSystem_GLES2,
+#  RenderSystem_Direct3D9, RenderSystem_Direct3D11
 #  Paging, Terrain, Volume, Overlay
 #
 # For each of these components, the following variables are defined:
@@ -130,7 +132,7 @@
 set(OGRE_COMPONENTS Paging Terrain Volume Overlay
   Plugin_BSPSceneManager Plugin_CgProgramManager Plugin_OctreeSceneManager
   Plugin_OctreeZone Plugin_PCZSceneManager Plugin_ParticleFX
-  RenderSystem_Direct3D11 RenderSystem_Direct3D9 RenderSystem_GL RenderSystem_GLES RenderSystem_GLES2)
+  RenderSystem_Direct3D11 RenderSystem_Direct3D9 RenderSystem_GL RenderSystem_GL3Plus RenderSystem_GLES RenderSystem_GLES2)
 set(OGRE_RESET_VARS
   OGRE_CONFIG_INCLUDE_DIR OGRE_INCLUDE_DIR
   OGRE_LIBRARY_FWK OGRE_LIBRARY_REL OGRE_LIBRARY_DBG
@@ -472,6 +474,7 @@
 ogre_find_plugin(Plugin_OctreeSceneManager OgreOctreeSceneManager.h PlugIns/OctreeSceneManager/include)
 ogre_find_plugin(Plugin_ParticleFX OgreParticleFXPrerequisites.h PlugIns/ParticleFX/include)
 ogre_find_plugin(RenderSystem_GL OgreGLRenderSystem.h RenderSystems/GL/include)
+ogre_find_plugin(RenderSystem_GL3Plus OgreGL3PlusRenderSystem.h RenderSystems/GL3Plus/include)
 ogre_find_plugin(RenderSystem_GLES OgreGLESRenderSystem.h RenderSystems/GLES/include)
 ogre_find_plugin(RenderSystem_GLES2 OgreGLES2RenderSystem.h RenderSystems/GLES2/include)
 ogre_find_plugin(RenderSystem_Direct3D9 OgreD3D9RenderSystem.h RenderSystems/Direct3D9/include)
@@ -488,6 +491,9 @@
   if (NOT OPENGL_FOUND)
     set(OGRE_RenderSystem_GL_FOUND FALSE)
   endif ()
+  if (NOT OPENGL_FOUND)
+    set(OGRE_RenderSystem_GL3Plus_FOUND FALSE)
+  endif ()
   if (NOT OPENGLES_FOUND)
     set(OGRE_RenderSystem_GLES_FOUND FALSE)
   endif ()
@@ -506,6 +512,9 @@
     ${DirectX_D3D11_LIBRARIES}
   )
   set(OGRE_RenderSystem_GL_LIBRARIES ${OGRE_RenderSystem_GL_LIBRARIES}
+    ${OPENGL_LIBRARIES}
+  )
+  set(OGRE_RenderSystem_GL3Plus_LIBRARIES ${OGRE_RenderSystem_GL3Plus_LIBRARIES}
     ${OPENGL_LIBRARIES}
   )
   set(OGRE_RenderSystem_GLES_LIBRARIES ${OGRE_RenderSystem_GLES_LIBRARIES}


fix Ogre detecting from SDK with spaces

fix Ogre detecting from SDK with spaces

--- CMake/Packages/FindOGRE.cmake
+++ CMake/Packages/FindOGRE.cmake
@@ -19,8 +19,8 @@
     IF (OGRESDK)
         MESSAGE(STATUS "Using OGRE SDK")
         STRING(REGEX REPLACE "[\\]" "/" OGRESDK "${OGRESDK}")
-        SET(OGRE_INCLUDE_DIR "${OGRESDK}/include" "${OGRESDK}/include/OGRE")
-        SET(OGRE_LIB_DIR "${OGRESDK}/lib")
+		SET(OGRE_INCLUDE_DIR ${OGRESDK}/include/OGRE ${OGRESDK}/include)
+        SET(OGRE_LIB_DIR ${OGRESDK}/lib)
         SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
     ENDIF (OGRESDK)
     IF (OGRESOURCE)
@@ -37,10 +37,6 @@
     SET(OGRE_LIB_DIR ${OGRE_LIBDIR})
     SET(OGRE_LIBRARIES ${OGRE_LIBRARIES} CACHE STRING "")
 ENDIF (WIN32)
-
-#Do some preparation
-SEPARATE_ARGUMENTS(OGRE_INCLUDE_DIR)
-SEPARATE_ARGUMENTS(OGRE_LIBRARIES)

 SET(OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIR} CACHE PATH "")
 SET(OGRE_LIBRARIES ${OGRE_LIBRARIES} CACHE STRING "")


COMP Updated MITK-Data

COMP Updated MITK-Data

--- CMakeExternals/MITKData.cmake
+++ CMakeExternals/MITKData.cmake
@@ -13,7 +13,7 @@

 if(BUILD_TESTING)

-  set(revision_tag f04939c6) # first 8 characters of hash-tag
+  set(revision_tag 16f27d87) # first 8 characters of hash-tag
 #                  ^^^^^^^^  these are just to check correct length of hash part

   ExternalProject_Add(${proj}


COMP: added test data again

COMP: added test data again

--- CMakeExternals/MITKData.cmake
+++ CMakeExternals/MITKData.cmake
@@ -12,7 +12,7 @@
 set(MITK-Data_DEPENDS ${proj})

 if(BUILD_TESTING)
-  set(revision_tag 8bfc2a9c) # first 8 characters of hash-tag
+  set(revision_tag f0118854) # first 8 characters of hash-tag
 #                  ^^^^^^^^  these are just to check correct length of hash part

   ExternalProject_Add(${proj}


update iris again

update iris again

--- software/externals/cmake/externals.cmake
+++ software/externals/cmake/externals.cmake
@@ -118,7 +118,7 @@
 set(gurobi_depends)

 set(iris_url ssh://git@github.com/rdeits/iris-distro.git)
-set(iris_revision b3e9e663e2ac89bc0bd607091e50d598b5914956)
+set(iris_revision 6f29caf9453375dce3cfe8021d0a10f63630a611)
 set(iris_depends)

 set(mosek_url ssh://git@github.com/RobotLocomotion/mosek.git)


Beautify output

Beautify output

--- GNUModules.cmake
+++ GNUModules.cmake
@@ -69,7 +69,7 @@
 # get the used compiler + its version
 get_filename_component(MODULE_COMPILER_NAME ${CMAKE_C_COMPILER} NAME CACHE)
 include(CompilerVersion)
-COMPILER_DUMPVERSION(MODULE_COMPILER_VERSION)
+compiler_dumpversion(MODULE_COMPILER_VERSION)

 # setup the module file content
 set(MODULE_PACKAGE_NAME ${CPACK_PROJECT_NAME})
@@ -117,11 +117,11 @@
   "{\n"
   "    global package_name version architecture\n"
   "\n"
-  "    puts stderr \"This module prepares your environment to run $package_name $version\n"
-  "                 for the architecture: $architecture\n"
+  "    puts stderr \"This module prepares your environment to run $package_name $version "
+  "for the architecture: $architecture\n"
   "\n"
-  "                 Type 'module list' to list all the loaded modules.\n"
-  "                 Type 'module avail' to list all the availables ones.\"\n"
+  "Type 'module list' to list all the loaded modules.\n"
+  "Type 'module avail' to list all the availables ones.\"\n"
   "}\n"
   "\n"
   "# Update PATH environment:\n"


added some comments to old tests, activated tests which should be used again

--- Core/Code/Testing/files.cmake
+++ Core/Code/Testing/files.cmake
@@ -17,18 +17,18 @@
   mitkGlobalInteractionTest.cpp
   mitkImageEqualTest.cpp
   mitkImageDataItemTest.cpp
-  #mitkImageMapper2DTest.cpp
+  #mitkImageMapper2DTest.cpp #tested class mitkImageMapperGL2D doesn't exist any more
   mitkImageGeneratorTest.cpp
   mitkBaseDataTest.cpp
-  #mitkImageToItkTest.cpp
+  mitkImageToItkTest.cpp
   mitkImportItkImageTest.cpp
   mitkGrabItkImageMemoryTest.cpp
   mitkInstantiateAccessFunctionTest.cpp
   mitkInteractorTest.cpp
-  #mitkITKThreadingTest.cpp
+  #mitkITKThreadingTest.cpp #test outdated because itk::Semaphore was removed from ITK
   mitkLevelWindowTest.cpp
   mitkMessageTest.cpp
-  #mitkPipelineSmartPointerCorrectnessTest.cpp
+  #mitkPipelineSmartPointerCorrectnessTest.cpp #file doesn't exist!
   mitkPixelTypeTest.cpp
   mitkPlaneGeometryTest.cpp
   mitkPointSetEqualTest.cpp
@@ -39,8 +39,8 @@
   mitkPointSetInteractorTest.cpp
   mitkPropertyTest.cpp
   mitkPropertyListTest.cpp
-  #mitkRegistrationBaseTest.cpp
-  #mitkSegmentationInterpolationTest.cpp
+  #mitkRegistrationBaseTest.cpp #tested class  mitkRegistrationBase doesn't exist any more
+  #mitkSegmentationInterpolationTest.cpp #file doesn't exist!
   mitkSlicedGeometry3DTest.cpp
   mitkSliceNavigationControllerTest.cpp
   mitkStateMachineTest.cpp
@@ -56,7 +56,7 @@
   mitkVerboseLimitedLinearUndoTest.cpp
   mitkWeakPointerTest.cpp
   mitkTransferFunctionTest.cpp
-  #mitkAbstractTransformGeometryTest.cpp
+  #mitkAbstractTransformGeometryTest.cpp #seems as tested class mitkExternAbstractTransformGeometry doesnt exist any more
   mitkStepperTest.cpp
   itkTotalVariationDenoisingImageFilterTest.cpp
   mitkRenderingManagerTest.cpp


COMP: moved test to correct test sub-set

--- Core/Code/Testing/files.cmake
+++ Core/Code/Testing/files.cmake
@@ -63,7 +63,6 @@
   mitkImageDimensionConverterTest.cpp
   mitkLoggingAdapterTest.cpp
   mitkUIDGeneratorTest.cpp
-  mitkVolumeCalculatorTest.cpp
 )

 # test with image filename as an extra command line parameter


cmake utils: Use Boost::boost target to link against boost library

--- cmake/BsoncxxUtil.cmake
+++ cmake/BsoncxxUtil.cmake
@@ -31,7 +31,7 @@
         ExternalProject_Get_Property(EP_mnmlstc_core source_dir)
         target_include_directories(${TARGET} PUBLIC $<BUILD_INTERFACE:${source_dir}/include>)
     elseif(BSONCXX_POLY_USE_BOOST)
-        target_include_directories(${TARGET} PUBLIC ${Boost_INCLUDE_DIRS})
+        target_link_libraries(${TARGET} PUBLIC Boost::boost)
     endif()

     target_link_libraries(${TARGET} PRIVATE ${libbson_target})


Fix and cleanup ceghi_add_sample macro.

Fix and cleanup ceghi_add_sample macro.

Now does the right thing on OS X, should still work everywhere else too.

--- cmake/CEGUIMacros.cmake
+++ cmake/CEGUIMacros.cmake
@@ -333,53 +333,28 @@
 endmacro()

 #
-# Define a CEGUI sample app
+# Define a CEGUI sample module
 #
 macro (cegui_add_sample _NAME)
-    add_dependencies(${CEGUI_TARGET_NAME} ${CEGUI_SAMPLEFRAMEWORK_EXENAME}
-                            ${CEGUI_TARGET_NAME} ${_NAME}${CEGUI_SLOT_VERSION}
-    )
-
-    set (CEGUI_TARGET_NAME ${_NAME}${CEGUI_SLOT_VERSION})
-
-    include_directories(${CMAKE_SOURCE_DIR}/samples/common/include)
-
+    set (CEGUI_TARGET_NAME ${_NAME})
+
     cegui_gather_files()
-
+
 	set(CORE_HEADER_FILES ${CORE_HEADER_FILES}
 		${CMAKE_SOURCE_DIR}/samples/common/include/Sample.h
 		${CMAKE_SOURCE_DIR}/samples/common/include/SampleBase.h
 	)

     # Each demo will become a dynamically linked library as plugin (module)
-	add_library(${CEGUI_TARGET_NAME} MODULE ${CORE_SOURCE_FILES} ${CORE_HEADER_FILES})
-
-    if (NOT APPLE)
-        set_target_properties(${CEGUI_TARGET_NAME} PROPERTIES
-            INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CEGUI_LIB_INSTALL_DIR}"
-        )
-    endif()
-
-    if (APPLE)
-        # we add these to ensure the dynamically loaded modules we will be
-        # using are built before the .app's post build step that copies
-        # libs into the app bundle.
-        add_dependencies(${CEGUI_TARGET_NAME} ${CEGUI_CORE_WR_LIBNAME}
-                                              CEGUI${CEGUI_OPTION_DEFAULT_XMLPARSER}
-                                              CEGUI${CEGUI_OPTION_DEFAULT_IMAGECODEC}
-        )
-
-        cegui_apple_app_setup(${CEGUI_TARGET_NAME} FALSE)
-    endif()
+    cegui_add_library_impl(${CEGUI_TARGET_NAME} TRUE CORE_SOURCE_FILES CORE_HEADER_FILES TRUE FALSE)
+
+    add_dependencies(${CEGUI_SAMPLEFRAMEWORK_EXENAME} ${CEGUI_TARGET_NAME})
+
+    include_directories(${CMAKE_SOURCE_DIR}/samples/common/include)

     #Library link setup
     cegui_target_link_libraries(${CEGUI_TARGET_NAME}
         ${CEGUI_BASE_LIBNAME}
-    )
-
-    # Installation
-    install(TARGETS ${CEGUI_TARGET_NAME}
-    LIBRARY DESTINATION bin
     )

     # Add the MetaData chunk of the sample to the final xml


FIX: switch to 'if test' syntax from 'if [' for shell commands (cmake issues)

--- cmake/CEGUIMacros.cmake
+++ cmake/CEGUIMacros.cmake
@@ -316,33 +316,33 @@
     endif()

     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD
-        COMMAND if \[ x${_CEGUI_BUILD_CONFIG} == xDebug \]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\"
+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\"
         COMMENT "Removing old Frameworks in ${_TARGET_NAME}.app")
     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD
-        COMMAND if \[ x${_CEGUI_BUILD_CONFIG} == xDebug \]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\"
+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\"
         COMMENT "Removing old Resources in ${_TARGET_NAME}.app")

     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD
-        COMMAND if \[ x${_CEGUI_BUILD_CONFIG} == xDebug \]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\"
+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\"
         COMMENT "Creating Frameworks directory ${_TARGET_NAME}.app")
     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD
-        COMMAND if \[ x${_CEGUI_BUILD_CONFIG} == xDebug \]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\"
+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\"
         COMMENT "Creating Resources directory ${_TARGET_NAME}.app")

     if (NOT ${_STATIC})
         if (NOT CEGUI_BUILD_SHARED_LIBS_WITH_STATIC_DEPENDENCIES)
             add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD
-                COMMAND if \[ x${_CEGUI_BUILD_CONFIG} == xDebug \]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_PREFIX_PATH}/lib/dynamic/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\"
+                COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_PREFIX_PATH}/lib/dynamic/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\"
                 COMMENT "Creating ${_ACTIONMSG} dependency libraries in ${_TARGET_NAME}.app")
         endif()

         add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD
-            COMMAND if \[ x${_CEGUI_BUILD_CONFIG} == xDebug \]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\"
+            COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\"
             COMMENT "Creating ${_ACTIONMSG} built cegui libraries in ${_TARGET_NAME}.app")
     endif()

     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD
-        COMMAND if \[ x${_CEGUI_BUILD_CONFIG} == xDebug \]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_SOURCE_DIR}/datafiles \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/\"
+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_SOURCE_DIR}/datafiles \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/\"
         COMMENT "Creating ${_ACTIONMSG} sample datafiles ${_TARGET_NAME}.app")

     # When CEGUI_APPLE_SYMLINK_DEPENDENCIES_TO_SAMPLE_APPS is TRUE, this
@@ -352,7 +352,7 @@
     # CEGUI_APPLE_SYMLINK_DEPENDENCIES_TO_SAMPLE_APPS to false and the thing
     # will be copied to the output app bundle instead.
     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD
-        COMMAND if \[ x${_CEGUI_BUILD_CONFIG} == xDebug \]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_BINARY_DIR}/datafiles/samples \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/datafiles\"
+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_BINARY_DIR}/datafiles/samples \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/datafiles\"
         COMMENT "Creating ${_ACTIONMSG} samples.xml ${_TARGET_NAME}.app")
 endmacro()


change conan var name in ConanInline

change conan var name in ConanInline

--- cmake/ConanInline.cmake
+++ cmake/ConanInline.cmake
@@ -5,12 +5,12 @@
   # for backwards compatibility
   cmake_parse_arguments(MARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )

-  find_program(conan conan)
-  if(NOT EXISTS ${conan})
+  find_program(CONAN conan)
+  if(NOT EXISTS ${CONAN})
     message(FATAL_ERROR "Conan is required. Please see README.md")
     return()
   endif()
-  execute_process(COMMAND ${conan} --version
+  execute_process(COMMAND ${CONAN} --version
                   OUTPUT_VARIABLE CONAN_VERSION_OUTPUT)
   string(REGEX MATCHALL "[0-9.]+" CONAN_VERSION ${CONAN_VERSION_OUTPUT})
   if (NOT (CONAN_VERSION VERSION_GREATER_EQUAL 1.36.0))


use cppunit-config if possible, and if not, still make sure that the test works for cppunit/foo style headers as well as foo (osx was getting mismatches if there was a cppunit library anywhere, even if the headers were not found)

svn path=/trunk/kdesupport/strigi/; revision=677838

--- cmake/FindCppUnit.cmake
+++ cmake/FindCppUnit.cmake
@@ -5,8 +5,34 @@
 # CPPUNIT_INCLUDE_DIR - the libcppunit include directory
 # CPPUNIT_LIBRARIES - libcppunit library

-FIND_PATH(CPPUNIT_INCLUDE_DIR Test.h PATHS /usr/include/cppunit /usr/local/include/cppunit )
-FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS /usr/lib /usr/local/lib )
+IF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
+
+    # in cache already
+    SET(CppUnit_FOUND TRUE)
+
+ELSE(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
+
+    FIND_PROGRAM(CPPUNIT_CONFIG_EXECUTABLE cppunit-config PATHS
+        /usr/bin
+        /usr/local/bin
+    )
+
+    SET(CPPUNIT_INCLUDE_DIR)
+    SET(CPPUNIT_LIBRARIES)
+
+    IF(CPPUNIT_CONFIG_EXECUTABLE)
+        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_CFLAGS)
+        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --libs   RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_LIBRARIES)
+        STRING(REGEX REPLACE "-I(.+)" "\\1" CPPUNIT_CFLAGS "${CPPUNIT_CFLAGS}")
+    ELSE(CPPUNIT_CONFIG_EXECUTABLE)
+        # in case win32 needs to find it the old way?
+        FIND_PATH(CPPUNIT_CFLAGS cppunit/TestRunner.h PATHS /usr/include /usr/local/include )
+        FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS /usr/lib /usr/local/lib )
+    ENDIF(CPPUNIT_CONFIG_EXECUTABLE)
+
+    SET(CPPUNIT_INCLUDE_DIR ${CPPUNIT_CFLAGS} "${CPPUNIT_CFLAGS}/cppunit")
+
+ENDIF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)

 # IF(CPPUNIT_INCLUDE_DIR)
 #     message (STATUS "found cppunit include dir: ${CPPUNIT_INCLUDE_DIR}")
@@ -17,12 +43,12 @@
 # ENDIF (CPPUNIT_LIBRARIES)

 IF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-  SET(CppUnit_FOUND 1   )
+  SET(CppUnit_FOUND TRUE)
   if(NOT CppUnit_FIND_QUIETLY)
    message(STATUS "Found cppunit: ${CPPUNIT_LIBRARIES}")
   endif(NOT CppUnit_FIND_QUIETLY)
 ELSE(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-  SET(CppUnit_FOUND 0 CACHE BOOL "Not found cppunit library")
+  SET(CppUnit_FOUND FALSE CACHE BOOL "Not found cppunit library")
 ENDIF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)

 MARK_AS_ADVANCED(CPPUNIT_INCLUDE_DIR CPPUNIT_LIBRARIES)


jsoncpp prefix

jsoncpp prefix

--- cmake/FindJsoncpp.cmake
+++ cmake/FindJsoncpp.cmake
@@ -1,11 +1,17 @@
-find_path(
-	JSONCPP_INCLUDE_DIR
-	NAMES jsoncpp/json/json.h json/json.h
-	DOC "jsoncpp include dir"
+FIND_PATH (JSONCPP_ROOT_DIR
+  NAMES jsoncpp/json/value.h
+  PATHS ENV JSONCPPROOT
+  DOC "jsoncpp root directory")
+
+FIND_PATH (JSONCPP_INCLUDE_DIR
+  NAMES json/value.h
+  HINTS ${JSONCPP_ROOT_DIR}
+  PATH_SUFFIXES jsoncpp
+  DOC "jsoncpp include directory")
+
+
+find_library(
+    JSONCPP_LIBRARY
+    NAMES jsoncpp
 )

-find_library(
-	JSONCPP_LIBRARY
-	NAMES jsoncpp
-)
-


Refactoring tbag_modules__copy_file() cmake macro.

--- cmake/TbagModules.cmake
+++ cmake/TbagModules.cmake
@@ -232,11 +232,21 @@
     foreach (__cursor ${__glob_files})
         set (__cursor_src  "${__source_prefix}${__cursor}")
         set (__cursor_dest "${__destination_prefix}${__cursor}")
-        tbag_debug (tbag_modules__copy_file "Target(${__target}) copy info: ${__cursor_src} -> ${__cursor_dest}")
-        add_custom_command (
-                OUTPUT  "${__cursor_dest}"
-                COMMAND ${CMAKE_COMMAND} -E copy "${__cursor_src}" "${__cursor_dest}"
-                DEPENDS "${__cursor_src}")
+
+        if (IS_DIRECTORY "${__cursor_src}")
+            tbag_debug (tbag_modules__copy_dir "Target(${__target}) copy info: ${__cursor_src} -> ${__cursor_dest}")
+            add_custom_command (
+                    OUTPUT  "${__cursor_dest}"
+                    COMMAND ${CMAKE_COMMAND} -E copy_directory "${__cursor_src}" "${__cursor_dest}"
+                    DEPENDS "${__cursor_src}")
+        else ()
+            tbag_debug (tbag_modules__copy_file "Target(${__target}) copy info: ${__cursor_src} -> ${__cursor_dest}")
+            add_custom_command (
+                    OUTPUT  "${__cursor_dest}"
+                    COMMAND ${CMAKE_COMMAND} -E copy "${__cursor_src}" "${__cursor_dest}"
+                    DEPENDS "${__cursor_src}")
+        endif ()
+
         list (APPEND __copy_files "${__cursor_dest}")
         unset (__cursor_src)
         unset (__cursor_dest)


Fix llvm search for PCBSD

Fix llvm search for PCBSD

Apparently PCBSD uses llvm-config34, without the dash before "34"

--- cmake/LLVM.cmake
+++ cmake/LLVM.cmake
@@ -22,7 +22,7 @@
   message(STATUS "Using llvm-config: ${LLVM_CONFIG}")
   if(LLVM_CONFIG MATCHES "llvm-config${CMAKE_EXECUTABLE_SUFFIX}$")
     set(LLVM_BINARY_SUFFIX "")
-  elseif(LLVM_CONFIG MATCHES "llvm-config-(.*)${CMAKE_EXECUTABLE_SUFFIX}$")
+  elseif(LLVM_CONFIG MATCHES "llvm-config(.*)${CMAKE_EXECUTABLE_SUFFIX}$")
     set(LLVM_BINARY_SUFFIX "${CMAKE_MATCH_1}")
   else()
     message(WARNING "Cannot determine llvm binary suffix from ${LLVM_CONFIG}")
@@ -106,7 +106,7 @@
 ####################################################################

 macro(find_program_or_die OUTPUT_VAR PROG_NAME DOCSTRING)
-  find_program(${OUTPUT_VAR} NAMES "${PROG_NAME}-${LLVM_BINARY_SUFFIX}${CMAKE_EXECUTABLE_SUFFIX}" "${PROG_NAME}" DOC "${DOCSTRING}")
+  find_program(${OUTPUT_VAR} NAMES "${PROG_NAME}${LLVM_BINARY_SUFFIX}${CMAKE_EXECUTABLE_SUFFIX}" "${PROG_NAME}${CMAKE_EXECUTABLE_SUFFIX}" DOC "${DOCSTRING}")
   if(${OUTPUT_VAR})
     message(STATUS "Found ${PROG_NAME}: ${${OUTPUT_VAR}}")
   else()


Fix CMake math library.

Fix CMake math library.

Just in case we have a warning.

Change-Id: I5f2aabf5f4adaaf9ba6c4fbbbf352603259e8081

--- cmake/deps.cmake
+++ cmake/deps.cmake
@@ -58,10 +58,10 @@
 # We do not look for it as it is not found when
 # cross-compiling, while it is here.
 check_c_source_compiles("
-#include <math.h>
-int main(int argc, char** argv) {
-  return pow(argc, 2.5);
-}
+    #include <math.h>
+    int main(int argc, char** argv) {
+      return (int)pow(argc, 2.5);
+    }
   "
   HAVE_MATH_LIBRARY
 )


cmake: Ignore .ycm_extra_conf.pyc.

cmake: Ignore .ycm_extra_conf.pyc.

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

 ### source generator
 set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj/;tags;cscope.*")
+set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj/;tags;cscope.*;.ycm_extra_conf.pyc")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")

 if (WIN32)


Update models hash for multi instanced geometry.

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -16,5 +16,4 @@

 set(CTEST_PROJECT_NAME "Embree")
 set(CTEST_NIGHTLY_START_TIME "22:00:00 UTC")
-set(TEST_MODELS_HASH d113ca812525c61676e98c240c02ef6899306fa2)
-
+set(TEST_MODELS_HASH fa148f9c3dd78ebd821cb45f60d9872bf4f30cd6)


git-svn-id: https://glfx.googlecode.com/svn/trunk@63 5595c9b7-382c-e053-034d-f28d15879402

--- glfx.pc.cmake
+++ glfx.pc.cmake
@@ -3,4 +3,4 @@
 Requires:
 Version: @GLFX_VERSION@
 Libs: -L@LIB_DESTINATION@ -lglfx
-Cflags:
+Cflags: -I@INCLUDE_INSTALL_DIR@


Enabled parallel build for Visual Studio.

--- globals.cmake
+++ globals.cmake
@@ -55,7 +55,7 @@
 		-Wno-missing-braces)

 elseif(MSVC)
-	set(MIRRAGE_DEFAULT_COMPILER_ARGS /DWIN32_LEAN_AND_MEAN /DNOMINMAX)
+	set(MIRRAGE_DEFAULT_COMPILER_ARGS /DWIN32_LEAN_AND_MEAN /DNOMINMAX /MP)
 endif()

 # Select optimal linker