From 55d64ed03b2b4ce23b762e56437c87283f50b1a2 Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Thu, 25 May 2017 09:43:49 +0200
Subject: [PATCH] cleanup

---
 CMakeLists.txt         | 21 ++++++++++-----------
 cmake/in/googletest.in |  4 ++--
 cmake/in/libuv.in      |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5baa21f6..6be92775 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,19 +101,18 @@ find_package(LibRt)
 #
 
 # gtest, gtest_main, gmock and gmock_main targets are available from now on
-configure_file(${PROJECT_CMAKE_IN}/googletest.in googletest-download/CMakeLists.txt)
-execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download)
-execute_process(COMMAND ${CMAKE_COMMAND} --build . WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download)
+configure_file(${PROJECT_CMAKE_IN}/googletest.in googletest/CMakeLists.txt)
+execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . WORKING_DIRECTORY googletest)
+execute_process(COMMAND ${CMAKE_COMMAND} --build . WORKING_DIRECTORY googletest)
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-include_directories(${gtest_SOURCE_DIR}/include ${gmock_SOURCE_DIR}/include)
-add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src ${CMAKE_BINARY_DIR}/googletest-build)
+add_subdirectory(${CMAKE_BINARY_DIR}/googletest/src ${CMAKE_BINARY_DIR}/googletest/build)
 
-configure_file(${PROJECT_CMAKE_IN}/libuv.in libuv-download/CMakeLists.txt)
-execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libuv-download)
-execute_process(COMMAND ${CMAKE_COMMAND} --build . WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libuv-download)
-include_directories(${CMAKE_BINARY_DIR}/libuv-src/include)
-find_library(libuv_static NAMES libuv.a libuv PATHS ${CMAKE_BINARY_DIR}/libuv-src PATH_SUFFIXES .libs Release NO_DEFAULT_PATH)
-find_library(libuv_shared NAMES uv libuv PATHS ${CMAKE_BINARY_DIR}/libuv-src PATH_SUFFIXES .libs Release NO_DEFAULT_PATH)
+configure_file(${PROJECT_CMAKE_IN}/libuv.in libuv/CMakeLists.txt)
+execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . WORKING_DIRECTORY libuv)
+execute_process(COMMAND ${CMAKE_COMMAND} --build . WORKING_DIRECTORY libuv)
+include_directories(${CMAKE_BINARY_DIR}/libuv/src/include)
+find_library(libuv_static NAMES libuv.a libuv PATHS ${CMAKE_BINARY_DIR}/libuv/src PATH_SUFFIXES .libs Release NO_DEFAULT_PATH)
+find_library(libuv_shared NAMES uv libuv PATHS ${CMAKE_BINARY_DIR}/libuv/src PATH_SUFFIXES .libs Release NO_DEFAULT_PATH)
 
 #
 # Referenced directories and targets
diff --git a/cmake/in/googletest.in b/cmake/in/googletest.in
index 3db898cc..5a3e3427 100644
--- a/cmake/in/googletest.in
+++ b/cmake/in/googletest.in
@@ -7,8 +7,8 @@ ExternalProject_Add(
     googletest
     GIT_REPOSITORY https://github.com/google/googletest.git
     GIT_TAG master
-    SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
-    BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
+    SOURCE_DIR src
+    BINARY_DIR build
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
diff --git a/cmake/in/libuv.in b/cmake/in/libuv.in
index 019f6127..38f3d965 100644
--- a/cmake/in/libuv.in
+++ b/cmake/in/libuv.in
@@ -8,7 +8,7 @@ if(WIN32)
         libuv
         GIT_REPOSITORY https://github.com/libuv/libuv.git
         GIT_TAG v1.x
-        SOURCE_DIR ${CMAKE_BINARY_DIR}/libuv-src
+        SOURCE_DIR src
         BUILD_IN_SOURCE 1
         CONFIGURE_COMMAND <SOURCE_DIR>/vcbuild.bat release x86 shared
         BUILD_COMMAND ""
@@ -20,7 +20,7 @@ else(WIN32)
         libuv
         GIT_REPOSITORY https://github.com/libuv/libuv.git
         GIT_TAG v1.x
-        SOURCE_DIR ${CMAKE_BINARY_DIR}/libuv-src
+        SOURCE_DIR src
         BUILD_IN_SOURCE 1
         CONFIGURE_COMMAND sh <SOURCE_DIR>/autogen.sh && ./configure
         BUILD_COMMAND make -j4