mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cmake cleanup

Browse Source 
Apply new Ghoul version
This commit is contained in:
Alexander Bock
2015-05-25 12:21:25 +02:00
parent c7c55f917a
commit f128cfd745
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: a865235d5e...0c76e6c559

19
support/cmake/support_macros.cmake
View File

@@ -81,13 +81,8 @@ function (set_compile_settings)
if (MSVC)
target_compile_options(libOpenSpace PUBLIC "/MP" "/wd4201" "/wd4127")
if (OPENSPACE_WARNINGS_AS_ERRORS)
if (MSVC)
target_compile_options(libOpenSpace PUBLIC "/WX")
target_compile_options(OpenSpace PUBLIC "/WX")
else ()
target_compile_options(libOpenSpace PUBLIC "-Werror")
target_compile_options(OpenSpace PUBLIC "-Werror")
endif ()
target_compile_options(libOpenSpace PUBLIC "/WX")
target_compile_options(OpenSpace PUBLIC "/WX")
endif ()
set_target_properties(OpenSpace PROPERTIES LINK_FLAGS
@@ -108,6 +103,11 @@ function (set_compile_settings)
message(FATAL_ERROR "Compiler does not have C++11 support")
endif ()
if (OPENSPACE_WARNINGS_AS_ERRORS)
target_compile_options(libOpenSpace PUBLIC "-Werror")
target_compile_options(OpenSpace PUBLIC "-Werror")
endif ()
target_compile_options(libOpenSpace PUBLIC "-stdlib=libc++")
target_include_directories(libOpenSpace PUBLIC "/Developer/Headers/FlatCarbon")
@@ -135,6 +135,11 @@ function (set_compile_settings)
message(FATAL_ERROR "Compiler does not have C++11 support")
endif ()
if (OPENSPACE_WARNINGS_AS_ERRORS)
target_compile_options(libOpenSpace PUBLIC "-Werror")
target_compile_options(OpenSpace PUBLIC "-Werror")
endif ()
target_compile_options(libOpenSpace PUBLIC "-ggdb")
endif ()
endfunction ()