Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
spdlog
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
spdlog
Commits
0613dbc4
Commit
0613dbc4
authored
Mar 04, 2021
by
gabime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert pr #1860
parent
0ed0d693
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
CMakeLists.txt
CMakeLists.txt
+1
-7
cmake/utils.cmake
cmake/utils.cmake
+1
-0
No files found.
CMakeLists.txt
View file @
0613dbc4
...
@@ -10,8 +10,6 @@ include(cmake/ide.cmake)
...
@@ -10,8 +10,6 @@ include(cmake/ide.cmake)
spdlog_extract_version
()
spdlog_extract_version
()
cmake_policy
(
SET CMP0091 NEW
)
# for choosing msvc static/dynamic runtime library
project
(
spdlog VERSION
${
SPDLOG_VERSION
}
LANGUAGES CXX
)
project
(
spdlog VERSION
${
SPDLOG_VERSION
}
LANGUAGES CXX
)
message
(
STATUS
"Build spdlog:
${
SPDLOG_VERSION
}
"
)
message
(
STATUS
"Build spdlog:
${
SPDLOG_VERSION
}
"
)
...
@@ -89,7 +87,6 @@ endif()
...
@@ -89,7 +87,6 @@ endif()
if
(
WIN32
)
if
(
WIN32
)
option
(
SPDLOG_WCHAR_SUPPORT
"Support wchar api"
OFF
)
option
(
SPDLOG_WCHAR_SUPPORT
"Support wchar api"
OFF
)
option
(
SPDLOG_WCHAR_FILENAMES
"Support wchar filenames"
OFF
)
option
(
SPDLOG_WCHAR_FILENAMES
"Support wchar filenames"
OFF
)
option
(
SPDLOG_STATIC_VCRT
"Force /MT for static VC runtimes"
OFF
)
endif
()
endif
()
if
(
${
CMAKE_SYSTEM_NAME
}
STREQUAL
"Linux"
)
if
(
${
CMAKE_SYSTEM_NAME
}
STREQUAL
"Linux"
)
option
(
SPDLOG_CLOCK_COARSE
option
(
SPDLOG_CLOCK_COARSE
...
@@ -127,10 +124,6 @@ if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
...
@@ -127,10 +124,6 @@ if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
list
(
APPEND SPDLOG_SRCS src/fmt.cpp
)
list
(
APPEND SPDLOG_SRCS src/fmt.cpp
)
endif
()
endif
()
if
(
MSVC AND SPDLOG_STATIC_VCRT
)
set
(
CMAKE_MSVC_RUNTIME_LIBRARY
"MultiThreaded$<$<CONFIG:Debug>:Debug>"
)
endif
()
if
(
SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS
)
if
(
SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS
)
if
(
WIN32
)
if
(
WIN32
)
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/version.rc.in
${
CMAKE_CURRENT_BINARY_DIR
}
/version.rc @ONLY
)
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/version.rc.in
${
CMAKE_CURRENT_BINARY_DIR
}
/version.rc @ONLY
)
...
@@ -299,3 +292,4 @@ if(SPDLOG_INSTALL)
...
@@ -299,3 +292,4 @@ if(SPDLOG_INSTALL)
# ---------------------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------
include
(
cmake/spdlogCPack.cmake
)
include
(
cmake/spdlogCPack.cmake
)
endif
()
endif
()
cmake/utils.cmake
View file @
0613dbc4
...
@@ -59,3 +59,4 @@ function(spdlog_enable_sanitizer target_name)
...
@@ -59,3 +59,4 @@ function(spdlog_enable_sanitizer target_name)
target_compile_options
(
${
target_name
}
PRIVATE -fno-omit-frame-pointer
)
target_compile_options
(
${
target_name
}
PRIVATE -fno-omit-frame-pointer
)
target_link_libraries
(
${
target_name
}
PRIVATE -fsanitize=address,undefined -fuse-ld=gold
)
target_link_libraries
(
${
target_name
}
PRIVATE -fsanitize=address,undefined -fuse-ld=gold
)
endfunction
()
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