diff --git a/install/linux/linux_build.sh b/install/linux/linux_build.sh index 182d4f135..46b0000dd 100644 --- a/install/linux/linux_build.sh +++ b/install/linux/linux_build.sh @@ -28,5 +28,5 @@ echo "Build path is: " $BUILD_PATH SOURCE_PATH=$PWD/../../src cd $BUILD_PATH -qmake $SOURCE_PATH/meshlab.pro "CONFIG+= system_eigen3 system_glew system_openctm system_lib3ds" +qmake $SOURCE_PATH/meshlab.pro make -j4 diff --git a/install/linux/linux_build_meshlab_mini.sh b/install/linux/linux_build_meshlab_mini.sh index 313c50b46..b251d7100 100644 --- a/install/linux/linux_build_meshlab_mini.sh +++ b/install/linux/linux_build_meshlab_mini.sh @@ -28,5 +28,5 @@ echo "Build path is: " $BUILD_PATH SOURCE_PATH=$PWD/../../src cd $BUILD_PATH -qmake $SOURCE_PATH/meshlab.pro "CONFIG+=meshlab_mini system_eigen3 system_glew" +qmake $SOURCE_PATH/meshlab.pro "CONFIG+=meshlab_mini" make -j4 diff --git a/src/find_system_libs.pri b/src/find_system_libs.pri index 163557543..d09b226cf 100644 --- a/src/find_system_libs.pri +++ b/src/find_system_libs.pri @@ -1,3 +1,11 @@ +# this pri file finds all the external libraries already installed in the system +# that could be used instead of the ones placed in the external folder. + +# to avoid to use system libraries and to use only the ones in the external folder, +# execute qmake with the following argument: +# qmake "CONFIG+=disable_system_libs" +!disable_system_libs { + linux { #### static libs #### @@ -12,6 +20,11 @@ linux { CONFIG += system_openctm } + #lib3ds + exists(/usr/lib/x86_64-linux-gnu/lib3ds.so){ + CONFIG += system_lib3ds + } + #### header only libs #### #eigen @@ -24,3 +37,5 @@ linux { CONFIG += system_glew } } + +} diff --git a/src/meshlab.pro b/src/meshlab.pro index 5b167c84c..b9d0789f7 100644 --- a/src/meshlab.pro +++ b/src/meshlab.pro @@ -285,3 +285,24 @@ edit_select.depends = common QMAKE_EXTRA_TARGETS += first copydir } + +# +# this is just for project info +# prints all the system libraries that meshlab is using instead of +# the ones placed in the external folder. +# The libraris are included effectively in general.pri and +# in external.pro +# +include(find_system_libs.pri) +system_eigen3 { + message("Using system eigen3") +} +system_glew { + message("Using system glew") +} +system_openctm { + message("Using system openctm") +} +system_lib3ds { + message("Using system lib3ds") +}