Configuration: updated CMake setup

.cmake/LibPackage.cmake

@@ -524,7 +524,7 @@ function( package_git_submodule PREFIX VERSION MODE TMP ) # ${ARGN} search paths
 	  set( ${PREFIX}_BUILD_TYPE "Release" )
 	endif()
 
-	set( ${PREFIX}_BUILD_ARGS -DBUILD_LIBZ3_SHARED=0 -DENABLE_EXAMPLE_TARGETS=0 -DUSE_OPENMP=0 -DUSE_LIB_GMP=0 -DENABLE_TRACING=FALSE -DENABLE_CFI=0 -DAPI_LOG_SYNC=0 -DRUN_UNIT_TESTS=SKIP -DALWAYS_BUILD_DOCS=0 -DBUILD_DOCUMENTATION=0 -DBUILD_PYTHON_BINDINGS=0 -DBUILD_DOTNET_BINDINGS=0 -DBUILD_JAVA_BINDINGS=0 -DINCLUDE_GIT_DESCRIBE=0 -DINCLUDE_GIT_HASH=0 )
+	set( ${PREFIX}_BUILD_ARGS -DZ3_ENABLE_TRACING_FOR_NON_DEBUG=FALSE -DZ3_BUILD_LIBZ3_SHARED=0 -DZ3_ENABLE_EXAMPLE_TARGETS=0 -DZ3_USE_LIB_GMP=0 -DZ3_ENABLE_CFI=0 -DZ3_API_LOG_SYNC=0 -DZ3_RUN_UNIT_TESTS=SKIP -DZ3_ALWAYS_BUILD_DOCS=0 -DZ3_BUILD_DOCUMENTATION=0 -DZ3_BUILD_PYTHON_BINDINGS=0 -DZ3_BUILD_DOTNET_BINDINGS=0 -DZ3_BUILD_JAVA_BINDINGS=0 -DZ3_INCLUDE_GIT_DESCRIBE=0 -DZ3_INCLUDE_GIT_HASH=0 )
       endif()
 
       Externalproject_Add( ${PREFIX}

.cmake/config.mk

@@ -152,6 +152,10 @@ ifeq ($(ENV_CXX),)
   $(error environment C++ compiler '$(X)' not defined!)
 endif
 
+ifndef LTO
+  LTO=0
+endif
+
 
 ifdef ENV_GEN
   G=$(ENV_GEN)
@@ -408,6 +412,12 @@ ENV_CMAKE_CXX_FLAGS =
 ifeq (,$(findstring Visual,$(ENV_GEN)))
   ifeq ($(ENV_OSYS),Windows)
     ENV_CMAKE_CXX_FLAGS += -Wa,-mbig-obj
+  else
+    ifeq ("$(TYPE)","release")
+      ifeq ($(LTO),1)
+        ENV_CMAKE_CXX_FLAGS += -flto
+      endif
+    endif
   endif
 endif
 
@@ -442,7 +452,9 @@ ifeq (,$(findstring Visual,$(ENV_GEN)))
   endif
 
   ifeq ("$(TYPE)","release")
+      ENV_CMAKE_FLAGS += -DCMAKE_EXE_LINKER_FLAGS="-s"
       ENV_CMAKE_FLAGS += -DCMAKE_SHARED_LINKER_FLAGS="-s"
+      ENV_CMAKE_FLAGS += -DCMAKE_STATIC_LINKER_FLAGS="-s"
   endif
 
   ifeq ($(ENV_OSYS),Windows)