[lunarglass] r1090 committed - CMake: Revert the hard-coded path change to llvm directories in Releas...

[lunar...@googlecode.com]

Revision: 1090
Author: jo...@lunarg.com
Date: Thu Jun 11 16:13:59 2015 UTC
Log: CMake: Revert the hard-coded path change to llvm directories in
Release+Assert, because they need to come from ${LLVM_BUILD}/install/.
Need some work to reconcile these two approaches.

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

Modified:
/trunk/CMakeLists.txt

=======================================
--- /trunk/CMakeLists.txt Fri May 29 17:24:29 2015 UTC
+++ /trunk/CMakeLists.txt Thu Jun 11 16:13:59 2015 UTC
@@ -4,9 +4,9 @@

project(LunarGLASS)

-set(LLVM_BUILD ${CMAKE_CURRENT_SOURCE_DIR}/Core/LLVM/llvm-3.4/build)
+set(LLVM_BUILD ${CMAKE_CURRENT_SOURCE_DIR}/Core/LLVM/llvm-3.4/build CACHE
PATH "LLVM build directory")

-set(GLSLANG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../glslang)
+set(GLSLANG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../glslang CACHE
PATH "glslang directory")

if(WIN32)
include(Core/LLVM/llvm-3.4/cmake/modules/ChooseMSVCCRT.cmake)
@@ -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}/include CACHE PATH "LLVM include
directory")
- set(LLVMLIBS ${LLVM_BUILD}/Release+Asserts/lib CACHE PATH "LLVM
library directory")
+ 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(GLSLANGLIBS ${GLSLANG_PATH}/build/install/lib/ CACHE PATH "glslang
library directory")
link_directories(${GLSLANGLIBS} ${LLVMLIBS})
else(WIN32)
@@ -47,7 +47,7 @@
set(SYSTEM_LIBS "")
elseif(UNIX)
# Get system library dependencies from llvm-config.
- execute_process(COMMAND ${LLVM_BUILD}/Release+Asserts/bin/llvm-config
--ldflags OUTPUT_VARIABLE LLVM_LD_FLAGS)
+ execute_process(COMMAND
${LLVM_BUILD}/install/usr/local/bin/llvm-config --ldflags OUTPUT_VARIABLE
LLVM_LD_FLAGS)
# Convert to a list of link flags.
string(REPLACE " " ";" LLVM_LD_FLAGS_LIST ${LLVM_LD_FLAGS})
foreach(LIB ${LLVM_LD_FLAGS_LIST})
@@ -68,7 +68,7 @@
if(WIN32)
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
elseif(UNIX)
- execute_process(COMMAND ${LLVM_BUILD}/Release+Asserts/bin/llvm-config
--cxxflags OUTPUT_VARIABLE LLVM_CXX_FLAGS)
+ execute_process(COMMAND
${LLVM_BUILD}/install/usr/local/bin/llvm-config --cxxflags OUTPUT_VARIABLE
LLVM_CXX_FLAGS)
add_definitions(${LLVM_CXX_FLAGS})
endif(WIN32)