Skip to content

Commit

Permalink
Merge pull request pmem#23 from igchor/fix_find_libpmemobj
Browse files Browse the repository at this point in the history
common: fix finding libpmemobj
  • Loading branch information
marcinslusarz authored Jul 9, 2018
2 parents 9b1474d + f5b7e3d commit 625f1ab
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,6 @@ add_check_whitespace(include-detail ${CMAKE_CURRENT_SOURCE_DIR}/include/libpmemo
add_check_whitespace(cmake-main ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
add_check_whitespace(cmake-helpers ${CMAKE_CURRENT_SOURCE_DIR}/cmake/*.cmake)

if(PKG_CONFIG_FOUND)
pkg_check_modules(PMEMOBJ REQUIRED libpmemobj>=1.4)
else()
find_package(PMEMOBJ REQUIRED 1.4)
endif()

# Check for existence of pmemvlt (introduced after 1.4 release)
set(SAVED_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
set(CMAKE_REQUIRED_INCLUDES ${PMEMOBJ_INCLUDE_DIRS})
Expand Down

0 comments on commit 625f1ab

Please sign in to comment.