Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
yaml-cpp
Commits
57805dfd
Commit
57805dfd
authored
Jan 26, 2016
by
Rodrigo Hernandez
Committed by
Jesse Beder
Jan 31, 2016
Browse files
Removed quoted variables to avoid CMP0054 policy warnings on CMake 3.3.0.
parent
005a6a19
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CMakeLists.txt
CMakeLists.txt
+2
-2
test/CMakeLists.txt
test/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
57805dfd
...
@@ -148,8 +148,8 @@ if(WIN32)
...
@@ -148,8 +148,8 @@ if(WIN32)
endif
()
endif
()
# GCC or Clang specialities
# GCC or Clang specialities
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"GNU"
OR
if
(
CMAKE_CXX_COMPILER_ID MATCHES
"GNU"
OR
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"Clang"
)
CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
### General stuff
### General stuff
if
(
WIN32
)
if
(
WIN32
)
set
(
CMAKE_SHARED_LIBRARY_PREFIX
""
)
# DLLs do not have a "lib" prefix
set
(
CMAKE_SHARED_LIBRARY_PREFIX
""
)
# DLLs do not have a "lib" prefix
...
...
test/CMakeLists.txt
View file @
57805dfd
...
@@ -8,8 +8,8 @@ if(WIN32 AND BUILD_SHARED_LIBS)
...
@@ -8,8 +8,8 @@ if(WIN32 AND BUILD_SHARED_LIBS)
add_definitions
(
"-DGTEST_LINKED_AS_SHARED_LIBRARY"
)
add_definitions
(
"-DGTEST_LINKED_AS_SHARED_LIBRARY"
)
endif
()
endif
()
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"GNU"
OR
if
(
CMAKE_CXX_COMPILER_ID MATCHES
"GNU"
OR
"
${
CMAKE_CXX_COMPILER_ID
}
"
MATCHES
"Clang"
)
CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
set
(
yaml_test_flags
"-Wno-c99-extensions -Wno-variadic-macros -Wno-sign-compare -std=c++11"
)
set
(
yaml_test_flags
"-Wno-c99-extensions -Wno-variadic-macros -Wno-sign-compare -std=c++11"
)
endif
()
endif
()
...
...
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