Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
benchmark
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
benchmark
Commits
8bb991d0
Commit
8bb991d0
authored
Apr 01, 2015
by
Eric Fiselier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove BENCHMARK_ENABLE_SHARED and prefer BUILD_SHARED_LIBS
parent
9934396e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
CMakeLists.txt
CMakeLists.txt
+0
-1
appveyor.yml
appveyor.yml
+1
-1
CMakeLists.txt
src/CMakeLists.txt
+3
-4
No files found.
CMakeLists.txt
View file @
8bb991d0
cmake_minimum_required
(
VERSION 2.8
)
project
(
benchmark
)
option
(
BENCHMARK_ENABLE_SHARED
"Enable building a shared library."
OFF
)
option
(
BENCHMARK_ENABLE_TESTING
"Enable testing of the benchmark library."
ON
)
# Make sure we can import out CMake functions
list
(
APPEND CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
...
...
appveyor.yml
View file @
8bb991d0
...
...
@@ -42,7 +42,7 @@ before_build:
-
if "%generator%"=="MinGW Makefiles" (set "PATH=%PATH:C:\Program Files (x86)\Git\bin=%")
build_script
:
-
cmake -G "%generator%" "-DCMAKE_BUILD_TYPE=%variant%" "-DB
ENCHMARK_ENABLE_SHARED
=%shared%"
-
cmake -G "%generator%" "-DCMAKE_BUILD_TYPE=%variant%" "-DB
UILD_SHARED_LIBS
=%shared%"
-
cmd /c "%build%"
test_script
:
...
...
src/CMakeLists.txt
View file @
8bb991d0
...
...
@@ -17,13 +17,12 @@ else()
message
(
FATAL_ERROR
"Failed to determine the source files for the regular expression backend"
)
endif
()
add_library
(
benchmark
${
SOURCE_FILES
}
${
RE_FILES
}
)
# Build the benchmark library
if
(
BENCHMARK_ENABLE_SHARED
)
add_library
(
benchmark SHARED
${
SOURCE_FILES
}
${
RE_FILES
}
)
if
(
BUILD_SHARED_LIBS
)
find_package
(
Threads REQUIRED
)
target_link_libraries
(
benchmark
${
CMAKE_THREAD_LIBS_INIT
}
)
else
()
add_library
(
benchmark STATIC
${
SOURCE_FILES
}
${
RE_FILES
}
)
endif
()
set_target_properties
(
benchmark PROPERTIES
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment