Merge pull request #10 from rhiestan/master

Added missing define for cmvslib. Fixes a crash in cmvs if multiple clus...
pmoulon · Mar 23, 2015 · a5c2bc1 · a5c2bc1
2 parents a9d3c5a + 5224eb3
commit a5c2bc1
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 0 deletions.
diff --git a/binariesWin-Linux/Win32-VS2010/cmvs.exe b/binariesWin-Linux/Win32-VS2010/cmvs.exe
diff --git a/binariesWin-Linux/Win32-VS2010/genOption.exe b/binariesWin-Linux/Win32-VS2010/genOption.exe
diff --git a/binariesWin-Linux/Win32-VS2010/pmvs2.exe b/binariesWin-Linux/Win32-VS2010/pmvs2.exe
diff --git a/binariesWin-Linux/Win64-VS2010/cmvs.exe b/binariesWin-Linux/Win64-VS2010/cmvs.exe
diff --git a/binariesWin-Linux/Win64-VS2010/genOption.exe b/binariesWin-Linux/Win64-VS2010/genOption.exe
diff --git a/binariesWin-Linux/Win64-VS2010/pmvs2.exe b/binariesWin-Linux/Win64-VS2010/pmvs2.exe
diff --git a/binariesWin-Linux/mac_osx_fat/cmvs b/binariesWin-Linux/mac_osx_fat/cmvs
diff --git a/binariesWin-Linux/mac_osx_fat/pmvs2 b/binariesWin-Linux/mac_osx_fat/pmvs2
diff --git a/program/base/cmvs/CMakeLists.txt b/program/base/cmvs/CMakeLists.txt
@@ -1 +1,5 @@
+IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	ADD_DEFINITIONS(-DNUMBITS=64)
+ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+
 ADD_LIBRARY(cmvs_lib bundle.h bundle.cc graclus.h graclus.cc)