Skip to content

Commit

Permalink
Revert "Fix F3D build when added as a subproject (f3d-app#899)"
Browse files Browse the repository at this point in the history 
This reverts commit 3f713f3
  • Loading branch information
@spianmo
spianmo committed Jul 11, 2023
1 parent fbe94fe commit 8c5af44
Show file tree
Hide file tree
Showing 33 changed files with 171 additions and 181 deletions.
59 changes: 0 additions & 59 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,62 +619,3 @@ jobs:
--enable=all
--suppressions-list=.cppcheck.supp
--error-exitcode=1
#----------------------------------------------------------------------------
# external-build: Check build of F3D as sub-project
#----------------------------------------------------------------------------
external-build:
needs: cache_lfs
if: github.event.pull_request.draft == false

strategy:
fail-fast: false

runs-on: ubuntu-latest
container: ghcr.io/f3d-app/f3d-ci

steps:

- name: Create top level
working-directory: ${{github.workspace}}
run: |
mkdir source
echo "cmake_minimum_required(VERSION 3.21)\nproject(toplevel)\nadd_subdirectory(f3d)" > source/CMakeLists.txt
- name: Checkout
uses: actions/checkout@v3
with:
path: 'source/f3d'
fetch-depth: 0
lfs: false

- name: Dependencies Dir
working-directory: ${{github.workspace}}
run: |
mkdir dependencies
cd dependencies
mkdir install
- name: Install VTK dependency
uses: ./source/f3d/.github/actions/vtk-install-dep
with:
vtk_sha_file: ./source/f3d/.github/actions/vtk_commit_sha

- name: Setup Build Directory
working-directory: ${{github.workspace}}
run: mkdir build

- name: Configure
working-directory: ${{github.workspace}}/build
run: >
cmake ../source
-Werror=dev
-Werror=deprecated
--warn-uninitialized
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_PREFIX_PATH:PATH=$(pwd)/../dependencies/install/
-DF3D_STRICT_BUILD=ON
- name: Build
working-directory: ${{github.workspace}}/build
run: cmake --build . --parallel 2
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.21)
cmake_minimum_required(VERSION 3.19)
include(CMakeDependentOption)

# Generic CMake variables, should be done before project()
Expand Down
14 changes: 7 additions & 7 deletions application/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
include("f3dEmbed")

f3d_embed_file(
INPUT "${F3D_SOURCE_DIR}/resources/logo32.png"
INPUT "${CMAKE_SOURCE_DIR}/resources/logo32.png"
NAME F3DIcon
BINARY)

Expand All @@ -19,7 +19,7 @@ set(F3D_SOURCE_FILES
)

if(WIN32)
list(APPEND F3D_SOURCE_FILES "${F3D_SOURCE_DIR}/resources/f3d.rc")
list(APPEND F3D_SOURCE_FILES "${CMAKE_SOURCE_DIR}/resources/f3d.rc")
endif()

if(APPLE)
Expand Down Expand Up @@ -52,21 +52,21 @@ if (APPLE)
elseif (UNIX)
set_target_properties(f3d PROPERTIES INSTALL_RPATH $ORIGIN/../${CMAKE_INSTALL_LIBDIR})
elseif (MSVC)
set_property(DIRECTORY ${F3D_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT f3d) # Set f3d as startup project in visual studio
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT f3d) # Set f3d as startup project in visual studio
set_target_properties(f3d PROPERTIES VS_DEBUGGER_ENVIRONMENT "PATH=$<TARGET_FILE_DIR:VTK::CommonCore>") # Add VTK in MSVC PATH environment variable
endif ()

target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
if (F3D_USE_EXTERNAL_CXXOPTS)
target_link_libraries(f3d PRIVATE cxxopts::cxxopts)
else ()
target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${F3D_SOURCE_DIR}/external/cxxopts>)
target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/external/cxxopts>)
endif ()

if (F3D_USE_EXTERNAL_NLOHMANN_JSON)
target_link_libraries(f3d PRIVATE nlohmann_json::nlohmann_json)
else ()
target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${F3D_SOURCE_DIR}/external/nlohmann_json>)
target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/external/nlohmann_json>)
endif ()

