Skip to content
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.

Sign up for GitHub

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

App: Fix an issue with define in F3DConfig #1602

Merged
merged 1 commit into from
Sep 3, 2024
Merged

App: Fix an issue with define in F3DConfig #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions application/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions application/F3DConfig.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion application/F3DConfigFileTools.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "F3DConfigFileTools.h"

#include "F3DConfig.h"
#include "F3DSystemTools.h"

#include "nlohmann/json.hpp"
Expand Down
2 changes: 0 additions & 2 deletions application/F3DOptionsTools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
* @class F3DOptionsTools
* @brief A namespace to handle and parse F3D Options
*/
#include "F3DConfig.h"

#include <filesystem>
#include <map>
#include <string>
Expand Down