Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
soth
Commits
ba0ba9aa
Commit
ba0ba9aa
authored
Jan 13, 2016
by
Olivier Stasse
Browse files
[cmake] Synchronize + reflects bug-fixing in jrl-cmakemodules
parent
7060969a
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
ba0ba9aa
...
...
@@ -4,15 +4,6 @@
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.6
)
IF
(
UNIX
)
INCLUDE
(
CMakeFindBinUtils
)
ENDIF
(
UNIX
)
EXECUTE_PROCESS
(
COMMAND
${
CMAKE_LINKER
}
-v OUTPUT_VARIABLE LD_VERSION_STR ERROR_VARIABLE LD_VERSION_STR
)
MESSAGE
(
"LD_VERSION_STR:
${
LD_VERSION_STR
}
"
)
STRING
(
REGEX MATCH
"([0-9]+
\\
.[0-9]+(
\\
.[0-9]+)?)"
LD_VERSION
${
LD_VERSION_STR
}
)
MESSAGE
(
"LD_VERSION:
${
LD_VERSION
}
"
)
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/boost.cmake
)
INCLUDE
(
cmake/cpack.cmake
)
...
...
@@ -26,9 +17,6 @@ SET(PROJECT_URL "http://github.com/laas/soth")
SET
(
CXX_DISABLE_WERROR True
)
SET
(
CMAKE_VERBOSE_MAKEFILE true
)
project
(
${
PROJECT_NAME
}
)
# C++ version 4.7 is less permissive than older versions.
# To avoid the created errors, the flag -fpermissive is added.
# TODO: remove this patch
...
...
cmake
@
fa273814
Compare
8e9b4644
...
fa273814
Subproject commit
8e9b46446f92899025173f047b3950fcd21b89f4
Subproject commit
fa2738146fa19d8bbbb1d8c8a97a2b4809ce81af
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment