-
-
Notifications
You must be signed in to change notification settings - Fork 231
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix use external to ensure it works well with VTK #840
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@topazus please review |
confirmed it built successfully on my machine. buildruby in 🌐 fedora in f3d on fix_use_external [?] via △ v3.26.4 took 2s
❯ git log -1 --stat
commit ffadc9aed48eb186d0efb4d462e02a75cef44eeb (HEAD -> fix_use_external, origin/fix_use_external)
Author: Mathieu Westphal <mathieu.westphal@kitware.com>
Date: Sat Jun 3 09:40:02 2023 +0200
Fix use external to ensure it works well with VTK
CMakeLists.txt | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
ruby in 🌐 fedora in f3d on fix_use_external [?] via △ v3.26.4
❯ rm -rf build/ && cmake . -B build -DF3D_USE_EXTERNAL_CXXOPTS=ON -DF3D_USE_EXTERNAL_NLOHMANN_JSON=ON
-- The C compiler identification is GNU 13.1.1
-- The CXX compiler identification is GNU 13.1.1
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /usr/lib64/ccache/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /usr/lib64/ccache/c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
CMake Warning at cmake/f3dVersion.cmake:48 (message):
Version from git (1.3.1) disagrees with hard coded version (2.0.0). Either
update the git tags or main CMakeLists.txt. Discarding version from git.
Call Stack (most recent call first):
CMakeLists.txt:38 (f3d_determine_version)
-- Found nlohmann_json: /usr/share/cmake/nlohmann_json/nlohmann_jsonConfig.cmake (found version "3.11.2")
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success
-- Found Threads: TRUE
-- Found GLEW: /usr/lib64/libGLEW.so
-- Found OpenGL: /usr/lib64/libOpenGL.so found components: OpenGL GLX
-- Found HDF5: /usr/lib64/libhdf5.so (found version "1.12.1") found components: C HL
-- Found utf8cpp: /usr/include/utf8cpp
-- Found NetCDF: netcdf (found version "4.9.0")
-- Found JsonCpp: /usr/lib64/libjsoncpp.so (found suitable version "1.9.5", minimum required is "0.7.0")
-- Found ZLIB: /usr/lib64/libz.so (found version "1.2.13")
-- Found PNG: /usr/lib64/libpng.so (found version "1.6.37")
-- Found Eigen3: /usr/include/eigen3 (found version "3.4.0")
-- Found X11: /usr/include
-- Looking for XOpenDisplay in /usr/lib64/libX11.so;/usr/lib64/libXext.so
-- Looking for XOpenDisplay in /usr/lib64/libX11.so;/usr/lib64/libXext.so - found
-- Looking for gethostbyname
-- Looking for gethostbyname - found
-- Looking for connect
-- Looking for connect - found
-- Looking for remove
-- Looking for remove - found
-- Looking for shmat
-- Looking for shmat - found
-- Looking for IceConnectionNumber in ICE
-- Looking for IceConnectionNumber in ICE - found
-- Found EXPAT: /usr/lib64/libexpat.so (found version "2.5.0")
-- Found double-conversion: /usr/lib64/libdouble-conversion.so
-- Found LZ4: /usr/lib64/liblz4.so (found version "1.9.4")
-- Found LZMA: /usr/lib64/liblzma.so (found version "5.4.3")
-- Found JPEG: /usr/lib64/libjpeg.so (found version "62")
-- Found TIFF: /usr/lib64/libtiff.so (found version "4.4.0")
-- Found Freetype: /usr/lib64/libfreetype.so (found version "2.13.0")
-- VTK 9.2.6 found
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY - Success
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY - Success
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR - Success
-- Configuring done (2.6s)
-- Generating done (0.0s)
-- Build files have been written to: /home/ruby/test/f3d/build
ruby in 🌐 fedora in f3d on fix_use_external [?] via △ v3.26.4 took 2s
❯ cmake --build build/ -j6
[ 11%] Generating the wrap hierarchy for f3d::VTKExtensionsCore
[ 11%] Building CXX object plugins/exodus/CMakeFiles/f3d-plugin-exodus.dir/plugin.cxx.o
[ 9%] Generating the wrap hierarchy for f3d::VTKExtensionsReaders
[ 11%] Building CXX object library/VTKExtensions/Core/CMakeFiles/VTKExtensionsCore.dir/F3DLog.cxx.o
[ 11%] Building CXX object plugins/native/CMakeFiles/f3d-plugin-native.dir/plugin.cxx.o
[ 11%] Generating the wrap hierarchy for f3d::VTKExtensionsApplicative
[ 15%] Linking CXX static library ../../lib/libf3d-plugin-exodus.a
[ 15%] Built target VTKExtensionsCore-hierarchy
[ 15%] Building CXX object library/VTKExtensions/Core/CMakeFiles/VTKExtensionsCore.dir/vtkF3DConsoleOutputWindow.cxx.o
[ 17%] Linking CXX static library ../../lib/libf3d-plugin-native.a
[ 17%] Built target VTKExtensionsApplicative-hierarchy
[ 19%] Linking CXX static library ../../../lib/libVTKExtensionsCore.a
[ 19%] Built target VTKExtensionsReaders-hierarchy
[ 21%] Generating the wrap hierarchy for f3d::VTKExtensionsRendering
[ 21%] Built target f3d-plugin-exodus
[ 21%] Built target f3d-plugin-native
[ 21%] Built target VTKExtensionsCore
[ 23%] Building CXX object library/VTKExtensions/Readers/CMakeFiles/VTKExtensionsReaders.dir/vtkF3DPostProcessFilter.cxx.o
[ 25%] Building CXX object library/VTKExtensions/Readers/CMakeFiles/VTKExtensionsReaders.dir/vtkF3DGenericImporter.cxx.o
[ 26%] Linking CXX static library ../../../lib/libVTKExtensionsReaders.a
[ 26%] Built target VTKExtensionsReaders
[ 32%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DDropZoneActor.cxx.o
[ 34%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DHexagonalBokehBlurPass.cxx.o
[ 32%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DCachedLUTTexture.cxx.o
[ 32%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DCachedSpecularTexture.cxx.o
[ 36%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DInteractorEventRecorder.cxx.o
[ 44%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DInteractorStyle.cxx.o
[ 44%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DOpenGLGridMapper.cxx.o
[ 44%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DNoRenderWindow.cxx.o
[ 44%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DPolyDataMapper.cxx.o
[ 46%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DRenderPass.cxx.o
[ 46%] Built target VTKExtensionsRendering-hierarchy
[ 48%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DRenderer.cxx.o
[ 51%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DRendererWithColoring.cxx.o
[ 51%] Building CXX object library/VTKExtensions/Rendering/CMakeFiles/VTKExtensionsRendering.dir/vtkF3DOrientationMarkerWidget.cxx.o
[ 53%] Linking CXX static library ../../../lib/libVTKExtensionsRendering.a
[ 53%] Built target VTKExtensionsRendering
[ 55%] Building CXX object library/VTKExtensions/Applicative/CMakeFiles/VTKExtensionsApplicative.dir/vtkF3DObjectFactory.cxx.o
[ 57%] Linking CXX static library ../../../lib/libVTKExtensionsApplicative.a
[ 57%] Built target VTKExtensionsApplicative
[ 63%] Building CXX object library/CMakeFiles/libf3d.dir/src/camera_impl.cxx.o
[ 63%] Building CXX object library/CMakeFiles/libf3d.dir/src/animationManager.cxx.o
[ 65%] Building CXX object library/CMakeFiles/libf3d.dir/src/engine.cxx.o
[ 63%] Building CXX object library/CMakeFiles/libf3d.dir/src/config.cxx.o
[ 67%] Building CXX object library/CMakeFiles/libf3d.dir/src/factory.cxx.o
[ 69%] Building CXX object library/CMakeFiles/libf3d.dir/src/image.cxx.o
[ 75%] Building CXX object library/CMakeFiles/libf3d.dir/src/init.cxx.o
[ 75%] Building CXX object library/CMakeFiles/libf3d.dir/src/interactor_impl.cxx.o
[ 75%] Building CXX object library/CMakeFiles/libf3d.dir/src/interactor.cxx.o
[ 76%] Building CXX object library/CMakeFiles/libf3d.dir/src/loader_impl.cxx.o
[ 78%] Building CXX object library/CMakeFiles/libf3d.dir/src/log.cxx.o
[ 82%] Building CXX object library/CMakeFiles/libf3d.dir/src/options.cxx.o
[ 82%] Building CXX object library/CMakeFiles/libf3d.dir/src/window_impl.cxx.o
[ 84%] Linking CXX shared library ../lib/libf3d.so
[ 84%] Built target libf3d
[ 86%] Generating F3DIcon.h, F3DIcon.cxx
[ 94%] Building CXX object application/CMakeFiles/f3d.dir/F3DConfigFileTools.cxx.o
[ 94%] Building CXX object application/CMakeFiles/f3d.dir/F3DIcon.cxx.o
[ 94%] Building CXX object application/CMakeFiles/f3d.dir/F3DOptionsParser.cxx.o
[ 94%] Building CXX object application/CMakeFiles/f3d.dir/F3DStarter.cxx.o
[ 96%] Building CXX object application/CMakeFiles/f3d.dir/F3DSystemTools.cxx.o
[ 98%] Building CXX object application/CMakeFiles/f3d.dir/main.cxx.o
[100%] Linking CXX executable ../bin/f3d
[100%] Built target f3d |
Meakk
approved these changes
Jun 3, 2023
mwestphal
added a commit
that referenced
this pull request
Feb 10, 2024
mwestphalnew
pushed a commit
to mwestphalnew/f3d
that referenced
this pull request
Feb 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.