mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added option to inhibit all warnings from external projects

Browse Source
This commit is contained in:
Alexander Bock
2015-05-23 22:20:26 +02:00
parent d127726e3c
commit 7f390ef8e5
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -41,19 +41,21 @@ cleanup_project()
set_build_output_directories()
configure_openspace_version(0 1 0 "prerelease-5")
include(src/CMakeLists.txt)
create_openspace_targets()
set_compile_settings()
add_external_dependencies()
option(OPENSPACE_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
if (MSVC)
option(OPENSPACE_ENABLE_VLD "Enable the Visual Leak Detector" OFF)
handle_option_vld()
endif ()
option(OPENSPACE_DISABLE_EXTERNAL_WARNINGS "Disable warnings in external libraries" ON)
option(OPENSPACE_BUILD_GUI_APPLICATIONS "Build GUI Applications" OFF)
include(src/CMakeLists.txt)
create_openspace_targets()
set_compile_settings()
add_external_dependencies()
option(OPENSPACE_HAVE_TESTS "Activate the OpenSpace unit tests" ON)
handle_option_tests()

2
ext/ghoul

Submodule ext/ghoul updated: 9df5fdae81...12aba7d7dc

22
support/cmake/support_macros.cmake
View File

@@ -177,8 +177,23 @@ function (add_external_dependencies)
add_subdirectory(${KAMELEON_ROOT_DIR})
target_include_directories(libOpenSpace SYSTEM PUBLIC ${KAMELEON_INCLUDES})
target_link_libraries(libOpenSpace ccmc)
if (OPENSPACE_DISABLE_EXTERNAL_WARNINGS)
if (MSVC)
target_compile_options(ccmc PUBLIC "/W0" "/MP")
else ()
message("Fill me will values ---abock")
endif ()
target_compile_definitions(ccmc PUBLIC "_SCL_SECURE_NO_WARNINGS")
endif ()
set_property(TARGET ccmc PROPERTY FOLDER "External")
if (TARGET cdf)
if (OPENSPACE_DISABLE_EXTERNAL_WARNINGS)
if (MSVC)
target_compile_options(cdf PUBLIC "/W0" "/MP")
else ()
message("Fill me will values ---abock")
endif ()
endif ()
set_property(TARGET cdf PROPERTY FOLDER "External")
endif ()
@@ -188,6 +203,13 @@ function (add_external_dependencies)
target_link_libraries(libOpenSpace Imgui)
target_include_directories(libOpenSpace PUBLIC ${IMGUI_INCLUDE_DIR})
set_property(TARGET Imgui PROPERTY FOLDER "External")
if (OPENSPACE_DISABLE_EXTERNAL_WARNINGS)
if (MSVC)
target_compile_options(Imgui PUBLIC "/W0" "/MP")
else ()
message("Fill me will values ---abock")
endif ()
endif ()
endfunction ()