From 21fe600848a01f4014aa97b04cc301669502db69 Mon Sep 17 00:00:00 2001 From: Steven McCoy Date: Sun, 14 Jul 2013 13:36:30 -0400 Subject: [PATCH] Move CMake dependencies together. --- CMakeLists.txt | 6 +++--- {cmake => builds/cmake}/Modules/FindAsciiDoc.cmake | 0 {cmake => builds/cmake}/Modules/TestZMQVersion.cmake | 0 {cmake => builds/cmake}/Modules/ZMQSourceRunChecks.cmake | 0 {cmake => builds/cmake}/NSIS.template32.in | 0 {cmake => builds/cmake}/NSIS.template64.in | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename {cmake => builds/cmake}/Modules/FindAsciiDoc.cmake (100%) rename {cmake => builds/cmake}/Modules/TestZMQVersion.cmake (100%) rename {cmake => builds/cmake}/Modules/ZMQSourceRunChecks.cmake (100%) rename {cmake => builds/cmake}/NSIS.template32.in (100%) rename {cmake => builds/cmake}/NSIS.template64.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d406bd4..2f2de2dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ if(NOT ${POLLER} STREQUAL "") set(ZMQ_FORCE_${UPPER_POLLER} 1) endif() -set(ZMQ_CMAKE_MODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules) +set(ZMQ_CMAKE_MODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules) list(APPEND CMAKE_MODULE_PATH ${ZMQ_CMAKE_MODULES_DIR}) include(TestZMQVersion) @@ -435,9 +435,9 @@ endif() if(MSVC) if(CMAKE_CL_64) - set(nsis-template ${CMAKE_CURRENT_SOURCE_DIR}/cmake/NSIS.template64.in) + set(nsis-template ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/NSIS.template64.in) else() - set(nsis-template ${CMAKE_CURRENT_SOURCE_DIR}/cmake/NSIS.template32.in) + set(nsis-template ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/NSIS.template32.in) endif() add_custom_command( diff --git a/cmake/Modules/FindAsciiDoc.cmake b/builds/cmake/Modules/FindAsciiDoc.cmake similarity index 100% rename from cmake/Modules/FindAsciiDoc.cmake rename to builds/cmake/Modules/FindAsciiDoc.cmake diff --git a/cmake/Modules/TestZMQVersion.cmake b/builds/cmake/Modules/TestZMQVersion.cmake similarity index 100% rename from cmake/Modules/TestZMQVersion.cmake rename to builds/cmake/Modules/TestZMQVersion.cmake diff --git a/cmake/Modules/ZMQSourceRunChecks.cmake b/builds/cmake/Modules/ZMQSourceRunChecks.cmake similarity index 100% rename from cmake/Modules/ZMQSourceRunChecks.cmake rename to builds/cmake/Modules/ZMQSourceRunChecks.cmake diff --git a/cmake/NSIS.template32.in b/builds/cmake/NSIS.template32.in similarity index 100% rename from cmake/NSIS.template32.in rename to builds/cmake/NSIS.template32.in diff --git a/cmake/NSIS.template64.in b/builds/cmake/NSIS.template64.in similarity index 100% rename from cmake/NSIS.template64.in rename to builds/cmake/NSIS.template64.in