Skip to content
Snippets Groups Projects
Commit 4950f72f authored by Markus Blatt's avatar Markus Blatt
Browse files

[Merge][CMake] Merged revisions : 6594

Revision  r6594
.----------------------
Use the correct names for the defines (Some start with HAS!)
Do not use cmakedefine01, as DUNE relies on the fact that there is no
define if a feature is not there.
Use a similar order for the defines in config.h.cmake for better
comparsin with e.g. meld.

.----------------------


[[Imported from SVN: r7144]]
parents 8c801a89 a98e95f7
Branches
Tags
No related merge requests found
......@@ -16,6 +16,9 @@ set(DUNE_COMMON_VERSION_MAJOR "${DUNE_VERSION_MAJOR}")
set(DUNE_COMMON_VERSION_MINOR "${DUNE_VERSION_MINOR}")
set(DUNE_COMMON_VERSION_REVISION "${DUNE_VERSION_REVISION}")
include(DuneStreams)
dune_set_minimal_debug_level()
# include dune-common to include pathtest
include_directories("${CMAKE_SOURCE_DIR}")
link_directories("${CMAKE_SOURCE_DIR}")
......
......@@ -60,7 +60,7 @@ CHECK_CXX_SOURCE_COMPILES("
int __attribute__((unused)) foo;
return 0;
};
" HAVE_ATTRIBUTE_UNUSED
" HAS_ATTRIBUTE_UNUSED
)
# __attribute__((deprecated))
......@@ -92,7 +92,7 @@ CHECK_CXX_SOURCE_COMPILES("
{
return 0;
};
" HAVE_ATTRIBUTE_DEPRECATED
" HAS_ATTRIBUTE_DEPRECATED
)
# __attribute__((deprecated("msg")))
......@@ -124,7 +124,7 @@ CHECK_CXX_SOURCE_COMPILES("
{
return 0;
};
" HAVE_ATTRIBUTE_DEPRECATED_MSG
" HAS_ATTRIBUTE_DEPRECATED_MSG
)
# static assert
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment