Fix F3D build when added as a subproject (#899)

f3d-app · Jul 7, 2023 · 3f713f3 · 3f713f3
1 parent 9c41354
commit 3f713f3
Show file tree

Hide file tree

Showing 33 changed files with 184 additions and 119 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -604,3 +604,62 @@ 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
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 include(CMakeDependentOption)
 
 # Generic CMake variables, should be done before project()

diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
@@ -2,7 +2,7 @@
 include("f3dEmbed")
 
 f3d_embed_file(
-  INPUT "${CMAKE_SOURCE_DIR}/resources/logo32.png"
+  INPUT "${F3D_SOURCE_DIR}/resources/logo32.png"
   NAME F3DIcon
   BINARY)
 
@@ -19,7 +19,7 @@ set(F3D_SOURCE_FILES
 )
 
 if(WIN32)
-  list(APPEND F3D_SOURCE_FILES "${CMAKE_SOURCE_DIR}/resources/f3d.rc")
+  list(APPEND F3D_SOURCE_FILES "${F3D_SOURCE_DIR}/resources/f3d.rc")
 endif()
 
 if(APPLE)
@@ -52,21 +52,21 @@ if (APPLE)
 elseif (UNIX)
   set_target_properties(f3d PROPERTIES INSTALL_RPATH $ORIGIN/../${CMAKE_INSTALL_LIBDIR})
 elseif (MSVC)
-  set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT f3d) # Set f3d as startup project in visual studio
+  set_property(DIRECTORY ${F3D_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:${CMAKE_SOURCE_DIR}/external/cxxopts>)
+  target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${F3D_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:${CMAKE_SOURCE_DIR}/external/nlohmann_json>)
+  target_include_directories(f3d PUBLIC $<BUILD_INTERFACE:${F3D_SOURCE_DIR}/external/nlohmann_json>)
 endif ()
 
 set(f3d_compile_options_private "")
@@ -102,7 +102,7 @@ if(F3D_MACOS_BUNDLE)
 
   # Add logo icon
   set(MACOSX_BUNDLE_ICON_FILE logo.icns)
-  set(f3d_ICON ${CMAKE_SOURCE_DIR}/resources/logo.icns)
+  set(f3d_ICON ${F3D_SOURCE_DIR}/resources/logo.icns)
   set_source_files_properties(${f3d_ICON} PROPERTIES
     MACOSX_PACKAGE_LOCATION "Resources")
   target_sources(f3d PRIVATE ${f3d_ICON})
@@ -118,7 +118,7 @@ if(F3D_MACOS_BUNDLE)
   set(MACOSX_BUNDLE_COPYRIGHT "Michael Migliore, Mathieu Westphal")
 
   # Generate MacOS bundle
-  configure_file("${CMAKE_SOURCE_DIR}/resources/BundleInfo.plist.in"
+  configure_file("${F3D_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()

diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
diff --git a/cmake/f3dPlugin.cmake b/cmake/f3dPlugin.cmake
@@ -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 "${CMAKE_SOURCE_DIR}/library/plugin")
+    set(_f3d_include_path "${F3D_SOURCE_DIR}/library/plugin")
     set(_f3d_config_dir ${f3d_config_dir})
     set(_f3d_plugins_install_dir ${F3D_PLUGINS_INSTALL_DIR})
   endif()

diff --git a/java/testing/CMakeLists.txt b/java/testing/CMakeLists.txt
@@ -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}> ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/
+      $<SHELL_PATH:${test_file}> ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/
     )
 
     set_tests_properties(javaf3d::${TName} PROPERTIES DISABLED ${java_test_disabled})

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -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:${CMAKE_SOURCE_DIR}/external/nlohmann_json>)
+    $<BUILD_INTERFACE:${F3D_SOURCE_DIR}/external/nlohmann_json>)
 endif ()
 
 set_target_properties(libf3d PROPERTIES
@@ -196,7 +196,7 @@ if(BUILD_SHARED_LIBS)
 
   include(CMakePackageConfigHelpers)
   configure_package_config_file(
-    "${CMAKE_SOURCE_DIR}/cmake/f3dConfig.cmake.in" "${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake"
+    "${F3D_SOURCE_DIR}/cmake/f3dConfig.cmake.in" "${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake"
     INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/f3d")
 
   write_basic_package_version_file(
@@ -208,12 +208,12 @@ if(BUILD_SHARED_LIBS)
     FILES
       "${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake"
       "${CMAKE_BINARY_DIR}/cmake/f3dConfigVersion.cmake"
-      "${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"
+      "${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"
     DESTINATION
       "${CMAKE_INSTALL_LIBDIR}/cmake/f3d"
     COMPONENT sdk

diff --git a/library/VTKExtensions/Applicative/Testing/CMakeLists.txt b/library/VTKExtensions/Applicative/Testing/CMakeLists.txt
@@ -13,5 +13,5 @@ endif()
 vtk_add_test_cxx(VTKExtensionsApplicativeTests tests
   NO_DATA NO_VALID NO_OUTPUT
   ${test_sources}
-  ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
+  ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
 vtk_test_cxx_executable(VTKExtensionsApplicativeTests tests)
diff --git a/library/VTKExtensions/Core/Testing/CMakeLists.txt b/library/VTKExtensions/Core/Testing/CMakeLists.txt
@@ -5,7 +5,7 @@ endif()
 vtk_add_test_cxx(VTKExtensionsCoreTests tests
   NO_DATA NO_VALID NO_OUTPUT
   TestF3DLog.cxx
-  ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
+  ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
 vtk_test_cxx_executable(VTKExtensionsCoreTests tests)
 
 if(UNIX)

diff --git a/library/VTKExtensions/Readers/Testing/CMakeLists.txt b/library/VTKExtensions/Readers/Testing/CMakeLists.txt
@@ -14,6 +14,6 @@ endif()
 vtk_add_test_cxx(VTKExtensionsReaderTests tests
   NO_DATA NO_VALID NO_OUTPUT
   ${VTKExtensionsReaderTests_list}
-  ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
+  ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
 vtk_test_cxx_executable(VTKExtensionsReaderTests tests)
 
diff --git a/library/VTKExtensions/Rendering/Testing/CMakeLists.txt b/library/VTKExtensions/Rendering/Testing/CMakeLists.txt
@@ -10,5 +10,5 @@ vtk_add_test_cxx(VTKExtensionsRenderingTests tests
   TestF3DRenderer.cxx
   TestF3DRendererWithColoring.cxx
   TestF3DCachedTexturesPrint.cxx
-  ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
+  ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
 vtk_test_cxx_executable(VTKExtensionsRenderingTests tests)
diff --git a/library/testing/CMakeLists.txt b/library/testing/CMakeLists.txt
@@ -47,9 +47,9 @@ if(VTK_VERSION VERSION_GREATER_EQUAL 9.1.20220519)
 endif()
 
 # Configure the log file for dropfile test
-configure_file("${CMAKE_SOURCE_DIR}/testing/recordings/TestSDKInteractorCallBack.log.in"
+configure_file("${F3D_SOURCE_DIR}/testing/recordings/TestSDKInteractorCallBack.log.in"
                "${CMAKE_BINARY_DIR}/TestSDKInteractorCallBack.log") # Dragon.vtu; S
-configure_file("${CMAKE_SOURCE_DIR}/testing/recordings/TestSDKInteractorDropFullScene.log.in"
+configure_file("${F3D_SOURCE_DIR}/testing/recordings/TestSDKInteractorDropFullScene.log.in"
                "${CMAKE_BINARY_DIR}/TestSDKInteractorDropFullScene.log") # world.obj; S
 
 # External window tests
@@ -92,7 +92,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}  "${CMAKE_SOURCE_DIR}/testing/" "${CMAKE_BINARY_DIR}/Testing/Temporary/" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+  add_test (NAME libf3d::${TName} COMMAND libf3dSDKTests ${TName}  "${F3D_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)

diff --git a/plugins/alembic/CMakeLists.txt b/plugins/alembic/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 project(f3d-plugin-alembic)
 
 include(GNUInstallDirs)
 
 # Check if the plugin is built externally
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+if(PROJECT_IS_TOP_LEVEL)
   find_package(f3d REQUIRED)
 else()
   include(f3dPlugin)

diff --git a/plugins/alembic/module/Testing/CMakeLists.txt b/plugins/alembic/module/Testing/CMakeLists.txt
@@ -9,5 +9,5 @@ endif()
 vtk_add_test_cxx(VTKExtensionsPluginAlembic tests
   NO_DATA NO_VALID NO_OUTPUT
   ${VTKExtensionsPluginAlembic_list}
-  ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
+  ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
 vtk_test_cxx_executable(VTKExtensionsPluginAlembic tests)
diff --git a/plugins/assimp/CMakeLists.txt b/plugins/assimp/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 project(f3d-plugin-assimp)
 
 include(GNUInstallDirs)
 
 # Check if the plugin is built externally
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+if(PROJECT_IS_TOP_LEVEL)
   find_package(f3d REQUIRED)
 else()
   include(f3dPlugin)

diff --git a/plugins/assimp/module/Testing/CMakeLists.txt b/plugins/assimp/module/Testing/CMakeLists.txt
@@ -10,5 +10,5 @@ endif()
 vtk_add_test_cxx(VTKExtensionsPluginAssimp tests
   NO_DATA NO_VALID NO_OUTPUT
   ${VTKExtensionsPluginAssimp_list}
-  ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
+  ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
 vtk_test_cxx_executable(VTKExtensionsPluginAssimp tests)
diff --git a/plugins/draco/CMakeLists.txt b/plugins/draco/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 project(f3d-plugin-draco)
 
 include(GNUInstallDirs)
 
 # Check if the plugin is built externally
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+if(PROJECT_IS_TOP_LEVEL)
   find_package(f3d REQUIRED)
 else()
   include(f3dPlugin)

diff --git a/plugins/draco/module/Testing/CMakeLists.txt b/plugins/draco/module/Testing/CMakeLists.txt
@@ -9,5 +9,5 @@ endif()
 vtk_add_test_cxx(VTKExtensionsPluginDraco tests
   NO_DATA NO_VALID NO_OUTPUT
   ${VTKExtensionsPluginDraco_list}
-  ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
+  ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
 vtk_test_cxx_executable(VTKExtensionsPluginDraco tests)
diff --git a/plugins/exodus/CMakeLists.txt b/plugins/exodus/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 project(f3d-plugin-exodus)
 
 include(GNUInstallDirs)
 
 # Check if the plugin is built externally
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+if(PROJECT_IS_TOP_LEVEL)
   find_package(f3d REQUIRED)
 else()
   include(f3dPlugin)

diff --git a/plugins/native/CMakeLists.txt b/plugins/native/CMakeLists.txt
@@ -1,5 +1,11 @@
+cmake_minimum_required(VERSION 3.21)
+
+project(f3d-plugin-native)
+
+include(GNUInstallDirs)
+
 # Only internal build is supported for static plugins
-if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+if(PROJECT_IS_TOP_LEVEL)
   message(FATAL_ERROR "native plugin cannot be built externally")
 endif()
 

diff --git a/plugins/occt/CMakeLists.txt b/plugins/occt/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 project(f3d-plugin-occt)
 
 include(GNUInstallDirs)
 
 # Check if the plugin is built externally
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+if(PROJECT_IS_TOP_LEVEL)
   find_package(f3d REQUIRED)
 else()
   include(f3dPlugin)

diff --git a/plugins/occt/module/Testing/CMakeLists.txt b/plugins/occt/module/Testing/CMakeLists.txt
@@ -9,5 +9,5 @@ endif()
 vtk_add_test_cxx(VTKExtensionsPluginOCCT tests
   NO_DATA NO_VALID NO_OUTPUT
   ${VTKExtensionsPluginOCCT_list}
-  ${CMAKE_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
+  ${F3D_SOURCE_DIR}/testing/ ${CMAKE_BINARY_DIR}/Testing/Temporary/)
 vtk_test_cxx_executable(VTKExtensionsPluginOCCT tests)
diff --git a/python/testing/CMakeLists.txt b/python/testing/CMakeLists.txt
@@ -27,7 +27,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> ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+  add_test(NAME pyf3d::${TName} COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/${test} $<TARGET_FILE_DIR:VTK::CommonCore> ${F3D_SOURCE_DIR} ${CMAKE_BINARY_DIR})
   set_tests_properties(pyf3d::${TName} PROPERTIES
     ENVIRONMENT "PYTHONPATH=$<TARGET_FILE_DIR:pyf3d>"
     FAIL_REGULAR_EXPRESSION "AssertionError")

diff --git a/testing/configs/hdri.json.in b/testing/configs/hdri.json.in
@@ -1,6 +1,6 @@
 {
   "global":
   {
-    "hdri": "${CMAKE_SOURCE_DIR}/testing/data/palermo_park_1k.hdr"
+    "hdri": "${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr"
   }
 }
diff --git a/testing/recordings/TestInteractionDropFiles.log.in b/testing/recordings/TestInteractionDropFiles.log.in
@@ -8,15 +8,15 @@ KeyPressEvent 677 699 0 0 1 Super_L 0
 CharEvent 677 699 0 0 1 Super_L 0
 UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
 EnterEvent 781 494 0 0 0 Super_L 0
-DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${CMAKE_SOURCE_DIR}/testing/data/cow.vtp
+DropFilesEvent 781 494 0 0 0 Super_L 1 1 ${F3D_SOURCE_DIR}/testing/data/cow.vtp
 RenderEvent 781 494 0 0 0 Super_L 0
 MouseMoveEvent 781 498 0 0 0 Super_L 0
 LeaveEvent 751 614 0 0 0 Super_L 0
 EnterEvent 700 570 0 0 0 Super_L 0
 MouseMoveEvent 700 570 0 0 0 Super_L 0
 UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
 EnterEvent 781 494 0 0 0 Super_L 0
-DropFilesEvent 781 494 0 0 0 Super_L 1 2 ${CMAKE_SOURCE_DIR}/testing/data/dragon.vtu ${CMAKE_SOURCE_DIR}/testing/data/suzanne.stl
+DropFilesEvent 781 494 0 0 0 Super_L 1 2 ${F3D_SOURCE_DIR}/testing/data/dragon.vtu ${F3D_SOURCE_DIR}/testing/data/suzanne.stl
 RenderEvent 781 494 0 0 0 Super_L 0
 MouseMoveEvent 781 498 0 0 0 Super_L 0
 LeaveEvent 751 614 0 0 0 Super_L 0

diff --git a/testing/recordings/TestInteractionDropHDRI.log.in b/testing/recordings/TestInteractionDropHDRI.log.in
@@ -8,5 +8,5 @@ KeyPressEvent 677 699 0 0 1 Super_L 0
 CharEvent 677 699 0 0 1 Super_L 0
 UpdateDropLocationEvent 677 699 0 0 1 Super_L 0
 EnterEvent 781 494 0 0 0 Super_L 0
-DropFilesEvent 781 494 0 0 0 Super_L 1 2 ${CMAKE_SOURCE_DIR}/testing/data/dragon.vtu ${CMAKE_SOURCE_DIR}/testing/data/palermo_park_1k.hdr
+DropFilesEvent 781 494 0 0 0 Super_L 1 2 ${F3D_SOURCE_DIR}/testing/data/dragon.vtu ${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr
 RenderEvent 781 494 0 0 0 Super_L 0