Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
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
pistache
Commits
5ee03b76
Unverified
Commit
5ee03b76
authored
Oct 18, 2018
by
Dennis Jenkins
Committed by
GitHub
Oct 18, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #322 from Fylax/master
Relaxed CMAKE version requirement
parents
c9ddf189
4d8f1cc2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
9 deletions
+21
-9
CMakeLists.txt
CMakeLists.txt
+21
-9
No files found.
CMakeLists.txt
View file @
5ee03b76
cmake_minimum_required
(
VERSION 3.
8.2
)
cmake_minimum_required
(
VERSION 3.
1.3
)
project
(
pistache
)
project
(
pistache
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -pedantic -Wextra -Wno-missing-field-initializers"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -pedantic -Wextra -Wno-missing-field-initializers"
)
...
@@ -7,16 +7,28 @@ option(PISTACHE_BUILD_TESTS "build tests alongside the project" OFF)
...
@@ -7,16 +7,28 @@ option(PISTACHE_BUILD_TESTS "build tests alongside the project" OFF)
option
(
PISTACHE_BUILD_EXAMPLES
"build examples alongside the project"
OFF
)
option
(
PISTACHE_BUILD_EXAMPLES
"build examples alongside the project"
OFF
)
option
(
PISTACHE_INSTALL
"add pistache as install target (recommended)"
ON
)
option
(
PISTACHE_INSTALL
"add pistache as install target (recommended)"
ON
)
# Clang exports C++17 in std::experimental namespace (tested on Clang 5 and 6).
# CMAKE version less than 3.8 does not understand the CMAKE_CXX_FLAGS
# This gives an error on date.h external library.
# set to 17, so a manual check if performed on older version
# Following workaround forces Clang to compile at best with C++14
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.8.0"
)
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
)
include
(
CheckCXXCompilerFlag
)
set
(
CMAKE_CXX_STANDARD 14
)
CHECK_CXX_COMPILER_FLAG
(
"-std=c++17"
COMPILER_SUPPORTS_CXX17
)
if
(
COMPILER_SUPPORTS_CXX17
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++17"
)
else
()
set
(
CMAKE_CXX_STANDARD 14
)
endif
()
else
()
else
()
set
(
CMAKE_CXX_STANDARD 17
)
# Clang exports C++17 in std::experimental namespace (tested on Clang 5 and 6).
# This gives an error on date.h external library.
# Following workaround forces Clang to compile at best with C++14
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
)
set
(
CMAKE_CXX_STANDARD 14
)
else
()
set
(
CMAKE_CXX_STANDARD 17
)
endif
()
set
(
CMAKE_CXX_STANDARD_REQUIRED OFF
)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
endif
()
endif
()
set
(
CMAKE_CXX_STANDARD_REQUIRED OFF
)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/include
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/include
)
add_subdirectory
(
src
)
add_subdirectory
(
src
)
...
...
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