From 42b3463030b07ba3a87574c173e759e3bb15353b Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 11 Mar 2012 19:52:25 +0000 Subject: Bundle new upstream version of libmv from own branch This version of libmv includes new gflags and glog libraries which makes it possible to compile libmv with clang compiler. Also remove code from CMakeLists which was disabling libmv if using clang. Tested on linux with gcc-4.6 and clang-3.0, windows cmake+msvc and scons+mingw. Could be some issues with other platforms/build system which shall be simple to resolve. --- CMakeLists.txt | 8 -------- 1 file changed, 8 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 25ed193b266..384a39c107f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1533,14 +1533,6 @@ if(MSVC10) endif() endif() -if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - if(WITH_LIBMV) - message(WARNING "Using Clang as CXX compiler: disabling WITH_LIBMV, this feature will be missing.") - set(WITH_LIBMV OFF) - endif() -endif() - - # ensure python header is found since detection can fail, this could happen # with _any_ library but since we used a fixed python version this tends to # be most problematic. -- cgit v1.2.3