diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2018-09-19 12:08:29 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2018-09-19 12:08:29 +0300 |
| commit | 6b655f9aa31018a2269380350c7bdb0c14377ab9 (patch) | |
| tree | 742267f6c7cb5bf450ef6bd2f97d5d46e109577e /xs | |
| parent | 7708fb8ada2a71d69969c08ba6639992ddf5ccbc (diff) | |
| parent | 4bf49fe990d8f894323d52d02b4bcf70e9eebb20 (diff) | |
Merge branch 'dev2' of github.com:prusa3d/Slic3r into dev2
Diffstat (limited to 'xs')
| -rw-r--r-- | xs/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt index 8aa80278e..7d4c324f4 100644 --- a/xs/CMakeLists.txt +++ b/xs/CMakeLists.txt @@ -16,6 +16,12 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals" ) endif() +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + # On GCC and Clang, no return from a non-void function is a warning only. Here, we make it an error. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type" ) +endif() + + # Where all the bundled libraries reside? set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/) # For the bundled boost libraries (boost::nowide) |