Try to fix linux build with VTK.

iorileslie · Jan 27, 2023 · 1d9a12b · 1d9a12b
1 parent 8f6ccd4
commit 1d9a12b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/platforms/debian/bullseye/cmake_configure b/platforms/debian/bullseye/cmake_configure
@@ -57,7 +57,7 @@ else
     cd vtk
     mkdir -p build
     cd build
-    cmake ${EMGUCV_CMAKE_SHARED_OPTIONS[@]} -DBUILD_TESTING:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE -DVTK_MODULE_ENABLE_VTK_RenderingFreeType:STRING="NO" -DVTK_MODULE_ENABLE_VTK_png:STRING="NO" ..
+    cmake ${EMGUCV_CMAKE_SHARED_OPTIONS[@]} -DBUILD_TESTING:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE ..
     cmake --build . --config Release --parallel 1 --target install
     VTK_OPTION=( -DVTK_DIR:String="$PWD" )
     cd ../..
@@ -101,7 +101,7 @@ cmake\
 #      -DCMAKE_C_FLAGS_RELEASE="-DPNG_ARM_NEON_OPT=0 " \
 
 
-C_INCLUDE_PATH=$TOP_FOLDER/eigen/:$INSTALL_FOLDER/include/vtk-8.2 CPLUS_INCLUDE_PATH=$TOP_FOLDER/eigen/:$INSTALL_FOLDER/include/vtk-8.2 cmake --build . --config Release --parallel 1 --target package
+C_INCLUDE_PATH=$TOP_FOLDER/eigen/:$INSTALL_FOLDER/include/vtk-9.2 CPLUS_INCLUDE_PATH=$TOP_FOLDER/eigen/:$INSTALL_FOLDER/include/vtk-9.2 cmake --build . --config Release --parallel 1 --target package
 #make
 cd ..
 

diff --git a/platforms/ubuntu/20.04/cmake_configure b/platforms/ubuntu/20.04/cmake_configure
@@ -65,7 +65,7 @@ else
     cd vtk
     mkdir -p build
     cd build
-    cmake ${EMGUCV_CMAKE_SHARED_OPTIONS[@]} -DBUILD_TESTING:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE -DVTK_MODULE_ENABLE_VTK_RenderingFreeType:STRING="NO" -DVTK_MODULE_ENABLE_VTK_png:STRING="NO" ..
+    cmake ${EMGUCV_CMAKE_SHARED_OPTIONS[@]} -DBUILD_TESTING:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE ..
     cmake --build . --config Release --parallel --target install
     VTK_OPTION=-DVTK_DIR:String="$INSTALL_FOLDER"
     cd ../..
@@ -108,7 +108,7 @@ cmake \
 #      -DWITH_TBB:BOOL=TRUE \
 #      -DWITH_CUDA:BOOL=FALSE \
 
-C_INCLUDE_PATH=$PWD/../../../../eigen/:$INSTALL_FOLDER/include/vtk-8.2 CPLUS_INCLUDE_PATH=$PWD/../../../../eigen/:$INSTALL_FOLDER/include/vtk-8.2 make
+C_INCLUDE_PATH=$PWD/../../../../eigen/:$INSTALL_FOLDER/include/vtk-9.2 CPLUS_INCLUDE_PATH=$PWD/../../../../eigen/:$INSTALL_FOLDER/include/vtk-9.2 make
 
 #if [ "$1" == "cuda" ]; then
 #    cp -rf bin/x64/*.so ../../../../libs/x64

diff --git a/platforms/ubuntu/22.04/cmake_configure b/platforms/ubuntu/22.04/cmake_configure
@@ -73,7 +73,7 @@ else
     cd vtk
     mkdir -p build
     cd build
-    cmake ${EMGUCV_CMAKE_SHARED_OPTIONS[@]} -DBUILD_TESTING:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE -DVTK_MODULE_ENABLE_VTK_RenderingFreeType:STRING="NO" -DVTK_MODULE_ENABLE_VTK_png:STRING="NO" ..
+    cmake ${EMGUCV_CMAKE_SHARED_OPTIONS[@]} -DBUILD_TESTING:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE ..
     cmake --build . --config Release --target install --parallel
     VTK_OPTION=-DVTK_DIR:String="$INSTALL_FOLDER"
     cd ../..
@@ -117,7 +117,7 @@ cmake \
 #      -DWITH_TBB:BOOL=TRUE \
 #      -DWITH_CUDA:BOOL=FALSE \
 
-C_INCLUDE_PATH=$PWD/../../../../eigen/:$INSTALL_FOLDER/include/vtk-8.2 CPLUS_INCLUDE_PATH=$PWD/../../../../eigen/:$INSTALL_FOLDER/include/vtk-8.2 make
+C_INCLUDE_PATH=$PWD/../../../../eigen/:$INSTALL_FOLDER/include/vtk-9.2 CPLUS_INCLUDE_PATH=$PWD/../../../../eigen/:$INSTALL_FOLDER/include/vtk-9.2 make
 
 #if [ "$1" == "cuda" ]; then
 #    cp -rf bin/x64/*.so ../../../../libs/x64