diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 05:32:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 05:32:34 +0400 |
| commit | f086201518b85f6dd2ae60ae37dc14f1d1406c01 (patch) | |
| tree | d2b4a030367688f28324dd9a8ddfa7c5591d9582 /extern | |
| parent | 95948d0e0e1e3308b8449486f676ca1663afe124 (diff) | |
cmake & pep8 tidy up, also some style edits.
remove unneeded collection length function.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index 7ab01598cef..333791e28eb 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -25,8 +25,8 @@ set(INC . ../Eigen3 - ./third_party/ssba - ./third_party/ldl/Include + third_party/ssba + third_party/ldl/Include ../colamd/Include ) @@ -130,7 +130,7 @@ set(SRC third_party/msinttypes/inttypes.h ) -IF(WIN32) +if(WIN32) list(APPEND SRC third_party/glog/src/logging.cc third_party/glog/src/raw_logging.cc @@ -158,23 +158,23 @@ IF(WIN32) ) list(APPEND INC - ./third_party/glog/src/windows + third_party/glog/src/windows ) - IF(NOT MINGW) + if(NOT MINGW) list(APPEND INC - ./third_party/msinttypes + third_party/msinttypes ) - ENDIF(NOT MINGW) + endif() - IF(MSVC) + if(MSVC) set(MSVC_OFLAGS O1 O2 Ox) foreach(FLAG ) string(REPLACE "" "Od" CMAKE_CXX_FLAGS_RELEASE "") string(REPLACE "" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "") endforeach() - ENDIF(MSVC) -ELSE(WIN32) + endif() +else(WIN32) list(APPEND SRC third_party/glog/src/utilities.cc third_party/glog/src/symbolize.cc @@ -206,9 +206,9 @@ ELSE(WIN32) ) list(APPEND INC - ./third_party/glog/src + third_party/glog/src ) -ENDIF(WIN32) +endif() add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=) |