Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
K
KWSys
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martin Willers
KWSys
Commits
b747462d
Commit
b747462d
authored
5 years ago
by
Rolf Eike Beer
Browse files
Options
Downloads
Patches
Plain Diff
CMake: drop needless x${VAR} tricks
parent
a24a6acb
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+4
-4
4 additions, 4 deletions
CMakeLists.txt
with
4 additions
and
4 deletions
CMakeLists.txt
+
4
−
4
View file @
b747462d
...
...
@@ -121,8 +121,8 @@ if(KWSYS_CXX_STANDARD)
set
(
CMAKE_CXX_STANDARD
"
${
KWSYS_CXX_STANDARD
}
"
)
elseif
(
NOT DEFINED CMAKE_CXX_STANDARD AND NOT DEFINED KWSYS_CXX_STANDARD
)
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
AND
"x
${
CMAKE_CXX_SIMULATE_ID
}
"
STREQUAL
"
x
MSVC"
AND
"x
${
CMAKE_CXX_COMPILER_FRONTEND_VARIANT
}
"
STREQUAL
"
x
GNU"
AND CMAKE_CXX_SIMULATE_ID STREQUAL
"MSVC"
AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL
"GNU"
)
set
(
CMAKE_CXX_STANDARD 14
)
else
()
...
...
@@ -1013,7 +1013,7 @@ ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}")
# Disable deprecation warnings for standard C functions.
IF
(
MSVC
OR
(
WIN32
AND
(
CMAKE_C_COMPILER_ID STREQUAL
"Intel"
OR
(
CMAKE_C_COMPILER_ID STREQUAL
"Clang"
AND
"x
${
CMAKE_CXX_SIMULATE_ID
}
"
STREQUAL
"
x
MSVC"
))))
(
CMAKE_C_COMPILER_ID STREQUAL
"Clang"
AND CMAKE_CXX_SIMULATE_ID STREQUAL
"MSVC"
))))
ADD_DEFINITIONS
(
-D_CRT_NONSTDC_NO_DEPRECATE
-D_CRT_SECURE_NO_DEPRECATE
...
...
@@ -1104,7 +1104,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
SET
(
KWSYS_CXX_TESTS
${
KWSYS_CXX_TESTS
}
testConsoleBuf.cxx
)
IF
(
"x
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"
x
MSVC"
AND
IF
(
CMAKE_CXX_COMPILER_ID STREQUAL
"MSVC"
AND
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER
"19.0.23506"
)
set_property
(
SOURCE testConsoleBuf.cxx testConsoleBufChild.cxx PROPERTY COMPILE_FLAGS /utf-8
)
ENDIF
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment