Merge branch 'master' into feature-MSVC-Clang

pjohnmeyer · web-flow · commit ee996164f24a · 2017-06-30T23:31:18.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,8 @@ option(UTPP_AMPLIFY_WARNINGS
     "Set this to OFF if you wish to use CMake default warning levels; should generally only use to work around support issues for your specific compiler"
     ON)
 
+set(LIB_SUFFIX "" CACHE STRING "Identifier to add to end of lib directory name e.g. 64 for lib64")
+
 if(${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")
 	# CHECK_CXX_COMPILER_FLAG could be used
 	# but MSVC version is preferred for feature requirements
@@ -98,11 +100,24 @@ else()
 	set (UTPP_INSTALL_DESTINATION "include/UnitTestPP")
 endif()
 
-set(config_install_dir_ lib/cmake/${PROJECT_NAME})
+set(config_install_dir_ lib${LIB_SUFFIX}/cmake/${PROJECT_NAME})
 set(targets_export_name_ "${PROJECT_NAME}Targets")
 
-install(TARGETS UnitTest++ EXPORT "${targets_export_name_}" DESTINATION lib)
+install(TARGETS UnitTest++ EXPORT "${targets_export_name_}" DESTINATION lib${LIB_SUFFIX})
 install(FILES ${headers_} DESTINATION ${UTPP_INSTALL_DESTINATION})
 install(FILES ${platformHeaders_} DESTINATION ${UTPP_INSTALL_DESTINATION}/${platformDir_})
 install(FILES cmake/UnitTest++Config.cmake DESTINATION "${config_install_dir_}")
 install(EXPORT "${targets_export_name_}" DESTINATION "${config_install_dir_}")
+
+set(prefix      ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
+set(libdir      ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+set(includedir  ${CMAKE_INSTALL_PREFIX}/include/UnitTest++)
+configure_file("UnitTest++.pc.in" "UnitTest++.pc" @ONLY)
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+    set(pkgconfdir  ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
+else()
+    set(pkgconfdir  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+endif()
+install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/UnitTest++.pc"
+        DESTINATION "${pkgconfdir}")
diff --git a/ChangeLog b/ChangeLog
diff --git a/INSTALL b/INSTALL
@@ -1,3 +1,9 @@
+
+Preamble: If you are installing UnitTest++ from source, or from a
+release prior to 1.6.1, you will need to have autotools installed and
+run `autoreconf -i; autoconf` prior to following the standard
+instructions below.
+
 Installation Instructions
 *************************
 
diff --git a/README.md b/README.md
@@ -30,17 +30,17 @@ Via svn:
 
     svn checkout https://github.com/unittest-cpp/unittest-cpp/trunk unittest-cpp
 
-### Latest release (v1.6.1) ###
+### Latest release (v2.0.0) ###
 
 Via git:
 
     git clone https://github.com/unittest-cpp/unittest-cpp
     cd unittest-cpp
-    git checkout v1.6.1
+    git checkout v2.0.0
 
 Via svn:
 
-    svn checkout https://github.com/unittest-cpp/unittest-cpp/tags/v1.6.1 unittest-cpp
+    svn checkout https://github.com/unittest-cpp/unittest-cpp/tags/v2.0.0 unittest-cpp
 
 License
 ---------
@@ -77,6 +77,12 @@ Contributors
 Historic release notes
 ----------------------
 
+### Version 2.0.0 (2017-01-13) ###
+- Change Check method supporting CHECK macro to accept argument by reference
+- Introduce long macro forms (e.g. UNITTEST_CHECK); make short forms optional
+- Improved Visual Studio 2015 support
+- [Full List](https://github.com/unittest-cpp/unittest-cpp/issues?q=milestone%3A2.0.0+)
+
 ### Version 1.6.0 (2016-02-29) ###
 - Add REQUIRE macro to end tests early when selected checks fail
 - [Full List](https://github.com/unittest-cpp/unittest-cpp/issues?q=milestone%3A1.6.0+)
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.6.1.{build}
+version: 2.0.0.{build}
 
 os:
   - Windows Server 2012 R2
diff --git a/configure.ac b/configure.ac
@@ -23,7 +23,7 @@ AM_CONDITIONAL([WINDOWS],
 
 LT_INIT()
 
-AC_SUBST([LIBUNITTEST_SO_VERSION], [1:6:0])
+AC_SUBST([LIBUNITTEST_SO_VERSION], [2:0:0])
 
 # Checks for programs.
 AC_PROG_CXX

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: 1.6.1.{build}`
	`1`	`+version: 2.0.0.{build}`
`2`	`2`
`3`	`3`	`os:`
`4`	`4`	`- Windows Server 2012 R2`