From cbb0d81ac46f29906bcf9c4310cec1b01c7e7b01 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Sat, 10 Dec 2016 01:06:16 -0600
Subject: [PATCH] sweeten cmake

---
 CMakeLists.txt | 4 +++-
 configure      | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2881db1a..40c7e2157 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,7 @@ include(MacroOptionalFindPackage)
 include(MacroLogFeature)
 include(FindPackageHandleStandardArgs)
 include (GNUInstallDirs)
+
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
 # You can define multiple libraries, and CMake builds it for you.
@@ -92,6 +93,7 @@ if (ANDROID)
     ADD_SUBDIRECTORY(utf8proc)
     ADD_SUBDIRECTORY(CXX)
 
+
 set (SWIG_FILES    ${CMAKE_SOURCE_DIR}/../generated/jni/yap_wrap.cpp )
 
 else ()
@@ -113,7 +115,7 @@ if (WIN32)
 
   endif()
 
-  add_component (core 
+  add_component (core
           ${ENGINE_SOURCES}
         ${SWIG_FILES}
         ${C_INTERFACE_SOURCES}
diff --git a/configure b/configure
index 4cf9dc3e6..d93ba3d4d 100755
--- a/configure
+++ b/configure
@@ -361,5 +361,5 @@ if [ "x${LDFLAGS}" != "x" ]; then
     done
 fi
 
-CMAKE_CMD="'${CMAKE} ${TOP_SRCDIR}"
-echo "${CMAKE} ${TOP_SRCDIR} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_INSTALL_LIBDIR=${LIBDIR} ${CMAKE_ARGS}"
+CMAKE_CMD="${CMAKE} ${TOP_SRCDIR}"
+${CMAKE_CMD} ${TOP_SRCDIR} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_INSTALL_LIBDIR=${LIBDIR} ${CMAKE_ARGS}