App: Fix an issue with define in F3DConfig (f3d-app#1602)

Nokse22 · Sep 21, 2024 · a32cc2a · a32cc2a
1 parent d6caaca
commit a32cc2a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
@@ -91,6 +91,21 @@ set(f3d_link_options_public "")
 # splitting input positional option by commas
 target_compile_definitions(f3d PRIVATE "CXXOPTS_VECTOR_DELIMITER='\\0'")
 
+# macOS bundle
+if (F3D_MACOS_BUNDLE)
+  target_compile_definitions(f3d PRIVATE F3D_MACOS_BUNDLE)
+endif ()
+
+# raytracing
+if (F3D_MODULE_RAYTRACING)
+  target_compile_definitions(f3d PRIVATE F3D_MODULE_RAYTRACING)
+endif ()
+
+# exr
+if (F3D_MODULE_EXR)
+  target_compile_definitions(f3d PRIVATE F3D_MODULE_EXR)
+endif ()
+
 # Headless EGL build
 if (VTK_OPENGL_HAS_EGL)
   target_compile_definitions(f3d PRIVATE F3D_HEADLESS_BUILD)

diff --git a/application/F3DConfig.h.in b/application/F3DConfig.h.in
@@ -11,10 +11,4 @@ const std::string AppVersion = "@F3D_VERSION@";
 const std::string AppVersionFull = "@F3D_VERSION_FULL@";
 const std::string PluginsInstallDir = "@F3D_PLUGINS_INSTALL_DIR@";
 }
-
-// TODO: Use CMake definitions and get rid of these
-#cmakedefine01 F3D_MACOS_BUNDLE
-#cmakedefine01 F3D_MODULE_RAYTRACING
-#cmakedefine01 F3D_MODULE_EXR
-
 #endif
diff --git a/application/F3DConfigFileTools.cxx b/application/F3DConfigFileTools.cxx
@@ -1,6 +1,5 @@
 #include "F3DConfigFileTools.h"
 
-#include "F3DConfig.h"
 #include "F3DSystemTools.h"
 
 #include "nlohmann/json.hpp"

diff --git a/application/F3DOptionsTools.h b/application/F3DOptionsTools.h
@@ -5,8 +5,6 @@
  * @class   F3DOptionsTools
  * @brief   A namespace to handle and parse F3D Options
  */
-#include "F3DConfig.h"
-
 #include <filesystem>
 #include <map>
 #include <string>