Skip to content
This repository was archived by the owner on Jun 30, 2025. It is now read-only.

13 errors building installing questions about docs #15

Merged
merged 4 commits into from
Sep 16, 2022
Merged

13 errors building installing questions about docs #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
982c7c7
testing
Sep 13, 2022
182ea49
Fix gbenchmark build error on other platforms
Sep 13, 2022
daa966d
Fixed IPCLTargets typo
Sep 13, 2022
241beac
Update version to 1.1.4
Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 1 addition & 8 deletions cmake/gbenchmark.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion cmake/ipcl/IPCLConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down