summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Rusin <zack@kde.org>2009-08-29 19:42:43 -0400
committerZack Rusin <zack@kde.org>2009-08-29 19:42:43 -0400
commitf9b2a85968d82b938842606d5765348a3f9cd9d7 (patch)
tree7f47a63d0f33504bdf04a7c0d432aec88701613f
parent6e522684b89f13f932a54266c5eb01937a68d92c (diff)
add readme and fix libutil.a issue
-rw-r--r--README8
-rw-r--r--cmake/modules/FindGallium.cmake5
2 files changed, 12 insertions, 1 deletions
diff --git a/README b/README
new file mode 100644
index 0000000..05d6d9c
--- /dev/null
+++ b/README
@@ -0,0 +1,8 @@
+The best way to compile is to use out of src build, like such:
+
+mkdir some/path/build
+cd some/path/build
+cmake -DGALLIUM_DIR=/home/user/projects/mesa -DCLANG_SRC_DIR=/home/user/projects/llvm -DCLANG_BUILD_DIR=/home/user/build/llvm /home/user/projects/clover
+make
+
+That should be it, make sure that GALLIUM_DIR point to top of Mesa checkout and CLANG_SRC_DIR points to the llvm checkout that cointains Clang and CLANG_BUILD_DIR to the llvm build directory that contains Clang files (CLANG_SRC_DIR and CLANG_BUILD_DIR will be the same if you haven't used out of src build for LLVM/Clang)
diff --git a/cmake/modules/FindGallium.cmake b/cmake/modules/FindGallium.cmake
index 2b49910..5449f65 100644
--- a/cmake/modules/FindGallium.cmake
+++ b/cmake/modules/FindGallium.cmake
@@ -21,7 +21,10 @@ FIND_AND_ADD_GALLIUM_LIB(rtasm)
FIND_AND_ADD_GALLIUM_LIB(translate)
FIND_AND_ADD_GALLIUM_LIB(cso_cache)
FIND_AND_ADD_GALLIUM_LIB(tgsi)
-FIND_AND_ADD_GALLIUM_LIB(util)
+
+#FIXME: always some other libutil is found
+#FIND_AND_ADD_GALLIUM_LIB(util)
+set(GALLIUM_LIBS ${GALLIUM_LIBS} ${GALLIUM_DIR}//src/gallium/auxiliary/util/libutil.a)
MESSAGE(STATUS "Gallium libs: " ${GALLIUM_LIBS})