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

Clean CMakeLists.txt #491

Merged
merged 1 commit into from
Feb 27, 2025
Merged

Clean CMakeLists.txt #491

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
16 changes: 0 additions & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,17 +151,6 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
else()
set( OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS} \
-Winconsistent-missing-destructor-override -Wcomma -Wsign-conversion -Wconversion" )
# set( OGRE_WARNING_FLAGS
# "-Weverything -Wno-reserved-id-macro -Wno-old-style-cast -Wno-documentation-unknown-command \
# -Wno-zero-as-null-pointer-constant -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-undef \
# -Wno-padded -Werror" )
# set( OGRE_WARNING_FLAGS
# "-Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-unused-macros -Wno-newline-eof \
# -Wno-exit-time-destructors -Wno-global-constructors -Wno-gnu-zero-variadic-macro-arguments \
# -Wno-documentation -Wno-shadow -Wno-switch-enum -Wno-missing-prototypes \
# -Wno-used-but-marked-unused -Wno-zero-as-null-pointer-constant -Wno-old-style-cast \
# -Wno-double-promotion -Wno-reserved-id-macro -Wno-undef -Wno-documentation-unknown-command \
# -Wno-float-equal -Wno-covered-switch-default -Werror" )
endif()

if (EMSCRIPTEN)
Expand Down Expand Up @@ -373,9 +362,7 @@ elseif(EMSCRIPTEN)
add_definitions(-DEMSCRIPTEN=1 -D__EMSCRIPTEN__=1)
set(TargetPlatform "Emscripten")
set(OGRE_PLATFORM OGRE_PLATFORM_EMSCRIPTEN)

set(OGRE_BUILD_RENDERSYSTEM_GLES2 TRUE CACHE BOOL "Forcing OpenGL ES 2 RenderSystem for Emscripten" FORCE)

set(OGRE_CONFIG_ENABLE_STBI TRUE CACHE BOOL "Enable STBIImageCodec on Emscripten (Smaller Footprint)" FORCE)
set(OGRE_CONFIG_ENABLE_FREEIMAGE FALSE CACHE BOOL "Disable Freeimage on Emscripten (Smaller Footprint)" FORCE)
set(OGRE_BUILD_TOOLS FALSE CACHE BOOL "Disable tools on Emscripten" FORCE)
Expand Down Expand Up @@ -529,7 +516,6 @@ option(OGRE_BUILD_TESTS "Build the unit tests & PlayPen" FALSE)
option(OGRE_CONFIG_DOUBLE "Use doubles instead of floats in Ogre" FALSE)
option(OGRE_CONFIG_NODE_INHERIT_TRANSFORM "Tells the node whether it should inherit full transform from it's parent node or derived position, orientation and scale" FALSE)


set(OGRE_PLUGIN_LIB_PREFIX "" CACHE STRING "Prefix dynamically linked plugins, e.g. 'lib' (GCC and Clang only)")

if (WINDOWS_STORE OR WINDOWS_PHONE)
Expand Down Expand Up @@ -760,11 +746,9 @@ add_subdirectory(CMake)
# provide option to install dependencies on Windows
include(InstallDependencies)


# Provide CPack packaging target
include(Packaging)


# Show feature summary
include(OgreFeatureSummary)

Loading