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
bb15a4e3
Commit
bb15a4e3
authored
Nov 13, 2018
by
Dominic Hamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure all informational cmake messages have STATUS type
parent
a9b31c51
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
CMakeLists.txt
CMakeLists.txt
+2
-2
CXXFeatureCheck.cmake
cmake/CXXFeatureCheck.cmake
+5
-5
GetGitVersion.cmake
cmake/GetGitVersion.cmake
+1
-1
No files found.
CMakeLists.txt
View file @
bb15a4e3
...
...
@@ -79,7 +79,7 @@ get_git_version(GIT_VERSION)
# Tell the user what versions we are using
string
(
REGEX MATCH
"[0-9]+
\\
.[0-9]+
\\
.[0-9]+"
VERSION
${
GIT_VERSION
}
)
message
(
"--
Version:
${
VERSION
}
"
)
message
(
STATUS
"
Version:
${
VERSION
}
"
)
# The version of the libraries
set
(
GENERIC_LIB_VERSION
${
VERSION
}
)
...
...
@@ -224,7 +224,7 @@ if (BENCHMARK_USE_LIBCXX)
elseif
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"GNU"
OR
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"Intel"
)
add_cxx_compiler_flag
(
-nostdinc++
)
message
(
"libc++ header path must be manually specified using CMAKE_CXX_FLAGS"
)
message
(
WARNING
"libc++ header path must be manually specified using CMAKE_CXX_FLAGS"
)
# Adding -nodefaultlibs directly to CMAKE_<TYPE>_LINKER_FLAGS will break
# configuration checks such as 'find_package(Threads)'
list
(
APPEND BENCHMARK_CXX_LINKER_FLAGS -nodefaultlibs
)
...
...
cmake/CXXFeatureCheck.cmake
View file @
bb15a4e3
...
...
@@ -28,7 +28,7 @@ function(cxx_feature_check FILE)
endif
()
if
(
NOT DEFINED COMPILE_
${
FEATURE
}
)
message
(
"--
Performing Test
${
FEATURE
}
"
)
message
(
STATUS
"
Performing Test
${
FEATURE
}
"
)
if
(
CMAKE_CROSSCOMPILING
)
try_compile
(
COMPILE_
${
FEATURE
}
${
CMAKE_BINARY_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/
${
FILE
}
.cpp
...
...
@@ -42,7 +42,7 @@ function(cxx_feature_check FILE)
set
(
RUN_
${
FEATURE
}
1
)
endif
()
else
()
message
(
"--
Performing Test
${
FEATURE
}
"
)
message
(
STATUS
"
Performing Test
${
FEATURE
}
"
)
try_run
(
RUN_
${
FEATURE
}
COMPILE_
${
FEATURE
}
${
CMAKE_BINARY_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/
${
FILE
}
.cpp
CMAKE_FLAGS
${
BENCHMARK_CXX_LINKER_FLAGS
}
...
...
@@ -51,14 +51,14 @@ function(cxx_feature_check FILE)
endif
()
if
(
RUN_
${
FEATURE
}
EQUAL 0
)
message
(
"--
Performing Test
${
FEATURE
}
-- success"
)
message
(
STATUS
"
Performing Test
${
FEATURE
}
-- success"
)
set
(
HAVE_
${
VAR
}
1 PARENT_SCOPE
)
add_definitions
(
-DHAVE_
${
VAR
}
)
else
()
if
(
NOT COMPILE_
${
FEATURE
}
)
message
(
"--
Performing Test
${
FEATURE
}
-- failed to compile"
)
message
(
STATUS
"
Performing Test
${
FEATURE
}
-- failed to compile"
)
else
()
message
(
"--
Performing Test
${
FEATURE
}
-- compiled but failed to run"
)
message
(
STATUS
"
Performing Test
${
FEATURE
}
-- compiled but failed to run"
)
endif
()
endif
()
endfunction
()
cmake/GetGitVersion.cmake
View file @
bb15a4e3
...
...
@@ -49,6 +49,6 @@ function(get_git_version var)
set
(
GIT_VERSION
"v0.0.0"
)
endif
()
message
(
"--
git Version:
${
GIT_VERSION
}
"
)
message
(
STATUS
"
git Version:
${
GIT_VERSION
}
"
)
set
(
${
var
}
${
GIT_VERSION
}
PARENT_SCOPE
)
endfunction
()
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