set(f3d_compile_options_private "")
Expand Down Expand Up @@ -102,7 +102,7 @@ if(F3D_MACOS_BUNDLE)

# Add logo icon
set(MACOSX_BUNDLE_ICON_FILE logo.icns)
set(f3d_ICON ${F3D_SOURCE_DIR}/resources/logo.icns)
set(f3d_ICON ${CMAKE_SOURCE_DIR}/resources/logo.icns)
set_source_files_properties(${f3d_ICON} PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources")
target_sources(f3d PRIVATE ${f3d_ICON})
Expand All @@ -118,7 +118,7 @@ if(F3D_MACOS_BUNDLE)
set(MACOSX_BUNDLE_COPYRIGHT "Michael Migliore, Mathieu Westphal")

# Generate MacOS bundle
configure_file("${F3D_SOURCE_DIR}/resources/BundleInfo.plist.in"
configure_file("${CMAKE_SOURCE_DIR}/resources/BundleInfo.plist.in"
"${CMAKE_CURRENT_BINARY_DIR}/BundleInfo.plist")
set_target_properties(f3d PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/BundleInfo.plist")
endif()
Expand Down
128 changes: 64 additions & 64 deletions application/testing/CMakeLists.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cmake/f3dPlugin.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ macro(f3d_plugin_build)
set(_f3d_plugins_install_dir ${f3d_PLUGINS_INSTALL_DIR})
else()
# In-source plugin path
set(_f3d_include_path "${F3D_SOURCE_DIR}/library/plugin")
set(_f3d_include_path "${CMAKE_SOURCE_DIR}/library/plugin")
set(_f3d_config_dir ${f3d_config_dir})
set(_f3d_plugins_install_dir ${F3D_PLUGINS_INSTALL_DIR})
endif()
Expand Down
2 changes: 1 addition & 1 deletion java/testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ foreach(test_file ${javaf3dTests_list})
-Djava.library.path=$<SHELL_PATH:$<TARGET_FILE_DIR:javaf3d>> # path to the JNI library
${java_test_args}
-cp $<SHELL_PATH:$<TARGET_PROPERTY:f3d-jar,JAR_FILE>> # path to the JAR file
$<SHELL_PATH:${test_file}> ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/
$<SHELL_PATH:${test_file}> ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/
)

set_tests_properties(javaf3d::${TName} PROPERTIES DISABLED ${java_test_disabled})
Expand Down
16 changes: 8 additions & 8 deletions library/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ if (F3D_USE_EXTERNAL_NLOHMANN_JSON)
target_link_libraries(libf3d PRIVATE nlohmann_json::nlohmann_json)
else ()
target_include_directories(libf3d PRIVATE
$<BUILD_INTERFACE:${F3D_SOURCE_DIR}/external/nlohmann_json>)
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/external/nlohmann_json>)
endif ()

set_target_properties(libf3d PROPERTIES
Expand Down Expand Up @@ -202,7 +202,7 @@ if(BUILD_SHARED_LIBS)

include(CMakePackageConfigHelpers)
configure_package_config_file(
"${F3D_SOURCE_DIR}/cmake/f3dConfig.cmake.in" "${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake"
"${CMAKE_SOURCE_DIR}/cmake/f3dConfig.cmake.in" "${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/f3d")

write_basic_package_version_file(
Expand All @@ -214,12 +214,12 @@ if(BUILD_SHARED_LIBS)
FILES
"${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake"
"${CMAKE_BINARY_DIR}/cmake/f3dConfigVersion.cmake"
"${F3D_SOURCE_DIR}/cmake/f3dEmbed.cmake"
"${F3D_SOURCE_DIR}/cmake/f3dPlugin.cmake"
"${F3D_SOURCE_DIR}/cmake/plugin.cxx.in"
"${F3D_SOURCE_DIR}/cmake/plugin.desktop.in"
"${F3D_SOURCE_DIR}/cmake/plugin.thumbnailer.in"
"${F3D_SOURCE_DIR}/cmake/readerBoilerPlate.h.in"
"${CMAKE_SOURCE_DIR}/cmake/f3dEmbed.cmake"
"${CMAKE_SOURCE_DIR}/cmake/f3dPlugin.cmake"
"${CMAKE_SOURCE_DIR}/cmake/plugin.cxx.in"
"${CMAKE_SOURCE_DIR}/cmake/plugin.desktop.in"
"${CMAKE_SOURCE_DIR}/cmake/plugin.thumbnailer.in"
"${CMAKE_SOURCE_DIR}/cmake/readerBoilerPlate.h.in"
DESTINATION
"${CMAKE_INSTALL_LIBDIR}/cmake/f3d"
COMPONENT sdk
Expand Down
2 changes: 1 addition & 1 deletion library/VTKExtensions/Applicative/Testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ endif()
vtk_add_test_cxx(VTKExtensionsApplicativeTests tests
NO_DATA NO_VALID NO_OUTPUT
${test_sources}
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsApplicativeTests tests)
2 changes: 1 addition & 1 deletion library/VTKExtensions/Core/Testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ endif()
vtk_add_test_cxx(VTKExtensionsCoreTests tests
NO_DATA NO_VALID NO_OUTPUT
TestF3DLog.cxx
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsCoreTests tests)

if(UNIX)
Expand Down
2 changes: 1 addition & 1 deletion library/VTKExtensions/Readers/Testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ endif()
vtk_add_test_cxx(VTKExtensionsReaderTests tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsReaderTests_list}
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsReaderTests tests)

2 changes: 1 addition & 1 deletion library/VTKExtensions/Rendering/Testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ vtk_add_test_cxx(VTKExtensionsRenderingTests tests
TestF3DRenderer.cxx
TestF3DRendererWithColoring.cxx
TestF3DCachedTexturesPrint.cxx
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsRenderingTests tests)
6 changes: 3 additions & 3 deletions library/testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ if(VTK_VERSION VERSION_GREATER_EQUAL 9.1.20220519)
endif()

# Configure the log file for dropfile test
configure_file("${F3D_SOURCE_DIR}/testing/recordings/TestSDKInteractorCallBack.log.in"
configure_file("${CMAKE_SOURCE_DIR}/testing/recordings/TestSDKInteractorCallBack.log.in"
"${CMAKE_BINARY_DIR}/TestSDKInteractorCallBack.log") # Dragon.vtu; S
configure_file("${F3D_SOURCE_DIR}/testing/recordings/TestSDKInteractorDropFullScene.log.in"
configure_file("${CMAKE_SOURCE_DIR}/testing/recordings/TestSDKInteractorDropFullScene.log.in"
"${CMAKE_BINARY_DIR}/TestSDKInteractorDropFullScene.log") # world.obj; S

# External window tests
Expand Down Expand Up @@ -98,7 +98,7 @@ list(APPEND libf3dSDKTestsNoRender_list
# Add all the ADD_TEST for each test
foreach (test ${libf3dSDKTests_list})
get_filename_component (TName ${test} NAME_WE)
add_test (NAME libf3d::${TName} COMMAND libf3dSDKTests ${TName} "${F3D_SOURCE_DIR}/testing/" "${CMAKE_BINARY_DIR}/Testing/Temporary/" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
add_test (NAME libf3d::${TName} COMMAND libf3dSDKTests ${TName} "${CMAKE_SOURCE_DIR}/testing/" "${CMAKE_BINARY_DIR}/Testing/Temporary/" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
set_tests_properties(libf3d::${TName} PROPERTIES TIMEOUT 30)
if (NOT F3D_TESTING_ENABLE_RENDERING_TESTS AND NOT ${TName} IN_LIST libf3dSDKTestsNoRender_list)
set_tests_properties(libf3d::${TName} PROPERTIES DISABLED ON)
Expand Down
4 changes: 2 additions & 2 deletions plugins/alembic/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.21)
cmake_minimum_required(VERSION 3.19)

project(f3d-plugin-alembic)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(PROJECT_IS_TOP_LEVEL)
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
Expand Down
2 changes: 1 addition & 1 deletion plugins/alembic/module/Testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ endif()
vtk_add_test_cxx(VTKExtensionsPluginAlembic tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsPluginAlembic_list}
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsPluginAlembic tests)
4 changes: 2 additions & 2 deletions plugins/assimp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.21)
cmake_minimum_required(VERSION 3.19)

project(f3d-plugin-assimp)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(PROJECT_IS_TOP_LEVEL)
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
Expand Down
2 changes: 1 addition & 1 deletion plugins/assimp/module/Testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ endif()
vtk_add_test_cxx(VTKExtensionsPluginAssimp tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsPluginAssimp_list}
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsPluginAssimp tests)
42 changes: 42 additions & 0 deletions plugins/draco/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
cmake_minimum_required(VERSION 3.19)

project(f3d-plugin-draco)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
endif()

find_package(draco REQUIRED)

message(STATUS "Plugin: draco ${draco_VERSION} found")

f3d_plugin_init()

f3d_plugin_declare_reader(
NAME Draco
EXTENSIONS drc
MIMETYPES application/vnd.drc
VTK_READER vtkF3DDracoReader
FORMAT_DESCRIPTION "Draco"
)

set(rpaths "")
get_target_property(target_type draco::draco TYPE)
if (target_type STREQUAL SHARED_LIBRARY)
list(APPEND rpaths "$<TARGET_FILE_DIR:draco::draco>")
endif ()

f3d_plugin_build(
NAME draco
VERSION 1.0
DESCRIPTION "Draco support (version ${draco_VERSION})"
ADDITIONAL_RPATHS ${rpaths}
MIMETYPE_XML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/f3d-draco-formats.xml"
CONFIGURATION_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/configs/config.d" "${CMAKE_CURRENT_SOURCE_DIR}/configs/thumbnail.d"
FREEDESKTOP
)
13 changes: 13 additions & 0 deletions plugins/draco/module/Testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
list(APPEND VTKExtensionsPluginDraco_list
TestF3DDracoReader.cxx
)

if(VTK_VERSION VERSION_LESS_EQUAL 9.1.0)
cmake_policy(SET CMP0115 OLD)
endif()

vtk_add_test_cxx(VTKExtensionsPluginDraco tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsPluginDraco_list}
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsPluginDraco tests)
4 changes: 2 additions & 2 deletions plugins/exodus/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.21)
cmake_minimum_required(VERSION 3.19)

project(f3d-plugin-exodus)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(PROJECT_IS_TOP_LEVEL)
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
Expand Down
8 changes: 1 addition & 7 deletions plugins/native/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
cmake_minimum_required(VERSION 3.21)

project(f3d-plugin-native)

include(GNUInstallDirs)

# Only internal build is supported for static plugins
if(PROJECT_IS_TOP_LEVEL)
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
message(FATAL_ERROR "native plugin cannot be built externally")
endif()

Expand Down
4 changes: 2 additions & 2 deletions plugins/occt/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.21)
cmake_minimum_required(VERSION 3.19)

