mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-26 05:58:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Define compile options as private for supressing warnings

Browse Source
This commit is contained in:
Alexander Bock
2017-04-06 19:38:10 -04:00
parent 6a851e11a3
commit d7e1a21551
4 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
support/cmake/module_definition.cmake
+1
View File
@@ -87,6 +87,7 @@ function (set_common_compile_settings target_name)
if (MSVC)
target_compile_options(${library_name} PUBLIC
"/ZI" # Enable edit and continue support
"/MP" # Enabling multi-threaded compilation
"/wd4100" # Unreferenced formal parameter [too frequent in external libs]
"/wd4127" # constant conditional expression [used for do/while semicolon swallowing]
support/cmake/support_macros.cmake
+9 -8
View File
@@ -68,23 +68,24 @@ function (set_compile_settings project)
set_property(TARGET ${project} PROPERTY CXX_STANDARD_REQUIRED On)
if (MSVC)
target_compile_options(${project} PUBLIC
target_compile_options(${project} PRIVATE
"/MP" # Multi-threading support
"/W4" # Enable all warnings
"/ZI" # Edit and continue support
"/wd4201" # Disable "nameless struct" warning
"/wd4127" # Disable "conditional expression is constant" warning
)
if (OPENSPACE_WARNINGS_AS_ERRORS)
target_compile_options(${project} PUBLIC "/WX")
target_compile_options(${project} PRIVATE "/WX")
endif ()
elseif (APPLE)
target_compile_definitions(${project} PUBLIC "__APPLE__")
target_compile_definitions(${project} PRIVATE "__APPLE__")
if (OPENSPACE_WARNINGS_AS_ERRORS)
target_compile_options(${project} PUBLIC "-Werror")
target_compile_options(${project} PRIVATE "-Werror")
endif ()
target_compile_options(${project} PUBLIC "-stdlib=libc++")
target_compile_options(${project} PRIVATE "-stdlib=libc++")
target_include_directories(${project} PUBLIC "/Developer/Headers/FlatCarbon")
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
@@ -99,10 +100,10 @@ function (set_compile_settings project)
${APP_SERVICES_LIBRARY}
)
elseif (UNIX)
target_compile_options(${project} PUBLIC "-ggdb" "-Wall" "-Wno-long-long" "-pedantic" "-Wextra")
target_compile_options(${project} PRIVATE "-ggdb" "-Wall" "-Wno-long-long" "-pedantic" "-Wextra")
if (OPENSPACE_WARNINGS_AS_ERRORS)
target_compile_options(${project} PUBLIC "-Werror")
target_compile_options(${project} PRIVATE "-Werror")
endif ()
endif ()
endfunction ()
@@ -131,7 +132,7 @@ function (add_external_dependencies)
target_link_libraries(
libOpenSpace
# sgct
sgct_light glew glfw png16_static quat tinythreadpp tinyxml2static turbojpeg-static
sgct_light glew glfw png16_static quat tinythreadpp tinyxml2static turbojpeg-static
vrpn
${GLFW_LIBRARIES}
)