Merge pull request #426 from igchor/stable-1.6

Merge back changes from stable-1.5 to stable-1.6

Author: Szymon Romik

CMakeLists.txt

@@ -259,7 +259,6 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/libpmemobj++.pc.in
 		${CMAKE_CURRENT_BINARY_DIR}/libpmemobj++.pc @ONLY)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpmemobj++.pc
-	CONFIGURATIONS Release Debug
 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 configure_file(

appveyor.yml

@@ -1,5 +1,5 @@
 version: 1.4.{build}
-os: Visual Studio 2015
+os: Visual Studio 2017
 platform: x64
 
 environment:
@@ -24,18 +24,21 @@ before_build:
 - cmake . -Bbuild -G "%GENERATOR%"
         -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
         -DCMAKE_INSTALL_PREFIX=c:/install/libpmemobj-cpp
+        -DTESTS_USE_FORCED_PMEM=ON
 
 build_script:
 - msbuild build/ALL_BUILD.vcxproj /property:Configuration=%CONFIGURATION%
+          /verbosity:minimal
 
 test_script:
 - cd build
 - ctest -C %CONFIGURATION% --output-on-failure --timeout 540
-- msbuild INSTALL.vcxproj
+- msbuild INSTALL.vcxproj /verbosity:minimal
 - cd ..
 # build standalone example
 - cd examples/map_cli
 - cmake . -G "%GENERATOR%"
         -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
         -DCMAKE_PREFIX_PATH=c:/install/libpmemobj-cpp
-- msbuild ALL_BUILD.vcxproj
+        -DTESTS_USE_FORCED_PMEM=ON
+- msbuild ALL_BUILD.vcxproj /verbosity:minimal

examples/array/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
 
 include(FindThreads)
 
-find_package(PkgConfig QUIET)
+if(NOT WIN32)
+	find_package(PkgConfig QUIET)
+endif()
+
 if(PKG_CONFIG_FOUND)
 	pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
 else()

examples/map_cli/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
 
 include(FindThreads)
 
-find_package(PkgConfig QUIET)
+if(NOT WIN32)
+	find_package(PkgConfig QUIET)
+endif()
+
 if(PKG_CONFIG_FOUND)
 	pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
 else()

examples/panaconda/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
 
 include(FindThreads)
 
-find_package(PkgConfig QUIET)
+if(NOT WIN32)
+	find_package(PkgConfig QUIET)
+endif()
+
 if(PKG_CONFIG_FOUND)
 	pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
 

examples/pman/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
 
 include(FindThreads)
 
-find_package(PkgConfig QUIET)
+if(NOT WIN32)
+	find_package(PkgConfig QUIET)
+endif()
+
 if(PKG_CONFIG_FOUND)
 	pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
 

examples/pmpong/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
 
 include(FindThreads)
 
-find_package(PkgConfig QUIET)
+if(NOT WIN32)
+	find_package(PkgConfig QUIET)
+endif()
+
 if(PKG_CONFIG_FOUND)
 	pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
 

examples/queue/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
 
 include(FindThreads)
 
-find_package(PkgConfig QUIET)
+if(NOT WIN32)
+	find_package(PkgConfig QUIET)
+endif()
+
 if(PKG_CONFIG_FOUND)
 	pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
 else()

tests/CMakeLists.txt

@@ -38,7 +38,7 @@ add_check_whitespace(tests-common ${CMAKE_CURRENT_SOURCE_DIR}/common/*.*pp ${CMA
 add_check_whitespace(tests-cmake ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
 
 if(MSVC_VERSION)
-	add_flag(-W4)
+	add_flag(-W3)
 	add_flag(-bigobj) # fix C1128 raised for some test binaries
 else()
 	add_flag(-Wall)