project(f3d-plugin-occt)

include(GNUInstallDirs)

# Check if the plugin is built externally
if(PROJECT_IS_TOP_LEVEL)
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package(f3d REQUIRED)
else()
include(f3dPlugin)
Expand Down
2 changes: 1 addition & 1 deletion plugins/occt/module/Testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ endif()
vtk_add_test_cxx(VTKExtensionsPluginOCCT tests
NO_DATA NO_VALID NO_OUTPUT
${VTKExtensionsPluginOCCT_list}
${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
vtk_test_cxx_executable(VTKExtensionsPluginOCCT tests)
2 changes: 1 addition & 1 deletion python/testing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ list(APPEND pyf3dTestsNoRender_list
# Add all the ADD_TEST for each test
foreach(test ${pyf3dTests_list})
get_filename_component (TName ${test} NAME_WE)
add_test(NAME pyf3d::${TName} COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/${test} $<TARGET_FILE_DIR:VTK::CommonCore> ${F3D_SOURCE_DIR} ${CMAKE_BINARY_DIR})
add_test(NAME pyf3d::${TName} COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/${test} $<TARGET_FILE_DIR:VTK::CommonCore> ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
set_tests_properties(pyf3d::${TName} PROPERTIES
ENVIRONMENT "PYTHONPATH=$<TARGET_FILE_DIR:pyf3d>"
FAIL_REGULAR_EXPRESSION "AssertionError")
Expand Down
Loading

0 comments on commit 8c5af44

Please sign in to comment.