64bit support

OpenDroneMap · Aug 9, 2022 · 3bcaec5 · 3bcaec5
1 parent 348a216
commit 3bcaec5
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,13 +8,38 @@ RelWithDebInfo MinSizeRel."
       FORCE)
 endif()
 
+# Find OpenMP
+if(APPLE)
+    if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+        set(OpenMP_C "${CMAKE_C_COMPILER}")
+        set(OpenMP_C_FLAGS "-Xclang -fopenmp -Wno-unused-command-line-argument")
+        set(OpenMP_C_LIB_NAMES "libomp" "libgomp" "libiomp5")
+        set(OpenMP_libomp_LIBRARY ${OpenMP_C_LIB_NAMES})
+        set(OpenMP_libgomp_LIBRARY ${OpenMP_C_LIB_NAMES})
+        set(OpenMP_libiomp5_LIBRARY ${OpenMP_C_LIB_NAMES})
+    endif()
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+      set(OpenMP_CXX "${CMAKE_CXX_COMPILER}")
+      set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -Wno-unused-command-line-argument")
+      set(OpenMP_CXX_LIB_NAMES "libomp" "libgomp" "libiomp5")
+      set(OpenMP_libomp_LIBRARY ${OpenMP_CXX_LIB_NAMES})
+      set(OpenMP_libgomp_LIBRARY ${OpenMP_CXX_LIB_NAMES})
+      set(OpenMP_libiomp5_LIBRARY ${OpenMP_CXX_LIB_NAMES})
+    endif()
+
+endif()
+
 set (CMAKE_CXX_STANDARD 11)
 find_package(GDAL REQUIRED)
 find_package(OpenMP REQUIRED)
 if(OPENMP_FOUND)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+    if(APPLE)
+        # TODO: not working (need homebrew llvm's clang)
+        #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fopenmp")
+    endif()
 endif()
 include_directories(${GDAL_INCLUDE_DIR})
 

diff --git a/vendor/jmeshlib/CMakeLists.txt b/vendor/jmeshlib/CMakeLists.txt
@@ -9,6 +9,8 @@ if (NOT MSVC)
 add_compile_options(-fpermissive)
 endif()
 
+add_definitions(-DIS64BITPLATFORM)
+
 set(HEADERS
     ./include/binTree.h
     ./include/clusterGraph.h

diff --git a/vendor/jmeshlib/include/triangle.h b/vendor/jmeshlib/include/triangle.h
@@ -1,30 +1,30 @@
-/****************************************************************************
-* JMeshLib                                                                  *
-*                                                                           *
-* Consiglio Nazionale delle Ricerche                                        *
-* Istituto di Matematica Applicata e Tecnologie Informatiche                *
-* Sezione di Genova                                                         *
-* IMATI-GE / CNR                                                            *
-*                                                                           *
-* Authors: Marco Attene                                                     *
-*                                                                           *
-* Copyright(C) 2006: IMATI-GE / CNR                                         *
-*                                                                           *
-* All rights reserved.                                                      *
-*                                                                           *
-* This program is free software; you can redistribute it and/or modify      *
-* it under the terms of the GNU General Public License as published by      *
-* the Free Software Foundation; either version 2 of the License, or         *
-* (at your option) any later version.                                       *
-*                                                                           *
-* This program is distributed in the hope that it will be useful,           *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of            *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
-* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
-* for more details.                                                         *
-*                                                                           *
-****************************************************************************/
-
+/****************************************************************************
+* JMeshLib                                                                  *
+*                                                                           *
+* Consiglio Nazionale delle Ricerche                                        *
+* Istituto di Matematica Applicata e Tecnologie Informatiche                *
+* Sezione di Genova                                                         *
+* IMATI-GE / CNR                                                            *
+*                                                                           *
+* Authors: Marco Attene                                                     *
+*                                                                           *
+* Copyright(C) 2006: IMATI-GE / CNR                                         *
+*                                                                           *
+* All rights reserved.                                                      *
+*                                                                           *
+* This program is free software; you can redistribute it and/or modify      *
+* it under the terms of the GNU General Public License as published by      *
+* the Free Software Foundation; either version 2 of the License, or         *
+* (at your option) any later version.                                       *
+*                                                                           *
+* This program is distributed in the hope that it will be useful,           *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
+* for more details.                                                         *
+*                                                                           *
+****************************************************************************/
+
 #ifndef _TRIANGLE_H
 #define _TRIANGLE_H