mirror of
https://gitee.com/openharmony/third_party_benchmark
synced 2024-11-23 15:30:48 +00:00
Merge pull request #39 from mattyclarkson/fixes
Allow shared libraries with BUILD_SHARED_LIBS
This commit is contained in:
commit
890908c197
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,4 +1,7 @@
|
||||
*.a
|
||||
*.so
|
||||
*.so.?*
|
||||
*.dylib
|
||||
*.cmake
|
||||
*~
|
||||
/test/benchmark_test
|
||||
|
3
AUTHORS
3
AUTHORS
@ -15,8 +15,9 @@ Dominic Hamon <dma@stripysock.com>
|
||||
Eugene Zhuk <eugene.zhuk@gmail.com>
|
||||
Felix Homann <linuxaudio@showlabor.de>
|
||||
Google Inc.
|
||||
Lei Xu <eddyxu@gmail.com>
|
||||
Matt Clarkson <mattyclarkson@gmail.com>
|
||||
Oleksandr Sochka <sasha.sochka@gmail.com>
|
||||
Paul Redmond <paul.redmond@gmail.com>
|
||||
Shuo Chen <chenshuo@chenshuo.com>
|
||||
Yusuke Suzuki <utatane.tea@gmail.com>
|
||||
Lei Xu <eddyxu@gmail.com>
|
||||
|
@ -38,6 +38,10 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86")
|
||||
add_definitions(-DARCH_X86)
|
||||
endif()
|
||||
|
||||
# The version of the libraries
|
||||
set(GENERIC_LIB_VERSION "0.0.0")
|
||||
set(GENERIC_LIB_SOVERSION "0")
|
||||
|
||||
# Set up directories
|
||||
include_directories(${PROJECT_SOURCE_DIR}/include)
|
||||
include_directories(${PROJECT_SOURCE_DIR}/src)
|
||||
|
@ -29,10 +29,11 @@ David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
|
||||
Dominic Hamon <dma@stripysock.com>
|
||||
Eugene Zhuk <eugene.zhuk@gmail.com>
|
||||
Felix Homann <linuxaudio@showlabor.de>
|
||||
Lei Xu <eddyxu@gmail.com>
|
||||
Matt Clarkson <mattyclarkson@gmail.com>
|
||||
Oleksandr Sochka <sasha.sochka@gmail.com>
|
||||
Pascal Leroy <phl@google.com>
|
||||
Paul Redmond <paul.redmond@gmail.com>
|
||||
Pierre Phaneuf <pphaneuf@google.com>
|
||||
Shuo Chen <chenshuo@chenshuo.com>
|
||||
Yusuke Suzuki <utatane.tea@gmail.com>
|
||||
Lei Xu <eddyxu@gmail.com>
|
||||
|
@ -1,8 +1,17 @@
|
||||
set(SOURCE_FILES "benchmark.cc" "colorprint.cc" "commandlineflags.cc" "sleep.cc" "sysinfo.cc" "walltime.cc")
|
||||
set(RE_FILES "re.cc")
|
||||
|
||||
add_library(benchmark_re STATIC ${RE_FILES})
|
||||
add_library(benchmark STATIC ${SOURCE_FILES} ${RE_FILES})
|
||||
add_library(benchmark_re ${RE_FILES})
|
||||
set_target_properties(benchmark_re PROPERTIES
|
||||
VERSION ${GENERIC_LIB_VERSION}
|
||||
SOVERSION ${GENERIC_LIB_SOVERSION}
|
||||
)
|
||||
|
||||
add_library(benchmark ${SOURCE_FILES} ${RE_FILES})
|
||||
set_target_properties(benchmark PROPERTIES
|
||||
VERSION ${GENERIC_LIB_VERSION}
|
||||
SOVERSION ${GENERIC_LIB_SOVERSION}
|
||||
)
|
||||
|
||||
# Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)
|
||||
install(
|
||||
|
Loading…
Reference in New Issue
Block a user