first attempt at CMake fix (untested)

This commit is contained in:
Mike Erwin
2011-06-27 23:24:24 +00:00
parent 5c2e4318b5
commit 30b4ff8949
2 changed files with 22 additions and 1 deletions

View File

@@ -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")