Merge pull request #2888 from minrk/fix-cmake

Fix inclusion of cmake files in dists

CMakeLists.txt

@@ -4,6 +4,8 @@ cmake_minimum_required (VERSION 2.8.12)
 project (ZeroMQ)
 
 list (INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}")
+set (ZMQ_CMAKE_MODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules)
+list (APPEND CMAKE_MODULE_PATH ${ZMQ_CMAKE_MODULES_DIR})
 
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_CXX11)
@@ -165,9 +167,6 @@ else ()
     message (FATAL_ERROR "Invalid polling method")
 endif ()
 
-set (ZMQ_CMAKE_MODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules)
-list (APPEND CMAKE_MODULE_PATH ${ZMQ_CMAKE_MODULES_DIR})
-
 include (TestZMQVersion)
 if (NOT CMAKE_CROSSCOMPILING)
   include (ZMQSourceRunChecks)
@@ -1002,7 +1001,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 3.0)
   export(EXPORT ${PROJECT_NAME}-targets
          FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
 endif()
-configure_package_config_file(${PROJECT_NAME}Config.cmake.in
+configure_package_config_file(builds/cmake/${PROJECT_NAME}Config.cmake.in
                               "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
                               INSTALL_DESTINATION ${ZEROMQ_CMAKECONFIG_INSTALL_DIR})
 write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake

Makefile.am

@@ -867,9 +867,7 @@ XFAIL_TESTS += test_ipc_wildcard \
 endif
 
 EXTRA_DIST = \
-	FindSodium.cmake \
 	CMakeLists.txt \
-	ZeroMQConfig.cmake.in \
 	autogen.sh	\
 	version.sh	\
 	src/libzmq.pc.cmake.in \

builds/Makefile.am

@@ -16,12 +16,10 @@ EXTRA_DIST = \
 	mingw32/Makefile.mingw32 \
 	mingw32/platform.hpp \
 	cmake/Modules \
-	cmake/Modules/FindAsciiDoc.cmake \
-	cmake/Modules/TestZMQVersion.cmake \
-	cmake/Modules/ZMQSourceRunChecks.cmake \
 	cmake/NSIS.template32.in \
-	cmake/platform.hpp.in \
 	cmake/NSIS.template64.in \
+	cmake/ZeroMQConfig.cmake.in \
+	cmake/platform.hpp.in \
 	valgrind/valgrind.supp \
 	valgrind/vg \
 	nuget/readme.nuget \