diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-14 05:32:59 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-14 05:32:59 +0400 |
commit | ac51152ec507cb141a598d2edd7fe32840999a94 (patch) | |
tree | b2d77be7895b2d370d677321ac8f7cb664ea94d5 /build_files | |
parent | 272bdce84d476154a85c4ac02b751f49033fffc9 (diff) | |
parent | dd2a2ec6993060f3dbf62c64c4ff56bcca02c54f (diff) |
svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/config/user-config-i686.py | 4 | ||||
-rw-r--r-- | build_files/buildbot/config/user-config-x86_64.py | 4 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindOpenCOLLADA.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindPCRE.cmake | 104 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindXML2.cmake | 134 |
5 files changed, 131 insertions, 117 deletions
diff --git a/build_files/buildbot/config/user-config-i686.py b/build_files/buildbot/config/user-config-i686.py index 07dc4a9d831..5fe3d6891fd 100644 --- a/build_files/buildbot/config/user-config-i686.py +++ b/build_files/buildbot/config/user-config-i686.py @@ -87,6 +87,10 @@ WITH_BF_STATIC3DMOUSE = True BF_3DMOUSE = '/home/sources/staticlibs/spnav' BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32' +# FFT +WITH_BF_FFTW3 = True +WITH_BF_STATICFFTW3 = True + # Compilation and optimization BF_DEBUG = False REL_CFLAGS = ['-O2'] diff --git a/build_files/buildbot/config/user-config-x86_64.py b/build_files/buildbot/config/user-config-x86_64.py index 9c569ff4458..b8b2d7f7a5f 100644 --- a/build_files/buildbot/config/user-config-x86_64.py +++ b/build_files/buildbot/config/user-config-x86_64.py @@ -87,6 +87,10 @@ WITH_BF_STATIC3DMOUSE = True BF_3DMOUSE = '/home/sources/staticlibs/spnav' BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64' +# FFT +WITH_BF_FFTW3 = True +WITH_BF_STATICFFTW3 = True + # Compilation and optimization BF_DEBUG = False REL_CFLAGS = ['-O2'] diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index a9a1d544507..0c8d8c8d841 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -119,8 +119,8 @@ FOREACH(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS}) # Ubuntu ppa needs this. lib64/opencollada lib/opencollada ) + MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) IF(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) - MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY) LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}") ENDIF() ENDFOREACH() diff --git a/build_files/cmake/Modules/FindPCRE.cmake b/build_files/cmake/Modules/FindPCRE.cmake index a09375287a6..9d73e9200d9 100644 --- a/build_files/cmake/Modules/FindPCRE.cmake +++ b/build_files/cmake/Modules/FindPCRE.cmake @@ -1,43 +1,69 @@ -# - Try to find the PCRE regular expression library -# Once done this will define +# - Find PCRE library +# Find the native PCRE includes and library +# This module defines +# PCRE_INCLUDE_DIRS, where to find pcre.h, Set when +# PCRE_INCLUDE_DIR is found. +# PCRE_LIBRARIES, libraries to link against to use PCRE. +# PCRE_ROOT_DIR, The base directory to search for PCRE. +# This can also be an environment variable. +# PCRE_FOUND, If false, do not try to use PCRE. # -# PCRE_FOUND - system has the PCRE library -# PCRE_INCLUDE_DIR - the PCRE include directory -# PCRE_LIBRARIES - The libraries needed to use PCRE +# also defined, but not for general use are +# PCRE_LIBRARY, where to find the PCRE library. -# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org> +#============================================================================= +# Copyright 2011 Blender Foundation. # -# Redistribution and use is allowed according to the terms of the BSD license. - -if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY) - # Already in cache, be silent - set(PCRE_FIND_QUIETLY TRUE) -endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY) - -if (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) - pkg_check_modules(PC_PCRE QUIET libpcre) - set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER}) -endif (NOT WIN32) - -find_path(PCRE_INCLUDE_DIR pcre.h - HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS} - PATH_SUFFIXES pcre) - -find_library(PCRE_PCRE_LIBRARY NAMES pcre HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS}) - -find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS}) - -include(FindPackageHandleStandardArgs) - -IF(NOT WIN32) - find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY ) - mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY) - set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY}) -ELSE() - find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY ) - set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ) - mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCRE_LIBRARY) +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= + +# If PCRE_ROOT_DIR was defined in the environment, use it. +IF(NOT PCRE_ROOT_DIR AND NOT $ENV{PCRE_ROOT_DIR} STREQUAL "") + SET(PCRE_ROOT_DIR $ENV{PCRE_ROOT_DIR}) ENDIF() + +SET(_pcre_SEARCH_DIRS + ${PCRE_ROOT_DIR} + /usr/local + /sw # Fink + /opt/local # DarwinPorts + /opt/csw # Blastwave +) + +FIND_PATH(PCRE_INCLUDE_DIR pcre.h + HINTS + ${_pcre_SEARCH_DIRS} + PATH_SUFFIXES + include + include +) + +FIND_LIBRARY(PCRE_LIBRARY + NAMES + pcre + HINTS + ${_pcre_SEARCH_DIRS} + PATH_SUFFIXES + lib64 lib + ) + +# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG + PCRE_LIBRARY PCRE_INCLUDE_DIR) + +IF(PCRE_FOUND) + SET(PCRE_LIBRARIES ${PCRE_LIBRARY}) + SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR}) +ENDIF(PCRE_FOUND) + +MARK_AS_ADVANCED( + PCRE_INCLUDE_DIR + PCRE_LIBRARY +) diff --git a/build_files/cmake/Modules/FindXML2.cmake b/build_files/cmake/Modules/FindXML2.cmake index e9f9fb3ca74..40cc332fb88 100644 --- a/build_files/cmake/Modules/FindXML2.cmake +++ b/build_files/cmake/Modules/FindXML2.cmake @@ -1,88 +1,68 @@ -# - Try to find XML2 -# Once done this will define +# - Find XML2 library +# Find the native XML2 includes and library +# This module defines +# XML2_INCLUDE_DIRS, where to find xml2.h, Set when +# XML2_INCLUDE_DIR is found. +# XML2_LIBRARIES, libraries to link against to use XML2. +# XML2_ROOT_DIR, The base directory to search for XML2. +# This can also be an environment variable. +# XML2_FOUND, If false, do not try to use XML2. # -# XML2_FOUND - system has XML2 -# XML2_INCLUDE_DIRS - the XML2 include directory -# XML2_LIBRARIES - Link these to use XML2 -# XML2_DEFINITIONS - Compiler switches required for using XML2 -# -# Copyright (c) 2008 Andreas Schneider <mail@cynapses.org> +# also defined, but not for general use are +# XML2_LIBRARY, where to find the XML2 library. + +#============================================================================= +# Copyright 2011 Blender Foundation. # -# Redistribution and use is allowed according to the terms of the New -# BSD license. +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. # +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# If XML2_ROOT_DIR was defined in the environment, use it. +IF(NOT XML2_ROOT_DIR AND NOT $ENV{XML2_ROOT_DIR} STREQUAL "") + SET(XML2_ROOT_DIR $ENV{XML2_ROOT_DIR}) +ENDIF() -if (XML2_LIBRARIES AND XML2_INCLUDE_DIRS) - # in cache already - set(XML2_FOUND TRUE) -else (XML2_LIBRARIES AND XML2_INCLUDE_DIRS) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - include(UsePkgConfig) - pkgconfig(libxml-2.0 _XML2_INCLUDEDIR _XML2_LIBDIR _XML2_LDFLAGS _XML2_CFLAGS) - else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(_XML2 libxml-2.0) - endif (PKG_CONFIG_FOUND) - endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - find_path(XML2_INCLUDE_DIR - NAMES - libxml/xpath.h - PATHS - ${_XML2_INCLUDEDIR} - /usr/include - /usr/local/include - /opt/local/include - /sw/include - PATH_SUFFIXES - libxml2 - ) - - find_library(XML2_LIBRARY - NAMES - xml2 - PATHS - ${_XML2_LIBDIR} - /usr/lib - /usr/local/lib - /opt/local/lib - /sw/lib - ) +SET(_xml2_SEARCH_DIRS + ${XML2_ROOT_DIR} + /usr/local + /sw # Fink + /opt/local # DarwinPorts + /opt/csw # Blastwave +) - if (XML2_LIBRARY) - set(XML2_FOUND TRUE) - endif (XML2_LIBRARY) +FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h + HINTS + ${_xml2_SEARCH_DIRS} + PATH_SUFFIXES + include +) - set(XML2_INCLUDE_DIRS - ${XML2_INCLUDE_DIR} +FIND_LIBRARY(XML2_LIBRARY + NAMES + xml2 + HINTS + ${_xml2_SEARCH_DIRS} + PATH_SUFFIXES + lib64 lib ) - if (XML2_FOUND) - set(XML2_LIBRARIES - ${XML2_LIBRARIES} - ${XML2_LIBRARY} - ) - endif (XML2_FOUND) - - if (XML2_INCLUDE_DIRS AND XML2_LIBRARIES) - set(XML2_FOUND TRUE) - endif (XML2_INCLUDE_DIRS AND XML2_LIBRARIES) - - if (XML2_FOUND) - if (NOT XML2_FIND_QUIETLY) - message(STATUS "Found XML2: ${XML2_LIBRARIES}") - endif (NOT XML2_FIND_QUIETLY) - else (XML2_FOUND) - if (XML2_FIND_REQUIRED) - message(FATAL_ERROR "Could not find XML2") - endif (XML2_FIND_REQUIRED) - endif (XML2_FOUND) - - # show the XML2_INCLUDE_DIRS and XML2_LIBRARIES variables only in the advanced view - mark_as_advanced(XML2_INCLUDE_DIRS XML2_LIBRARIES) +# handle the QUIETLY and REQUIRED arguments and set XML2_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(XML2 DEFAULT_MSG + XML2_LIBRARY XML2_INCLUDE_DIR) -endif (XML2_LIBRARIES AND XML2_INCLUDE_DIRS) +IF(XML2_FOUND) + SET(XML2_LIBRARIES ${XML2_LIBRARY}) + SET(XML2_INCLUDE_DIRS ${XML2_INCLUDE_DIR}) +ENDIF(XML2_FOUND) +MARK_AS_ADVANCED( + XML2_INCLUDE_DIR + XML2_LIBRARY +) |