From 78ab018fdef55cef1b455ce4249b9fa4371b28d8 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Mon, 18 Apr 2016 00:56:21 +0200 Subject: [PATCH] CMakeLists.txt: output lib* to Debug/ subdir; suppress more warnings ssam expects lib* to be in the Debug subdir, so make cmake put it there, this way it's easier to copy the binaries to your install/Bin/ dir to test. clang gives a lot of -Wlogical-op-parentheses warnings, suppress them. --- Sources/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index e17288a..c247388 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -9,6 +9,9 @@ option(USE_SYSTEM_SDL2 "Use system wide sdl2 libraries/includes" On) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") +# ssam expects the libs to be in Debug/ +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Debug) + # Use systemwide SDL2 or custom build # RAKE!: Find a way to use their custom built library if # they want to use that instead or if their system only @@ -110,6 +113,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_definitions(-Wno-switch) add_definitions(-Wno-tautological-undefined-compare) add_definitions(-Wno-c++11-compat-deprecated-writable-strings) + add_definitions(-Wno-logical-op-parentheses) endif() # !!! FIXME: you currently need this, but I'd like to flip this to not use