diff --git a/CMakeLists.txt b/CMakeLists.txt index 92aab59..1fbadfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15.1) -project(IPCL VERSION 1.1.3 LANGUAGES C CXX) +project(IPCL VERSION 1.1.4 LANGUAGES C CXX) include(CMakePackageConfigHelpers) include(CheckCCompilerFlag) diff --git a/cmake/gbenchmark.cmake b/cmake/gbenchmark.cmake index efd03fb..538c04c 100644 --- a/cmake/gbenchmark.cmake +++ b/cmake/gbenchmark.cmake @@ -33,14 +33,7 @@ add_library(libgbenchmark INTERFACE) add_dependencies(libgbenchmark ext_gbenchmark) ExternalProject_Get_Property(ext_gbenchmark SOURCE_DIR BINARY_DIR) -file(STRINGS /etc/os-release LINUX_ID REGEX "^ID=") -string(REGEX REPLACE "ID=\(.*)" "\\1" LINUX_ID "${LINUX_ID}") -if(${LINUX_ID} STREQUAL "ubuntu") - target_link_libraries(libgbenchmark INTERFACE ${GBENCHMARK_PREFIX}/lib/libbenchmark.a) -else() - # non debian systems install gbenchmark lib under lib64 - target_link_libraries(libgbenchmark INTERFACE ${GBENCHMARK_PREFIX}/lib64/libbenchmark.a) -endif() +target_link_libraries(libgbenchmark INTERFACE ${GBENCHMARK_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libbenchmark.a) target_include_directories(libgbenchmark SYSTEM INTERFACE ${GBENCHMARK_PREFIX}/include) diff --git a/cmake/ipcl/IPCLConfig.cmake.in b/cmake/ipcl/IPCLConfig.cmake.in index be0c1d8..fecf06e 100644 --- a/cmake/ipcl/IPCLConfig.cmake.in +++ b/cmake/ipcl/IPCLConfig.cmake.in @@ -4,7 +4,7 @@ include(CMakeFindDependencyMacro) -include(${CMAKE_CURRENT_LIST_DIR}/ipclTargets.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/IPCLTargets.cmake) if(TARGET IPCL::ipcl) set(IPCL_FOUND TRUE)