lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-16 09:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix macx lib path, better organization of general.pri

Browse Source
This commit is contained in:
alemuntoni 2020-01-24 16:06:54 +01:00
parent 14ed313d34
commit bc93997975
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/general.pri
View File

@ -1,38 +1,63 @@
# this is the common include for anything compiled inside the meshlab pro
# contains general preprocesser, compiler and linker settings,
# paths for dependecies and so on
######## GENERAL SETTINGS ##########
# This is the main coord type inside meshlab
# it can be double or float according to user needs.
DEFINES += MESHLAB_SCALAR=float
# VCG directory
VCGDIR = ../../../vcglib
# MeshLab requires C++11
CONFIG += c++11
#Debug and Release configs
CONFIG(release, debug|release):QMAKE_CXXFLAGS += -O3 -DNDEBUG
CONFIG(debug, debug|release):QMAKE_CXXFLAGS += -O0 -g
#Eigen and glew dirs
CONFIG(system_eigen3): EIGENDIR = /usr/include/eigen3
!CONFIG(system_eigen3):EIGENDIR = $$VCGDIR/eigenlib
!CONFIG(system_glew): GLEWDIR = ../external/glew-2.1.0
CONFIG += c++11
macx:QMAKE_CXXFLAGS += -Wno-inconsistent-missing-override
macx:CONFIG(release, debug|release):QMAKE_CXXFLAGS += -O3 -DNDEBUG
macx:CONFIG(debug, debug|release):QMAKE_CXXFLAGS += -O0 -g
# uncomment these three lines for using the latest clang compiler on OSX to use openmp
# using brew install clang from llvm and libomp
macx:QMAKE_CXX = /usr/local/opt/llvm/bin/clang++
macx:QMAKE_CXXFLAGS += -fopenmp -I/usr/local/opt/llvm/include
macx:QMAKE_LFLAGS += -L/usr/local/opt/llvm/lib -lomp
MACLIBDIR = $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64
######## WINDOWS SETTINGS ##########
# the following line is needed to avoid mismatch between
# the awful min/max macros of windows and the limits max
win32:DEFINES += NOMINMAX
# Set up library search paths
win32-msvc:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
win32-gcc:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
######## MACOS SETTINGS ##########
macx:QMAKE_CXXFLAGS += -Wno-inconsistent-missing-override
# using brew install clang from llvm and libomp
# uncomment these three lines for using default OSX compiler
macx:QMAKE_CXX = /usr/local/opt/llvm/bin/clang++
macx:QMAKE_CXXFLAGS += -I/usr/local/opt/llvm/include
macx:QMAKE_LFLAGS += -L/usr/local/opt/llvm/lib
# MeshLab requires a compiler that supports OpenMP
macx:QMAKE_CXXFLAGS += -Xpreprocessor -fopenmp
macx:QMAKE_LFLAGS += -lomp
# Set up library search paths
macx:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64 -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
######## LINUX SETTINGS ##########
linux-g++:QMAKE_CXXFLAGS+=-Wno-unknown-pragmas
# Set up library search paths
linux:QMAKE_RPATHDIR += $${MESHLAB_DISTRIB_DIRECTORY}/lib
linux:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/linux -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
linux-g++:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/linux-g++ -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
macx:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64 -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
win32-msvc:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
win32-gcc:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc -L$${MESHLAB_DISTRIB_DIRECTORY}/lib

2
src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
View File

@ -35,5 +35,5 @@ INCLUDEPATH *= \
win32-msvc:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/levmar.lib
win32-g++:LIBS += -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc -llevmar
macx:LIBS+= $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx/liblevmar.a
macx:LIBS+= $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/liblevmar.a
linux-g++:LIBS += -llevmar

2
src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
View File

@ -31,8 +31,6 @@ INCLUDEPATH += \
win32-msvc:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
win32-g++:QMAKE_LFLAGS += -fopenmp
macx:QMAKE_CXXFLAGS += -fopenmp -D_USE_OMP
macx:QMAKE_LFLAGS += -fopenmp
linux-g++:QMAKE_CXXFLAGS += -fopenmp -D_USE_OMP
win32-msvc:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/levmar.lib