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

Oscar Fuentes ofv at wanadoo.es
Thu Jan 27 14:58:34 PST 2011


Author: ofv
Date: Thu Jan 27 16:58:34 2011
New Revision: 124449

URL: http://llvm.org/viewvc/llvm-project?rev=124449&view=rev
Log:
Use the paths to libffi's header and library even when no custom
location was stated with FFI_INCLUDE_DIR/FFI_LIBRARY_DIR.

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=124449&r1=124448&r2=124449&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt (original)
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt Thu Jan 27 16:58:34 2011
@@ -1,12 +1,16 @@
-# If the user required a custom path for ffi headers, use it on its
-# abolute form (see config-ix.cmake):
-if( FFI_INCLUDE_DIR )
+# Make sure that the path to libffi headers is on the command
+# line. That path can be a compiler's non-default path even when
+# FFI_INCLUDE_DIR was not used, because cmake has its own paths for
+# searching for headers (CMAKE_SYSTEM_INCLUDE_PATH, for instance):
+if( FFI_INCLUDE_PATH )
   include_directories( ${FFI_INCLUDE_PATH} )
 endif()
 
-# If the user required a custom path for libffi, use it on its abolute
-# form (see config-ix.cmake):
-if( FFI_LIBRARY_DIR )
+# 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()
 





More information about the llvm-commits mailing list