From bd33c828dc6b0b380030db977e0bb9a8c8b76afe Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Tue, 12 Mar 2019 17:40:53 +0100 Subject: [PATCH] CMAKE: added optimized build --- Makefile | 5 +++-- cmake/toolchains/linux-toolchain.cmake | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e3b9e5173..ddfe66718 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,15 @@ Q ?= @ UPDATEDIR := /tmp BUILDDIR ?= ./build +BUILDTYPE ?= Debug INSTALL_DIR ?= $(BUILDDIRPATH)$(shell uname) all: - $(Q)if [ ! -f $(BUILDDIR)/CMakeCache.txt ]; then cmake -H. -B$(BUILDDIR) -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR); fi + $(Q)if [ ! -f $(BUILDDIR)/CMakeCache.txt ]; then cmake -H. -B$(BUILDDIR) -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR); fi $(Q)$(MAKE) --no-print-directory -C $(BUILDDIR) $@ %: - $(Q)if [ ! -f $(BUILDDIR)/CMakeCache.txt ]; then cmake -H. -B$(BUILDDIR) -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR); fi + $(Q)if [ ! -f $(BUILDDIR)/CMakeCache.txt ]; then cmake -H. -B$(BUILDDIR) -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR); fi $(Q)$(MAKE) --no-print-directory -C $(BUILDDIR) $@ define UPDATE_GIT diff --git a/cmake/toolchains/linux-toolchain.cmake b/cmake/toolchains/linux-toolchain.cmake index 212a8065b..abc5c67eb 100644 --- a/cmake/toolchains/linux-toolchain.cmake +++ b/cmake/toolchains/linux-toolchain.cmake @@ -111,5 +111,5 @@ endforeach() set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG ${SANITIZE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}") -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 ${CMAKE_C_FLAGS_RELEASE}") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_C_FLAGS_DEBUG}")