From 30b4ff8949089ebb00a77356cecae0f31c80e0a9 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Mon, 27 Jun 2011 23:24:24 +0000 Subject: first attempt at CMake fix (untested) --- CMakeLists.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f99136097c..935918a9326 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,6 +155,7 @@ option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON) # Misc +option(WITH_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) if(UNIX AND NOT APPLE) option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) @@ -418,6 +419,15 @@ if(UNIX AND NOT APPLE) unset(JEMALLOC) endif() + if (WITH_NDOF) + if(CMAKE_SYSTEM_NAME MATCHES "Linux") + set(NDOF /usr) + set(NDOF_INC ${NDOF}/include) + set(NDOF_LIB spnav) + set(NDOF_LIBPATH ${FFTW3}/lib) + endif() + endif() + # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed set(LLIBS "-lutil -lc -lm -lpthread -lstdc++") @@ -960,6 +970,11 @@ elseif(APPLE) set(TIFF_LIBPATH ${TIFF}/lib) endif() + if (WITH_NDOF) + # GHOST_NDOFManagerCocoa.mm needs "-fpascal-strings" + # linker needs "-weak_framework 3DconnexionClient" + endif() + set(EXETYPE MACOSX_BUNDLE) set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g") -- cgit v1.2.3 From 6cd4716d1a55d9f1b407d0196604f31aabec6c5a Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Thu, 21 Jul 2011 21:34:28 +0000 Subject: enable CMake builds with spacenav (contributed by Kevin Cozens) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index cb59b35f406..19d9ea942a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -457,7 +457,7 @@ if(UNIX AND NOT APPLE) set(NDOF /usr) set(NDOF_INC ${NDOF}/include) set(NDOF_LIB spnav) - set(NDOF_LIBPATH ${FFTW3}/lib) + set(NDOF_LIBPATH ${NDOF}/lib) endif() endif() -- cgit v1.2.3 From ff5a49b8161734424b3d8c83c67a5e26b9b16a1e Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Sat, 23 Jul 2011 21:33:04 +0000 Subject: another CMake build fix (contributed by Kevin Cozens) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 19d9ea942a3..764e9f93414 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -456,7 +456,7 @@ if(UNIX AND NOT APPLE) if(CMAKE_SYSTEM_NAME MATCHES "Linux") set(NDOF /usr) set(NDOF_INC ${NDOF}/include) - set(NDOF_LIB spnav) + set(NDOF_LIBRARY spnav) set(NDOF_LIBPATH ${NDOF}/lib) endif() endif() -- cgit v1.2.3 From 73a9ce7ec04bd1170b292c8f2c83a8c5c10a95ad Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 27 Jul 2011 07:42:53 +0000 Subject: svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender . --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 764e9f93414..9f833aef31e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,6 +155,7 @@ option(WITH_IMAGE_DDS "Enable DDS Image Support" ON) option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON) option(WITH_IMAGE_HDR "Enable HDR Image Support" ON) option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF) +option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON) # Audio/Video format support option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF) -- cgit v1.2.3