From 982c7c7b7a1efd47e33e51be03cde4b03f514a3f Mon Sep 17 00:00:00 2001 From: sejunkim Date: Tue, 13 Sep 2022 08:04:27 -0700 Subject: [PATCH 1/4] testing --- cmake/gbenchmark.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/gbenchmark.cmake b/cmake/gbenchmark.cmake index efd03fb..cc21ba3 100644 --- a/cmake/gbenchmark.cmake +++ b/cmake/gbenchmark.cmake @@ -32,6 +32,7 @@ ExternalProject_Add( add_library(libgbenchmark INTERFACE) add_dependencies(libgbenchmark ext_gbenchmark) +message(STATUS "DEBUG -- libdir: ${CMAKE_INSTALL_LIBDIR}") 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}") From 182ea499240e85f0274cfa1134652f1f5bb5f009 Mon Sep 17 00:00:00 2001 From: sejunkim Date: Tue, 13 Sep 2022 08:12:46 -0700 Subject: [PATCH 2/4] Fix gbenchmark build error on other platforms --- cmake/gbenchmark.cmake | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cmake/gbenchmark.cmake b/cmake/gbenchmark.cmake index cc21ba3..538c04c 100644 --- a/cmake/gbenchmark.cmake +++ b/cmake/gbenchmark.cmake @@ -32,16 +32,8 @@ ExternalProject_Add( add_library(libgbenchmark INTERFACE) add_dependencies(libgbenchmark ext_gbenchmark) -message(STATUS "DEBUG -- libdir: ${CMAKE_INSTALL_LIBDIR}") 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) From daa966d0fafb963c424408589a17ef08563d73d2 Mon Sep 17 00:00:00 2001 From: sejunkim Date: Tue, 13 Sep 2022 10:46:31 -0700 Subject: [PATCH 3/4] Fixed IPCLTargets typo --- cmake/ipcl/IPCLConfig.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 241beac18b881b090f24efde14bf6a44e6282af3 Mon Sep 17 00:00:00 2001 From: sejunkim Date: Thu, 15 Sep 2022 23:05:35 -0700 Subject: [PATCH 4/4] Update version to 1.1.4 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)