diff options
| author | Karl Schultz <karl@lunarg.com> | 2016-09-02 10:17:05 -0600 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2016-09-02 10:17:05 -0600 |
| commit | e8a100f135c260ad3021b630d7715dc14e09d6a6 (patch) | |
| tree | ab393f30a7874b21ff87871feeb7c23ec42074df /libs | |
| parent | b544c478c275023bb3db4ddf9d4f00c538f0dd5f (diff) | |
build: gh672 Fix CMake CXX_FLAGS inheritance
Some sub-projects were overwriting CMAKE_CXX_FLAGS instead of
inheriting from the parent. This keeps any user settings outside
or above the top CMakeLists.txt file from reaching these sub-projects.
These fixes include preserving the inheritance, adding extra flags
to turn off warnings (mostly in autogen code) because the top
level turns on Wall, and trivial code fixes to avoid the need to
add a setting to turn off a warning for those trivial fixes.
These changes should have no impact on Windows.
Change-Id: I0c3c175cb5058f26a259ee3f4fde9fdaf3e6b00d
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/vkjson/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/vkjson/CMakeLists.txt b/libs/vkjson/CMakeLists.txt index fc69bb61..16b8e211 100644 --- a/libs/vkjson/CMakeLists.txt +++ b/libs/vkjson/CMakeLists.txt @@ -19,9 +19,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -if (NOT WIN32) - set (CMAKE_CXX_FLAGS "-std=c++11") -endif() include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../loader @@ -31,6 +28,7 @@ include_directories( add_library(vkjson STATIC vkjson.cc vkjson_instance.cc ../../loader/cJSON.c) if(UNIX) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare") add_executable(vkjson_unittest vkjson_unittest.cc) add_executable(vkjson_info vkjson_info.cc) else() |