Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
99c52331
Commit
99c52331
authored
Dec 20, 2017
by
Emmanuel Promayon
Browse files
Merge branch 'bug/c++11CMakeGoodForm' into 'develop'
UPDATED C++11 compliance CMake syntax See merge request
!5
parents
0d051fc4
b174f589
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
99c52331
...
...
@@ -34,7 +34,8 @@ camitk_opensource_packaging()
include
(
camitk/test/CamiTKTestCoverage
)
# From now on, CamiTK is C++11 compliant (this flag is needed for early support of C++11 in g++)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11"
)
# All target after this declaration wil be compile with c++11 policy
set
(
CMAKE_CXX_STANDARD 11
)
# Specific to SDK: first compile the SDK (it looks like a CEP but is sooooo special...)
add_subdirectory
(
sdk
)
...
...
sdk/libraries/cepgenerator/resources/cep.CMakeLists.txt.in
View file @
99c52331
...
...
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.0)
# Find CamiTK SDK
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
SET
(CMAKE_CXX_
FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++
11
"
)
set
(CMAKE_CXX_
STANDARD
11)
find_package(CamiTK REQUIRED)
include(${CAMITK_USE_FILE})
...
...
Write
Preview
Supports
Markdown
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