diff options
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/blender/ChangeLog | 14 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.68.ebuild | 266 | ||||
| -rw-r--r-- | media-gfx/blender/files/01-blender-2.68-doxyfile.patch | 19 | ||||
| -rw-r--r-- | media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch | 61 | ||||
| -rw-r--r-- | media-gfx/blender/files/03-blender-2.68-remove-binreloc.patch | 36 | ||||
| -rw-r--r-- | media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch | 105 | ||||
| -rw-r--r-- | media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch | 561 | ||||
| -rw-r--r-- | media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch | 26 | ||||
| -rw-r--r-- | media-gfx/blender/files/07-blender-2.68-sse2.patch | 35 |
9 files changed, 1122 insertions, 1 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index b152e1f26403..4f3fbc59b8d5 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.252 2013/06/21 17:52:30 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.253 2013/07/19 18:07:25 hasufell Exp $ + +*blender-2.68 (19 Jul 2013) + + 19 Jul 2013; Julian Ospald <hasufell@gentoo.org> +blender-2.68.ebuild, + +files/01-blender-2.68-doxyfile.patch, + +files/06-blender-2.68-fix-install-rules.patch, + +files/03-blender-2.68-remove-binreloc.patch, + +files/07-blender-2.68-sse2.patch, + +files/02-blender-2.68-unbundle-colamd.patch, + +files/05-blender-2.68-unbundle-eigen3.patch, + +files/04-blender-2.68-unbundle-glog.patch: + version bump wrt #477408 21 Jun 2013; Julian Ospald <hasufell@gentoo.org> blender-2.67b-r1.ebuild, +files/01-blender-2.67b-doxyfile.patch, -files/blender-2.67b-doxyfile.patch, diff --git a/media-gfx/blender/blender-2.68.ebuild b/media-gfx/blender/blender-2.68.ebuild new file mode 100644 index 000000000000..b3b82beb0747 --- /dev/null +++ b/media-gfx/blender/blender-2.68.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.68.ebuild,v 1.1 2013/07/19 18:07:25 hasufell Exp $ + +# TODO: +# bundled-deps: bullet is modified +# multiple python abi? + +EAPI=5 +PYTHON_COMPAT=( python3_3 ) +#PATCHSET="1" + +inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="http://www.blender.org" + +case ${PV} in + *_p*) + SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; + *) + SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; +esac + +if [[ -n ${PATCHSET} ]]; then + SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" +fi + +SLOT="0" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="~amd64 ~x86" +IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + player? ( game-engine ) + redcode? ( jpeg2k ) + cycles? ( boost openexr tiff ) + nls? ( boost ) + game-engine? ( boost )" + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gflags + dev-cpp/glog[gflags] + dev-python/numpy[${PYTHON_USEDEP}] + >=media-libs/freetype-2.0 + media-libs/glew + media-libs/libpng:0 + media-libs/libsamplerate + sci-libs/colamd + sci-libs/ldl + sys-libs/zlib + virtual/glu + virtual/jpeg + virtual/libintl + virtual/opengl + x11-libs/libXi + x11-libs/libX11 + boost? ( >=dev-libs/boost-1.44[threads(+)] ) + collada? ( media-libs/opencollada ) + colorio? ( media-libs/opencolorio ) + cycles? ( + media-libs/openimageio + ) + ffmpeg? ( + >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k?] + ) + fftw? ( sci-libs/fftw:3.0 ) + jack? ( media-sound/jack-audio-connection-kit ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( >=media-libs/openal-1.6.372 ) + openexr? ( media-libs/openexr ) + sdl? ( media-libs/libsdl[audio,joystick] ) + sndfile? ( media-libs/libsndfile ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + >=dev-cpp/eigen-3.1.3:3 + doc? ( + app-doc/doxygen[-nodot(-),dot(+)] + dev-python/sphinx + ) + nls? ( sys-devel/gettext )" + +pkg_pretend() { + if use openmp && ! tc-has-openmp; then + eerror "You are using gcc built without 'openmp' USE." + eerror "Switch CXX to an OpenMP capable compiler." + die "Need openmp" + fi + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/01-${P}-doxyfile.patch \ + "${FILESDIR}"/02-${P}-unbundle-colamd.patch \ + "${FILESDIR}"/03-${P}-remove-binreloc.patch \ + "${FILESDIR}"/04-${P}-unbundle-glog.patch \ + "${FILESDIR}"/05-${P}-unbundle-eigen3.patch \ + "${FILESDIR}"/06-${P}-fix-install-rules.patch \ + "${FILESDIR}"/07-${P}-sse2.patch + + # remove some bundled deps + rm -r \ + extern/Eigen3 \ + extern/libopenjpeg \ + extern/glew \ + extern/colamd \ + extern/binreloc \ + extern/libmv/third_party/{ldl,glog,gflags} \ + || die + + # turn off binreloc (not cached) + sed -i \ + -e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \ + CMakeLists.txt || die + + # we don't want static glew, but it's scattered across + # thousand files + # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! + sed -i \ + -e '/-DGLEW_STATIC/d' \ + $(find . -type f -name "CMakeLists.txt") || die + + ewarn "$(echo "Remaining bundled dependencies:"; + ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" + + # linguas cleanup + local i + if ! use nls; then + rm -r "${S}"/release/datafiles/locale || die + else + if [[ -n "${LINGUAS+x}" ]] ; then + for i in "${S}"/release/datafiles/locale/* ; do + mylang=${i##*/} + has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } + done + fi + fi +} + +src_configure() { + # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu + # shadows, see bug #276338 for reference + append-flags -funsigned-char + append-lfs-flags + + # WITH_PYTHON_SECURITY + # WITH_PYTHON_SAFETY + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX=/usr + -DWITH_INSTALL_PORTABLE=OFF + $(cmake-utils_use_with boost BOOST) + $(cmake-utils_use_with cycles CYCLES) + $(cmake-utils_use_with collada OPENCOLLADA) + $(cmake-utils_use_with dds IMAGE_DDS) + $(cmake-utils_use_with elbeem MOD_FLUID) + $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) + $(cmake-utils_use_with fftw FFTW3) + $(cmake-utils_use_with fftw MOD_OCEANSIM) + $(cmake-utils_use_with game-engine GAMEENGINE) + $(cmake-utils_use_with nls INTERNATIONAL) + $(cmake-utils_use_with jack JACK) + $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) + $(cmake-utils_use_with openal OPENAL) + $(cmake-utils_use_with openexr IMAGE_OPENEXR) + $(cmake-utils_use_with openmp OPENMP) + $(cmake-utils_use_with player PLAYER) + $(cmake-utils_use_with redcode IMAGE_REDCODE) + $(cmake-utils_use_with sdl SDL) + $(cmake-utils_use_with sndfile CODEC_SNDFILE) + $(cmake-utils_use_with sse RAYOPTIMIZATION) + $(cmake-utils_use_with sse2 SSE2) + $(cmake-utils_use_with bullet BULLET) + $(cmake-utils_use_with tiff IMAGE_TIFF) + $(cmake-utils_use_with colorio OPENCOLORIO) + $(cmake-utils_use_with ndof INPUT_NDOF) + -DWITH_PYTHON_INSTALL=OFF + -DWITH_PYTHON_INSTALL_NUMPY=OFF + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_OPENJPEG=ON + -DWITH_SYSTEM_BULLET=OFF + -DPYTHON_VERSION="${EPYTHON/python/}" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc; then + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + fi +} + +src_test() { :; } + +src_install() { + local i + + # Pax mark blender for hardened support. + pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender + + if use doc; then + docinto "API/python" + dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* + + docinto "API/blender" + dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* + fi + + # fucked up cmake will relink binary for no reason + emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast + + # fix doc installdir + dohtml "${CMAKE_USE_DIR}"/release/text/readme.html + rm -rf "${ED%/}"/usr/share/doc/blender + + python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py + python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherit risks with running unknown python scripting." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "dragging the main menu down do display all paths." + elog + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} diff --git a/media-gfx/blender/files/01-blender-2.68-doxyfile.patch b/media-gfx/blender/files/01-blender-2.68-doxyfile.patch new file mode 100644 index 000000000000..c11c793fda97 --- /dev/null +++ b/media-gfx/blender/files/01-blender-2.68-doxyfile.patch @@ -0,0 +1,19 @@ +commit 62308d9fc24bde22a50497816c44c8ca91f96f63 +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:36:34 2013 +0200 + + remove hhc.exe reference + +diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile +index 397cc30..ac61756 100644 +--- a/doc/doxygen/Doxyfile ++++ b/doc/doxygen/Doxyfile +@@ -1051,7 +1051,7 @@ CHM_FILE = blender.chm + # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run + # the HTML help compiler on the generated index.hhp. + +-HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe" ++HHC_LOCATION = + + # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag + # controls if a separate .chi index file is generated (YES) or that diff --git a/media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch b/media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch new file mode 100644 index 000000000000..7103a57cb568 --- /dev/null +++ b/media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch @@ -0,0 +1,61 @@ +commit f6af85bef74ae6d1df1e811db7274829e50f10a9 +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:37:21 2013 +0200 + + unbundle colamd + +diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt +index f6de873..2b40c22 100644 +--- a/extern/CMakeLists.txt ++++ b/extern/CMakeLists.txt +@@ -26,7 +26,6 @@ + # Otherwise we get warnings here that we cant fix in external projects + remove_strict_flags() + +-add_subdirectory(colamd) + add_subdirectory(rangetree) + add_subdirectory(wcwidth) + add_subdirectory(libmv) +diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt +index d91319d..bc3baee 100644 +--- a/source/blenderplayer/CMakeLists.txt ++++ b/source/blenderplayer/CMakeLists.txt +@@ -170,8 +170,6 @@ endif() + list(APPEND BLENDER_SORTED_LIBS extern_ceres) + endif() + +- list(APPEND BLENDER_SORTED_LIBS extern_colamd) +- + if(WITH_MOD_BOOLEAN) + list(APPEND BLENDER_SORTED_LIBS bf_intern_bsp) + list(APPEND BLENDER_SORTED_LIBS bf_intern_moto) +@@ -214,7 +212,7 @@ endif() + list(SORT REM_MSG) + message(STATUS "Player Skipping: (${REM_MSG})") + endif() +- target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS}) ++ target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS} colamd) + + unset(SEARCHLIB) + unset(SORTLIB) +diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt +index 8ff4ec4..c84d944 100644 +--- a/source/creator/CMakeLists.txt ++++ b/source/creator/CMakeLists.txt +@@ -919,7 +919,6 @@ endif() + bf_intern_smoke + extern_minilzo + extern_lzma +- extern_colamd + ge_logic_ketsji + extern_recastnavigation + ge_logic +@@ -1033,7 +1032,7 @@ endif() + list(SORT REM_MSG) + message(STATUS "Blender Skipping: (${REM_MSG})") + endif() +- target_link_libraries(blender ${BLENDER_SORTED_LIBS}) ++ target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd) + + unset(SEARCHLIB) + unset(SORTLIB) diff --git a/media-gfx/blender/files/03-blender-2.68-remove-binreloc.patch b/media-gfx/blender/files/03-blender-2.68-remove-binreloc.patch new file mode 100644 index 000000000000..84278a5dcc45 --- /dev/null +++ b/media-gfx/blender/files/03-blender-2.68-remove-binreloc.patch @@ -0,0 +1,36 @@ +commit 6e212fef06cf18ce57a1f613e7c7a8e9ee72662e +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:37:46 2013 +0200 + + remove binreloc references + +diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt +index 2b40c22..2823c7a 100644 +--- a/extern/CMakeLists.txt ++++ b/extern/CMakeLists.txt +@@ -41,10 +41,6 @@ endif() + # add_subdirectory(eltopo) + #endif() + +-if(WITH_BINRELOC) +- add_subdirectory(binreloc) +-endif() +- + if(NOT WITH_SYSTEM_GLEW) + add_subdirectory(glew) + endif() +diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt +index bc3baee..2fa78b9 100644 +--- a/source/blenderplayer/CMakeLists.txt ++++ b/source/blenderplayer/CMakeLists.txt +@@ -81,10 +81,6 @@ list(APPEND BLENDER_LINK_LIBS + blenkernel_blc + ) + +-if(CMAKE_SYSTEM_NAME MATCHES "Linux") +- list(APPEND BLENDER_LINK_LIBS extern_binreloc) +-endif() +- + # if(UNIX) + # Sort libraries + set(BLENDER_SORTED_LIBS diff --git a/media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch new file mode 100644 index 000000000000..2ac54394db1c --- /dev/null +++ b/media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch @@ -0,0 +1,105 @@ +commit 26e853d31931a8bb08695aa98ae53b263236d407 +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:40:23 2013 +0200 + + unbundle glog/gflags + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b1a7830..a30831c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) + + #----------------------------------------------------------------------------- ++# Check for some modules ++if(UNIX) ++ find_package(PkgConfig) ++ pkg_check_modules(_PC_GFLAGS libgflags) ++ pkg_check_modules(_PC_GLOG libglog) ++endif() ++ ++#----------------------------------------------------------------------------- + # Set default config options + + get_blender_version() +diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt +index 2c9a219..7061e04 100644 +--- a/extern/libmv/CMakeLists.txt ++++ b/extern/libmv/CMakeLists.txt +@@ -88,9 +88,6 @@ if(WITH_LIBMV) + third_party/fast/fast_9.c + third_party/fast/fast.c + third_party/fast/nonmax.c +- third_party/gflags/gflags.cc +- third_party/gflags/gflags_completions.cc +- third_party/gflags/gflags_reporting.cc + + libmv/base/id_generator.h + libmv/base/scoped_ptr.h +@@ -141,12 +138,6 @@ if(WITH_LIBMV) + libmv/tracking/trklt_region_tracker.h + + third_party/fast/fast.h +- third_party/gflags/config.h +- third_party/gflags/gflags/gflags_completions.h +- third_party/gflags/gflags/gflags_declare.h +- third_party/gflags/gflags/gflags.h +- third_party/gflags/mutex.h +- third_party/gflags/util.h + third_party/msinttypes/inttypes.h + third_party/msinttypes/stdint.h + ) +@@ -187,42 +178,6 @@ if(WITH_LIBMV) + third_party/msinttypes + ) + endif() +- else() +- list(APPEND SRC +- third_party/glog/src/demangle.cc +- third_party/glog/src/logging.cc +- third_party/glog/src/raw_logging.cc +- third_party/glog/src/signalhandler.cc +- third_party/glog/src/symbolize.cc +- third_party/glog/src/utilities.cc +- third_party/glog/src/vlog_is_on.cc +- +- third_party/glog/src/base/commandlineflags.h +- third_party/glog/src/base/googleinit.h +- third_party/glog/src/base/mutex.h +- third_party/glog/src/config_freebsd.h +- third_party/glog/src/config.h +- third_party/glog/src/config_hurd.h +- third_party/glog/src/config_linux.h +- third_party/glog/src/config_mac.h +- third_party/glog/src/demangle.h +- third_party/glog/src/glog/logging.h +- third_party/glog/src/glog/log_severity.h +- third_party/glog/src/glog/raw_logging.h +- third_party/glog/src/glog/vlog_is_on.h +- third_party/glog/src/stacktrace_generic-inl.h +- third_party/glog/src/stacktrace.h +- third_party/glog/src/stacktrace_libunwind-inl.h +- third_party/glog/src/stacktrace_powerpc-inl.h +- third_party/glog/src/stacktrace_x86_64-inl.h +- third_party/glog/src/stacktrace_x86-inl.h +- third_party/glog/src/symbolize.h +- third_party/glog/src/utilities.h +- ) +- +- list(APPEND INC +- third_party/glog/src +- ) + endif() + + add_definitions( +@@ -234,7 +189,9 @@ else() + ) + endif() + ++include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS}) + blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") ++target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES}) + + if(WITH_LIBMV) + add_subdirectory(third_party) diff --git a/media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch b/media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch new file mode 100644 index 000000000000..f211dffb5eb3 --- /dev/null +++ b/media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch @@ -0,0 +1,561 @@ +commit 03b41be3de15b4810e55ff1988d27d28eb358df0 +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:47:43 2013 +0200 + + unbundle Eigen3 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a30831c..78bb3c6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -109,6 +109,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) + # Check for some modules + if(UNIX) + find_package(PkgConfig) ++ pkg_check_modules(_PC_EIGEN3 eigen3) + pkg_check_modules(_PC_GFLAGS libgflags) + pkg_check_modules(_PC_GLOG libglog) + endif() +diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt +index 7061e04..b8ab180 100644 +--- a/extern/libmv/CMakeLists.txt ++++ b/extern/libmv/CMakeLists.txt +@@ -44,7 +44,7 @@ if(WITH_LIBMV) + ) + + set(INC_SYS +- ../Eigen3 ++ ${_PC_EIGEN3_INCLUDE_DIRS} + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} + ) +diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt +index 0645883..d79fe9e 100644 +--- a/extern/libmv/third_party/ceres/CMakeLists.txt ++++ b/extern/libmv/third_party/ceres/CMakeLists.txt +@@ -35,7 +35,7 @@ set(INC + ) + + set(INC_SYS +- ../../../Eigen3 ++ ${_PC_EIGEN3_INCLUDE_DIRS} + ) + + set(SRC +diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt +index da5e10f..a4aae1b 100644 +--- a/intern/dualcon/CMakeLists.txt ++++ b/intern/dualcon/CMakeLists.txt +@@ -22,7 +22,7 @@ set(INC + ) + + set(INC_SYS +- ../../extern/Eigen3 ++ ${_PC_EIGEN3_INCLUDE_DIRS} + ) + + set(SRC +diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt +index bc3ea0c..f8cbc23 100644 +--- a/intern/itasc/CMakeLists.txt ++++ b/intern/itasc/CMakeLists.txt +@@ -28,7 +28,7 @@ set(INC + ) + + set(INC_SYS +- ../../extern/Eigen3 ++ ${_PC_EIGEN3_INCLUDE_DIRS} + ) + + set(SRC +@@ -121,235 +121,235 @@ set(SRC + kdl/framevel.inl + + # until we have another user... +- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h +- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h +- ../../extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h +- ../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h +- ../../extern/Eigen3/Eigen/src/Core/Array.h +- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h +- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h +- ../../extern/Eigen3/Eigen/src/Core/Assign.h +- ../../extern/Eigen3/Eigen/src/Core/Assign_MKL.h +- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/Block.h +- ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h +- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h +- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h +- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h +- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h +- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h +- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h +- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h +- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h +- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h +- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h +- ../../extern/Eigen3/Eigen/src/Core/Dot.h +- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h +- ../../extern/Eigen3/Eigen/src/Core/Flagged.h +- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h +- ../../extern/Eigen3/Eigen/src/Core/Functors.h +- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h +- ../../extern/Eigen3/Eigen/src/Core/GeneralProduct.h +- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h +- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h +- ../../extern/Eigen3/Eigen/src/Core/IO.h +- ../../extern/Eigen3/Eigen/src/Core/Map.h +- ../../extern/Eigen3/Eigen/src/Core/MapBase.h +- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h +- ../../extern/Eigen3/Eigen/src/Core/Matrix.h +- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h +- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h +- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h +- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h +- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h +- ../../extern/Eigen3/Eigen/src/Core/Product.h +- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h +- ../../extern/Eigen3/Eigen/src/Core/Random.h +- ../../extern/Eigen3/Eigen/src/Core/Redux.h +- ../../extern/Eigen3/Eigen/src/Core/Replicate.h +- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h +- ../../extern/Eigen3/Eigen/src/Core/Reverse.h +- ../../extern/Eigen3/Eigen/src/Core/Select.h +- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h +- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h +- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h +- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h +- ../../extern/Eigen3/Eigen/src/Core/Stride.h +- ../../extern/Eigen3/Eigen/src/Core/Swap.h +- ../../extern/Eigen3/Eigen/src/Core/Transpose.h +- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h +- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h +- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h +- ../../extern/Eigen3/Eigen/src/Core/Visitor.h +- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h +- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h +- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h +- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h +- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h +- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h +- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h +- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h +- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_MKL.h +- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_MKL.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h +- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h +- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h +- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h +- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h +- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h +- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h +- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h +- ../../extern/Eigen3/Eigen/src/Core/util/MKL_support.h +- ../../extern/Eigen3/Eigen/src/Core/util/NonMPL2.h +- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h +- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h +- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_MKL.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_MKL.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h +- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h +- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h +- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h +- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h +- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h +- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h +- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h +- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h +- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h +- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h +- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h +- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h +- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h +- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h +- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h +- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h +- ../../extern/Eigen3/Eigen/src/Householder/Householder.h +- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h +- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h +- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h +- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h +- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h +- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h +- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h +- ../../extern/Eigen3/Eigen/src/LU/Determinant.h +- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h +- ../../extern/Eigen3/Eigen/src/LU/Inverse.h +- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h +- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU_MKL.h +- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h +- ../../extern/Eigen3/Eigen/src/misc/blas.h +- ../../extern/Eigen3/Eigen/src/misc/Image.h +- ../../extern/Eigen3/Eigen/src/misc/Kernel.h +- ../../extern/Eigen3/Eigen/src/misc/Solve.h +- ../../extern/Eigen3/Eigen/src/misc/SparseSolve.h +- ../../extern/Eigen3/Eigen/src/OrderingMethods/Amd.h +- ../../extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h +- ../../extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h +- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h +- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h +- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h +- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_MKL.h +- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h +- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h +- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR_MKL.h +- ../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h +- ../../extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h +- ../../extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h +- ../../extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h +- ../../extern/Eigen3/Eigen/src/SparseCore/CoreIterators.h +- ../../extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDot.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseVector.h +- ../../extern/Eigen3/Eigen/src/SparseCore/SparseView.h +- ../../extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h +- ../../extern/Eigen3/Eigen/src/StlSupport/details.h +- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h +- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h +- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h +- ../../extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h +- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h +- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD_MKL.h +- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h +- ../../extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Cholesky/LDLT.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Cholesky/LLT.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Cholesky/LLT_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/CholmodSupport/CholmodSupport.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Array.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ArrayBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ArrayWrapper.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Assign.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Assign_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/BandMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Block.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/BooleanRedux.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CommaInitializer.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseBinaryOp.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseNullaryOp.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseUnaryOp.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseUnaryView.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DenseBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DenseCoeffsBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DenseStorage.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Diagonal.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DiagonalMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DiagonalProduct.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Dot.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/EigenBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Flagged.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ForceAlignedAccess.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Functors.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Fuzzy.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/GeneralProduct.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/GenericPacketMath.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/GlobalFunctions.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/IO.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Map.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/MapBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/MathFunctions.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Matrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/MatrixBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/NestByValue.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/NoAlias.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/NumTraits.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/PermutationMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/PlainObjectBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Product.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ProductBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Random.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Redux.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Replicate.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ReturnByValue.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Reverse.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Select.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/SelfAdjointView.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/SelfCwiseBinaryOp.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/SolveTriangular.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/StableNorm.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Stride.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Swap.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Transpose.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Transpositions.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/TriangularMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/VectorBlock.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/VectorwiseOp.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Visitor.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/AltiVec/Complex.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/AltiVec/PacketMath.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/Default/Settings.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/NEON/Complex.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/NEON/PacketMath.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/SSE/Complex.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/SSE/MathFunctions.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/SSE/PacketMath.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/CoeffBasedProduct.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralBlockPanelKernel.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixVector.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixVector_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/Parallelizer.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixVector.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointProduct.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointRank2Update.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixVector.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixVector_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularSolverMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularSolverVector.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/BlasUtil.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Constants.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/DisableStupidWarnings.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/ForwardDeclarations.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Macros.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Memory.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Meta.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/MKL_support.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/NonMPL2.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/ReenableStupidWarnings.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/StaticAssert.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/XprHelper.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Block.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Cwise.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/CwiseOperators.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Lazy.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/LeastSquares.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/LU.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Macros.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/MathFunctions.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Memory.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Meta.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Minor.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/QR.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/SVD.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/TriangularSolver.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/VectorBlock.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/AlignedBox.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/All.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/AngleAxis.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Hyperplane.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Quaternion.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Rotation2D.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/RotationBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Scaling.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Transform.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Translation.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/ComplexEigenSolver.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/ComplexSchur.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/ComplexSchur_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/EigenSolver.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/HessenbergDecomposition.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/RealSchur.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/RealSchur_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/Tridiagonalization.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/AlignedBox.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/AngleAxis.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/EulerAngles.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Homogeneous.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Hyperplane.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/OrthoMethods.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/ParametrizedLine.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Quaternion.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Rotation2D.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/RotationBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Scaling.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Transform.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Translation.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Umeyama.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/arch/Geometry_SSE.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Householder/BlockHouseholder.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Householder/Householder.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Householder/HouseholderSequence.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Jacobi/Jacobi.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/Determinant.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/FullPivLU.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/Inverse.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/PartialPivLU.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/PartialPivLU_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/arch/Inverse_SSE.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/blas.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/Image.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/Kernel.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/Solve.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/SparseSolve.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/OrderingMethods/Amd.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/PardisoSupport/PardisoSupport.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/PaStiXSupport/PaStiXSupport.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/ArrayCwiseBinaryOps.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/ArrayCwiseUnaryOps.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/BlockMethods.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/CommonCwiseBinaryOps.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/CommonCwiseUnaryOps.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/MatrixCwiseBinaryOps.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/MatrixCwiseUnaryOps.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/ColPivHouseholderQR.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/ColPivHouseholderQR_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/FullPivHouseholderQR.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/HouseholderQR.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/HouseholderQR_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCholesky/SimplicialCholesky.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/AmbiVector.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/CompressedStorage.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/CoreIterators.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/MappedSparseMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseAssign.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseBlock.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseCwiseBinaryOp.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseCwiseUnaryOp.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseDenseProduct.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseDiagonalProduct.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseDot.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseFuzzy.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseMatrix.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseMatrixBase.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparsePermutation.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseProduct.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseRedux.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseSelfAdjointView.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseSparseProductWithPruning.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseTranspose.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseTriangularView.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseUtil.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseVector.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseView.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/TriangularSolver.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/details.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/StdDeque.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/StdList.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/StdVector.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SuperLUSupport/SuperLUSupport.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SVD/JacobiSVD.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SVD/JacobiSVD_MKL.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SVD/UpperBidiagonalization.h ++ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/UmfPackSupport/UmfPackSupport.h + ) + + +diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt +index 0a0e0e6..45fe6c9 100644 +--- a/source/blender/ikplugin/CMakeLists.txt ++++ b/source/blender/ikplugin/CMakeLists.txt +@@ -59,7 +59,7 @@ if(WITH_IK_ITASC) + ../../../intern/itasc + ) + list(APPEND INC_SYS +- ../../../extern/Eigen3 ++ ${_PC_EIGEN3_INCLUDE_DIRS} + ) + list(APPEND SRC + intern/itasc_plugin.cpp +diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt +index 084a85c..7cdfa01 100644 +--- a/source/gameengine/Converter/CMakeLists.txt ++++ b/source/gameengine/Converter/CMakeLists.txt +@@ -57,7 +57,7 @@ set(INC + set(INC_SYS + ../../../intern/moto/include + ../../../extern/recastnavigation/Detour/Include +- ../../../extern/Eigen3 ++ ${_PC_EIGEN3_INCLUDE_DIRS} + ${PTHREADS_INCLUDE_DIRS} + ${BOOST_INCLUDE_DIR} + ) diff --git a/media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch b/media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch new file mode 100644 index 000000000000..aa8ecc9f6174 --- /dev/null +++ b/media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch @@ -0,0 +1,26 @@ +commit 94eed33f878e35a8c7b69b0c23b3b30026460f33 +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:50:08 2013 +0200 + + remove stupid uninstall snippet + + whoever coded this... it is dangerous + uninstall methods have NO PLACE in install rules + +diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt +index c84d944..2b9bf46 100644 +--- a/source/creator/CMakeLists.txt ++++ b/source/creator/CMakeLists.txt +@@ -268,12 +268,6 @@ endif() + # Install Targets (Generic, All Platforms) + + +-# important to make a clean install each time, else old scripts get loaded. +-install( +- CODE +- "file(REMOVE_RECURSE ${TARGETDIR_VER})" +-) +- + if(WITH_PYTHON) + # install(CODE "message(\"copying blender scripts...\")") + diff --git a/media-gfx/blender/files/07-blender-2.68-sse2.patch b/media-gfx/blender/files/07-blender-2.68-sse2.patch new file mode 100644 index 000000000000..18b12db700d0 --- /dev/null +++ b/media-gfx/blender/files/07-blender-2.68-sse2.patch @@ -0,0 +1,35 @@ +commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6 +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:50:19 2013 +0200 + + add option to explicitly control sse2 optimization + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78bb3c6..d5f4576 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,6 +86,7 @@ cmake_policy(SET CMP0014 NEW) + #----------------------------------------------------------------------------- + # Load some macros. + include(build_files/cmake/macros.cmake) ++include(CMakeDependentOption) + + + #----------------------------------------------------------------------------- +@@ -255,6 +256,7 @@ option(WITH_FREESTYLE "Enable Freestyle (advanced edges rendering)" ON) + # Misc + option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) + option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) ++cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF) + if(UNIX AND NOT APPLE) + option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) + option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF) +@@ -1833,7 +1835,7 @@ if(WITH_RAYOPTIMIZATION) + set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") + add_definitions(-D__SSE__ -D__MMX__) + endif() +- if(SUPPORT_SSE2_BUILD) ++ if(WITH_SSE2 AND SUPPORT_SSE2_BUILD) + set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") + add_definitions(-D__SSE2__) + if(NOT SUPPORT_SSE_BUILD) # dont double up |