From e273d94db80e20f5ce557709e55d7e93011223b2 Mon Sep 17 00:00:00 2001 From: xantares Date: Wed, 23 Oct 2013 19:06:29 +0200 Subject: [PATCH 1/3] include cmake files in tarball --- Makefile.am | 1 + src/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 4c20aa25..7818c05a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,7 @@ endif DIST_SUBDIRS = foreign/openpgm src doc perf tests tools builds/msvc EXTRA_DIST = \ + CMakeLists.txt \ autogen.sh \ version.sh \ MAINTAINERS \ diff --git a/src/Makefile.am b/src/Makefile.am index 0e66c395..73b89814 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -187,4 +187,5 @@ endif dist-hook: -rm $(distdir)/platform.hpp - +EXTRA_DIST = \ + libzmq.pc.cmake.in From e5baf1e05e696619cb4400db9c9324996ab1400c Mon Sep 17 00:00:00 2001 From: xantares Date: Wed, 23 Oct 2013 20:19:52 +0200 Subject: [PATCH 2/3] fix use of CMAKE_SYSTEM_PROCESSOR --- CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b86cc634..6bb82497 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,14 +368,18 @@ if(MINGW) " --target=${rc_target} -i -o ") endmacro() - if( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386" - OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i486" - OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i586" - OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686" + if (NOT CMAKE_SYSTEM_PROCESSOR ) + set (CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR} ) + endif () + + if( CMAKE_SYSTEM_PROCESSOR MATCHES "i386" + OR CMAKE_SYSTEM_PROCESSOR MATCHES "i486" + OR CMAKE_SYSTEM_PROCESSOR MATCHES "i586" + OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686" # This also happens on x86_64 systems...what a worthless variable - OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86" - OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" - OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64") + OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86" + OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" + OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64") if(CMAKE_SIZEOF_VOID_P EQUAL 8) set_rc_arch("pe-x86-64") From 0beb39a4489afee218a4b7a375b0717409369047 Mon Sep 17 00:00:00 2001 From: xantares Date: Wed, 23 Oct 2013 20:21:35 +0200 Subject: [PATCH 3/3] Revert "fix use of CMAKE_SYSTEM_PROCESSOR" This reverts commit e5baf1e05e696619cb4400db9c9324996ab1400c. --- CMakeLists.txt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bb82497..b86cc634 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,18 +368,14 @@ if(MINGW) " --target=${rc_target} -i -o ") endmacro() - if (NOT CMAKE_SYSTEM_PROCESSOR ) - set (CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR} ) - endif () - - if( CMAKE_SYSTEM_PROCESSOR MATCHES "i386" - OR CMAKE_SYSTEM_PROCESSOR MATCHES "i486" - OR CMAKE_SYSTEM_PROCESSOR MATCHES "i586" - OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686" + if( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386" + OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i486" + OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i586" + OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686" # This also happens on x86_64 systems...what a worthless variable - OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86" - OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" - OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64") + OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86" + OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" + OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64") if(CMAKE_SIZEOF_VOID_P EQUAL 8) set_rc_arch("pe-x86-64")