Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-08-14 17:13:36 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-08-14 17:13:36 +0400
commitc32fce07051572460070fb36ce85519565899c92 (patch)
tree76755649dad4e4c92276d794a7bdffd21af21f9e /CMakeLists.txt
parent08f0938434598b23d0dd1879f598e342a194cb63 (diff)
some fixes for netbsd with cmake
- CMake, use FIND_PACKAGE(Freetype) for unix/linux - Only link with libdl.so on linux - use statvfs rather then statfs for netbsd (size of statfs wasnt available) - add x11 include path with ghost, glu.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt33
1 files changed, 15 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa1e26606ba..bb2d336c747 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,19 +114,10 @@ IF(UNIX AND NOT APPLE)
IF(INTL_LIBRARY AND ICONV_LIBRARY)
SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
-
- FIND_PATH(FREETYPE_INC
- freetype
- PATHS
- /usr/local/include/freetype2
- /usr/include/freetype2
- /sw/include/freetype2
- /opt/local/include/freetype2
- /opt/csw/include/freetype2
- /opt/include/freetype2
- NO_DEFAULT_PATH
- )
- SET(FREETYPE_LIB freetype)
+
+ FIND_PACKAGE(Freetype)
+ SET(FREETYPE_INC "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE STRING "")
+ SET(FREETYPE_LIB "${FREETYPE_LIBRARY}" CACHE STRING "")
FIND_PACKAGE(PythonLibs)
SET(PYTHON_INC "${PYTHON_INCLUDE_PATH}" CACHE STRING "")
@@ -159,10 +150,10 @@ IF(UNIX AND NOT APPLE)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
IF(WITH_FFTW3)
- SET(FFTW3 /usr)
- SET(FFTW3_INC ${FFTW3}/include)
- SET(FFTW3_LIB fftw3)
- SET(FFTW3_LIBPATH ${FFTW3}/lib)
+ SET(FFTW3 /usr)
+ SET(FFTW3_INC ${FFTW3}/include)
+ SET(FFTW3_LIB fftw3)
+ SET(FFTW3_LIBPATH ${FFTW3}/lib)
ENDIF(WITH_FFTW3)
SET(LIBSAMPLERATE /usr)
@@ -176,7 +167,13 @@ IF(UNIX AND NOT APPLE)
FIND_PACKAGE(ZLIB REQUIRED)
- SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11 -ldl")
+ # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
+ SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ # BSD's dont use libdl.so
+ SET(LLIBS "${LLIBS} -ldl")
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
IF(WITH_OPENMP)
SET(LLIBS "${LLIBS} -lgomp")