Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit 768da42

Browse files
igchorigchor
authored
Merge pull request #381 from igchor/stable-1.5_pkg_config_fix
[1.5] Do not check pkgconfig on windows
2 parents c7a04c2 + fdb8bd1 commit 768da42

6 files changed

Lines changed: 30 additions & 12 deletions

File tree

‎examples/array/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2018, Intel Corporation
2+
# Copyright 2018-2019, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
3737

3838
include(FindThreads)
3939

40-
find_package(PkgConfig QUIET)
40+
if(NOT WIN32)
41+
find_package(PkgConfig QUIET)
42+
endif()
43+
4144
if(PKG_CONFIG_FOUND)
4245
pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
4346
else()

‎examples/map_cli/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2018, Intel Corporation
2+
# Copyright 2018-2019, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
3737

3838
include(FindThreads)
3939

40-
find_package(PkgConfig QUIET)
40+
if(NOT WIN32)
41+
find_package(PkgConfig QUIET)
42+
endif()
43+
4144
if(PKG_CONFIG_FOUND)
4245
pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
4346
else()

‎examples/panaconda/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2018, Intel Corporation
2+
# Copyright 2018-2019, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
3737

3838
include(FindThreads)
3939

40-
find_package(PkgConfig QUIET)
40+
if(NOT WIN32)
41+
find_package(PkgConfig QUIET)
42+
endif()
43+
4144
if(PKG_CONFIG_FOUND)
4245
pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
4346

‎examples/pman/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2018, Intel Corporation
2+
# Copyright 2018-2019, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
3737

3838
include(FindThreads)
3939

40-
find_package(PkgConfig QUIET)
40+
if(NOT WIN32)
41+
find_package(PkgConfig QUIET)
42+
endif()
43+
4144
if(PKG_CONFIG_FOUND)
4245
pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
4346

‎examples/pmpong/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2018, Intel Corporation
2+
# Copyright 2018-2019, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
3737

3838
include(FindThreads)
3939

40-
find_package(PkgConfig QUIET)
40+
if(NOT WIN32)
41+
find_package(PkgConfig QUIET)
42+
endif()
43+
4144
if(PKG_CONFIG_FOUND)
4245
pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
4346

‎examples/queue/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2018, Intel Corporation
2+
# Copyright 2018-2019, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -37,7 +37,10 @@ set(CMAKE_CXX_STANDARD 11)
3737

3838
include(FindThreads)
3939

40-
find_package(PkgConfig QUIET)
40+
if(NOT WIN32)
41+
find_package(PkgConfig QUIET)
42+
endif()
43+
4144
if(PKG_CONFIG_FOUND)
4245
pkg_check_modules(LIBPMEMOBJ++ REQUIRED libpmemobj++)
4346
else()

0 commit comments

Comments
 (0)