[llvm-commits] [llvm] r86153 - in /llvm/trunk: cmake/config-ix.cmake include/llvm/Config/config.h.cmake

[Oscar Fuentes]

Author: ofv
Date: Thu Nov  5 13:03:26 2009
New Revision: 86153

URL: http://llvm.org/viewvc/llvm-project?rev=86153&view=rev
Log:
CMake: Detect dotty.

Patch by Arnaud Allard de Grandmaison!

Modified:
    llvm/trunk/cmake/config-ix.cmake
    llvm/trunk/include/llvm/Config/config.h.cmake

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=86153&r1=86152&r2=86153&view=diff

==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Thu Nov  5 13:03:26 2009
@@ -126,6 +126,15 @@
 check_type_exists(uint64_t "${headers}" HAVE_UINT64_T)
 check_type_exists(u_int64_t "${headers}" HAVE_U_INT64_T)
 
+# available programs checks
+find_program(DOTTY_EXECUTABLE dotty)
+if(DOTTY_EXECUTABLE)
+  set(HAVE_DOTTY 1)
+  set(LLVM_PATH_DOTTY ${DOTTY_EXECUTABLE})
+  mark_as_advanced(HAVE_DOTTY)
+  mark_as_advanced(LLVM_PATH_DOTTY)
+endif()
+
 # Define LLVM_MULTITHREADED if gcc atomic builtins exists.
 include(CheckAtomic)
 

Modified: llvm/trunk/include/llvm/Config/config.h.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=86153&r1=86152&r2=86153&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Config/config.h.cmake (original)
+++ llvm/trunk/include/llvm/Config/config.h.cmake Thu Nov  5 13:03:26 2009
@@ -80,7 +80,7 @@
 #undef HAVE_DOT
 
 /* Define if the dotty program is available */
-#undef HAVE_DOTTY
+#cmakedefine HAVE_DOTTY ${HAVE_DOTTY}
 
 /* Define if you have the _dyld_func_lookup function. */
 #undef HAVE_DYLD
@@ -471,7 +471,7 @@
 #undef LLVM_PATH_DOT
 
 /* Define to path to dotty program if found or 'echo dotty' otherwise */
-#undef LLVM_PATH_DOTTY
+#cmakedefine LLVM_PATH_DOTTY "${LLVM_PATH_DOTTY}"
 
 /* Define to path to Graphviz program if found or 'echo Graphviz' otherwise */
 #undef LLVM_PATH_GRAPHVIZ