From f4cf8bac480cad82c775cd5b5fab2649404fe470 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Mon, 22 Sep 2014 10:43:42 +0200 Subject: [PATCH] Fix Cmake warnings/errors since Cmake versions > 2.8.12 --- buildtools/Cmake/MaintainerMode.cmake | 18 +++++++++--------- buildtools/Cmake/UnitTesting.cmake | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake index fe93a14eef..ebc8ef797a 100644 --- a/buildtools/Cmake/MaintainerMode.cmake +++ b/buildtools/Cmake/MaintainerMode.cmake @@ -213,15 +213,6 @@ if(enable_maintainer_mode AND NOT WIN32) COMMENT "Generating files in maintainer mode..." ) - add_custom_target(maintainer_files - DEPENDS ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h - ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h - ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h - ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c - ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c - ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c - ) - else() if(NOT HAVE_FLEXML) message(STATUS "Error : Install flexml before use maintainer mode.") @@ -237,3 +228,12 @@ if(enable_maintainer_mode AND NOT WIN32) endif() endif() + + add_custom_target(maintainer_files + DEPENDS ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h + ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h + ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h + ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c + ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c + ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c + ) diff --git a/buildtools/Cmake/UnitTesting.cmake b/buildtools/Cmake/UnitTesting.cmake index 56d60b3a66..4cfedb0538 100644 --- a/buildtools/Cmake/UnitTesting.cmake +++ b/buildtools/Cmake/UnitTesting.cmake @@ -69,5 +69,3 @@ if(NOT WIN32) else() target_link_libraries(testall simgrid) endif() - -add_dependencies(testall ${TEST_UNITS}) \ No newline at end of file -- 2.20.1