summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAlp Toker <alp@nuanti.com>2014-06-02 01:40:04 +0000
committerAlp Toker <alp@nuanti.com>2014-06-02 01:40:04 +0000
commit04de60e28f29613ea762fc7221197f7a2c4ade80 (patch)
treee081176c7664085c662678a3c48912cd7ba739a2 /cmake
parentdf1913982b1d09b6cf01bc10f8ca97f50bb22a1b (diff)
downloadllvm-04de60e28f29613ea762fc7221197f7a2c4ade80.tar.gz
llvm-04de60e28f29613ea762fc7221197f7a2c4ade80.tar.bz2
llvm-04de60e28f29613ea762fc7221197f7a2c4ade80.tar.xz
GraphWriter: detect graph viewer programs at runtime
Replace the crufty build-time configure checks for program paths with equivalent runtime logic. This lets users install graphing tools as needed without having to reconfigure and rebuild LLVM, while eliminating a long chain of inappropriate compile dependencies that included GUI programs and the windowing system. Additional features: * Support the OS X 'open' command to view graphs generated by any of the Graphviz utilities. This is an alternative to the Graphviz OS X UI which is no longer available on Mountain Lion. * Produce informative log output upon failure to indicate which programs can be installed to view graphs. Ping me if this doesn't work for your particular environment. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210001 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rwxr-xr-xcmake/config-ix.cmake12
1 files changed, 3 insertions, 9 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 1325e790c8..2af3fe3c5e 100755
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -252,15 +252,9 @@ function(llvm_find_program name)
endif(LLVM_PATH_${NAME})
endfunction()
-llvm_find_program(gv)
-llvm_find_program(circo)
-llvm_find_program(twopi)
-llvm_find_program(neato)
-llvm_find_program(fdp)
-llvm_find_program(dot)
-llvm_find_program(dotty)
-llvm_find_program(xdot xdot.py)
-llvm_find_program(Graphviz)
+if (LLVM_ENABLE_DOXYGEN)
+ llvm_find_program(dot)
+endif ()
if( LLVM_ENABLE_FFI )
find_path(FFI_INCLUDE_PATH ffi.h PATHS ${FFI_INCLUDE_DIR})