[lunarglass] r1087 committed - Building: On *nix machines, set LLVMINCLUDES and LLVMLIBS out of the i...

[lunar...@googlecode.com]

Revision: 1087
Author: jo...@lunarg.com
Date: Fri May 29 17:24:29 2015 UTC
Log: Building: On *nix machines, set LLVMINCLUDES and LLVMLIBS out of
the install directory. From Lei Zhang <antia...@google.com>

This essentially removes the requirement to install LLVM 3.4 to
build/install on *nix machines.

We find this patch useful if we want to build LLVM 3.4 as a custom target
on which LunarGLASS depends. With this patch, make for LLVM 3.4 will not go
over every directory trying to find new stuff to install. It saves build
time.

Kindly remind that both LLVMINCLUDES and LLVMLIBS are cached variables, so
please purge the build tree to test out.

https://code.google.com/p/lunarglass/source/detail?r=1087

Modified:
/trunk/CMakeLists.txt

=======================================
--- /trunk/CMakeLists.txt Fri May 22 00:36:30 2015 UTC
+++ /trunk/CMakeLists.txt Fri May 29 17:24:29 2015 UTC
@@ -20,8 +20,8 @@
set(GLSLANGLIBS ${GLSLANG_PATH}/build/install/lib/ CACHE PATH "glslang
library directory")
link_directories(${GLSLANGLIBS} ${LLVMLIBS})
elseif(UNIX)
- set(LLVMINCLUDES ${LLVM_BUILD}/install/usr/local/include CACHE
PATH "LLVM include directory")
- set(LLVMLIBS ${LLVM_BUILD}/install/usr/local/lib CACHE PATH "LLVM
library directory")
+ set(LLVMINCLUDES ${LLVM_BUILD}/include CACHE PATH "LLVM include
directory")
+ set(LLVMLIBS ${LLVM_BUILD}/Release+Asserts/lib CACHE PATH "LLVM
library directory")
set(GLSLANGLIBS ${GLSLANG_PATH}/build/install/lib/ CACHE PATH "glslang
library directory")
link_directories(${GLSLANGLIBS} ${LLVMLIBS})
else(WIN32)