diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-18 15:12:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-18 15:12:53 +0300 |
commit | 879be45bb57c23e129f4b917b72d50fe05006400 (patch) | |
tree | bf53c287332d6a50faeaeb4eeca3daea1040754f | |
parent | 0a52b86d5019df3806b58da7910ef646a340936e (diff) |
fix for building on ubuntu 11.04 (pre-release), also remove WITH_INSTALL from cache.
-rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f928a5d2c0..b2d02ce5c3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,6 +177,9 @@ if(WITH_PYTHON_MODULE AND WITH_PYTHON_INSTALL) message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF") endif() +# remove old vars +unset(WITH_INSTALL CACHE) + TEST_SSE_SUPPORT() #----------------------------------------------------------------------------- @@ -213,6 +216,11 @@ set(CXX_WARNINGS "") #Platform specifics if(UNIX AND NOT APPLE) + + # needed for ubuntu 11.04 + if(EXISTS "/usr/lib/x86_64-linux-gnu") + set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}") + endif() if(WITH_OPENAL) find_package(OpenAL) |