[x265] [PATCH] cmake: do not allow full path of libnuma to be used in x265.pc

Steve Borho steve at borho.org
Thu Apr 9 17:54:11 CEST 2015


# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1428594689 18000
#      Thu Apr 09 10:51:29 2015 -0500
# Node ID 47d2bcff2d8a42c443a1e7b4dbe02b6ba427b7f5
# Parent  10b43eca2a9c168597e497d3f8a6abcf74e74336
cmake: do not allow full path of libnuma to be used in x265.pc

replaces /usr/local/lib/libnuma.so with -lnuma in x265.pc, which
fixes link issues for apps which use pkg-config

diff -r 10b43eca2a9c -r 47d2bcff2d8a source/CMakeLists.txt
--- a/source/CMakeLists.txt	Thu Apr 09 18:18:33 2015 +0530
+++ b/source/CMakeLists.txt	Thu Apr 09 10:51:29 2015 -0500
@@ -67,13 +67,13 @@
     endif()
     find_package(Numa)
     if(NUMA_FOUND)
-        list(APPEND CMAKE_REQUIRED_LIBRARIES ${NUMA_LIBRARY})
+        link_directories(${NUMA_LIBRARY_DIR})
+        list(APPEND CMAKE_REQUIRED_LIBRARIES "numa")
         check_symbol_exists(numa_node_of_cpu numa.h NUMA_V2)
         if(NUMA_V2)
             add_definitions(-DHAVE_LIBNUMA)
             message(STATUS "libnuma found, building with support for NUMA nodes")
-            list(APPEND PLATFORM_LIBS ${NUMA_LIBRARY})
-            link_directories(${NUMA_LIBRARY_DIR})
+            list(APPEND PLATFORM_LIBS "numa")
             include_directories(${NUMA_INCLUDE_DIR})
         endif()
     endif()


More information about the x265-devel mailing list