Revision: 1368
http://vcs.pcre.org/viewvc?view=rev&revision=1368
Author: ph10
Date: 2013-10-08 11:01:58 +0100 (Tue, 08 Oct 2013)
Log Message:
-----------
Two CMake patches (remove bash-ism, add missing defines).
Modified Paths:
--------------
code/trunk/CMakeLists.txt
code/trunk/ChangeLog
code/trunk/config-cmake.h.in
Modified: code/trunk/CMakeLists.txt
===================================================================
--- code/trunk/CMakeLists.txt 2013-10-07 07:41:44 UTC (rev 1367)
+++ code/trunk/CMakeLists.txt 2013-10-08 10:01:58 UTC (rev 1368)
@@ -63,6 +63,7 @@
# 2012-12-08 PH added patch from Daniel Richard G to quash some MSVC warnings
# 2013-07-01 PH realized that the "support" for GCOV was a total nonsense and
# so it has been removed.
+# 2013-10-08 PH got rid of the "source" command, which is a bash-ism (use ".")
PROJECT(PCRE C CXX)
@@ -765,7 +766,7 @@
# This is a generated file.
srcdir=${PROJECT_SOURCE_DIR}
pcretest=${PCRETEST_EXE}
-source ${PROJECT_SOURCE_DIR}/RunTest
+. ${PROJECT_SOURCE_DIR}/RunTest
if test \"$?\" != \"0\"; then exit 1; fi
# End
")
@@ -781,7 +782,7 @@
srcdir=${PROJECT_SOURCE_DIR}
pcregrep=${PCREGREP_EXE}
pcretest=${PCRETEST_EXE}
-source ${PROJECT_SOURCE_DIR}/RunGrepTest
+. ${PROJECT_SOURCE_DIR}/RunGrepTest
if test \"$?\" != \"0\"; then exit 1; fi
# End
")
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2013-10-07 07:41:44 UTC (rev 1367)
+++ code/trunk/ChangeLog 2013-10-08 10:01:58 UTC (rev 1368)
@@ -97,8 +97,16 @@
above). Processing unduplicated named groups should now be as fast at
numerical groups, and processing duplicated groups should be faster than
before.
+
+20. Two patches to the CMake build system, by Alexander Barkov:
+ (1) Replace the "source" command by "." in CMakeLists.txt because
+ "source" is a bash-ism.
+
+ (2) Add missing HAVE_STDINT_H and HAVE_INTTYPES_H to config-cmake.h.in;
+ without these the CMake build does not work on Solaris.
+
Version 8.33 28-May-2013
------------------------
Modified: code/trunk/config-cmake.h.in
===================================================================
--- code/trunk/config-cmake.h.in 2013-10-07 07:41:44 UTC (rev 1367)
+++ code/trunk/config-cmake.h.in 2013-10-08 10:01:58 UTC (rev 1368)
@@ -5,6 +5,8 @@
#cmakedefine HAVE_SYS_TYPES_H 1
#cmakedefine HAVE_UNISTD_H 1
#cmakedefine HAVE_WINDOWS_H 1
+#cmakedefine HAVE_STDINT_H 1
+#cmakedefine HAVE_INTTYPES_H 1
#cmakedefine HAVE_TYPE_TRAITS_H 1
#cmakedefine HAVE_BITS_TYPE_TRAITS_H 1
