Modified CMake scripts to link against correct version of LLVM
VISUAL_STUDIO_VERSION must be defined to either 2005 or 2008 when
CMake is run. See build.bat for example usage.
--- a/holdingarea/cmake/FindLLVM.cmake Fri Sep 24 11:24:53 2010 +0100
+++ b/holdingarea/cmake/FindLLVM.cmake Fri Sep 24 11:23:48 2010 +0100
@@ -44,7 +44,9 @@
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else(NOT WIN32)
- # set(LLVM_LFLAGS "-L${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/lib")
+ set(LLVM_LIB_PATH "${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/x86-win32-vs${VISUAL_STUDIO_VERSION}/${CMAKE_BUILD_TYPE}/lib")
+ message("LLVM_LIB_PATH ${LLVM_LIB_PATH}")
+ link_directories(${LLVM_LIB_PATH})
endif(NOT WIN32)
if(NOT WIN32)
--- a/holdingarea/vg/2D_OpenVG_1_1_SF/CMakeLists.txt Fri Sep 24 11:24:53 2010 +0100
+++ b/holdingarea/vg/2D_OpenVG_1_1_SF/CMakeLists.txt Fri Sep 24 11:23:48 2010 +0100
@@ -66,7 +66,7 @@
set(LIB_TYPE SHARED)
- link_directories(${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/lib)
+ #link_directories(${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/lib)
#if(CMAKE_BUILD_TYPE STREQUAL Release)
# link_directories(${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/lib/Release)
#else(CMAKE_BUILD_TYPE STREQUAL Release)