removed nodes from CMake's BLENDER_LINK_LIBS, rewrote find-pcre using own template.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 14 Sep 2011 01:23:17 +0000 (01:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 14 Sep 2011 01:23:17 +0000 (01:23 +0000)
build_files/cmake/Modules/FindPCRE.cmake
source/creator/CMakeLists.txt

index a093752..9d73e92 100644 (file)
@@ -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
+)
index 2d2e6f8..b48915c 100644 (file)
@@ -713,7 +713,6 @@ add_dependencies(blender makesdna)
 get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
 
 set(BLENDER_LINK_LIBS
-       bf_nodes
        ${BLENDER_LINK_LIBS}
        bf_windowmanager
        bf_render