[llvm-commits] [llvm] r124486 - /llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Fri Jan 28 10:49:05 2011
New Revision: 124486

URL: http://llvm.org/viewvc/llvm-project?rev=124486&view=rev
Log:
Fix libffi usage when it is on a custom path.

Modified:
    llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt

Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt?rev=124486&r1=124485&r2=124486&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt (original)
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt Fri Jan 28 10:49:05 2011
@@ -6,14 +6,6 @@
   include_directories( ${FFI_INCLUDE_PATH} )
 endif()
 
-# Make sure that the path to libffi archive is on the command
-# line. That path can be a linker's non-default path even when
-# FFI_LIBRARY_DIR was not used, because cmake has its own paths for
-# searching for libraries (CMAKE_SYSTEM_LIBRARY_PATH, for instance):
-if( FFI_LIBRARY_PATH )
-  link_directories( ${FFI_LIBRARY_PATH} )
-endif()
-
 add_llvm_library(LLVMInterpreter
   Execution.cpp
   ExternalFunctions.cpp
@@ -21,5 +13,5 @@
   )
 
 if( LLVM_ENABLE_FFI )
-  target_link_libraries( LLVMInterpreter ffi )
+  target_link_libraries( LLVMInterpreter ${FFI_LIBRARY_PATH} )
 endif()