[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52425] trunk/blender/CMakeLists.txt: More LLVM work (now always search llvm-config into LLVM_DIRECTORY when

[Bastien Montagne]

Revision: 52425
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52425
Author:   mont29
Date:     2012-11-21 08:59:20 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
More LLVM work (now always search llvm-config into LLVM_DIRECTORY when
set!).

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt        2012-11-21 08:53:04 UTC (rev 52424)
+++ trunk/blender/CMakeLists.txt        2012-11-21 08:59:20 UTC (rev 52425)
@@ -716,9 +716,16 @@
                        set(LLVM_VERSION "3.0")
                endif()
                set(LLVM_STATIC YES)
-               FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS 
${LLVM_DIRECTORY} ${LLVM_DIRECTORY}/bin)
-               if(NOT LLVM_CONFIG)
-                       FIND_PROGRAM(LLVM_CONFIG llvm-config HINTS 
${LLVM_DIRECTORY} ${LLVM_DIRECTORY}/bin)
+               if(LLVM_DIRECTORY)
+                       FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} 
HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+                       if(NOT LLVM_CONFIG)
+                               FIND_PROGRAM(LLVM_CONFIG llvm-config HINTS 
${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+                       endif()
+               else()
+                       FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION})
+                       if(NOT LLVM_CONFIG)
+                               FIND_PROGRAM(LLVM_CONFIG llvm-config)
+                       endif()
                endif()
                execute_process(COMMAND ${LLVM_CONFIG} --version
                                OUTPUT_VARIABLE LLVM_VERSION

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs