From 049ab52c23d988ba9805fbb1f6f531e9efdc6afc Mon Sep 17 00:00:00 2001 From: Simon Praetorius Date: Fri, 11 Nov 2016 12:27:09 +0100 Subject: [PATCH] zoltan configuration cleaned up --- AMDiS/cmake/CMakeLists.txt | 2 +- AMDiS/cmake/enable_zoltan.cmake | 2 +- AMDiS/cmake/{ZoltanConfig.cmake => parse_zoltan_makefile.cmake} | 0 AMDiS/cmake3/CMakeLists.txt | 2 +- .../cmake3/{ZoltanConfig.cmake => parse_zoltan_makefile.cmake} | 0 AMDiS/cmake3/target_enable_zoltan.cmake | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename AMDiS/cmake/{ZoltanConfig.cmake => parse_zoltan_makefile.cmake} (100%) rename AMDiS/cmake3/{ZoltanConfig.cmake => parse_zoltan_makefile.cmake} (100%) diff --git a/AMDiS/cmake/CMakeLists.txt b/AMDiS/cmake/CMakeLists.txt index 52bca0c2..c1d7942a 100644 --- a/AMDiS/cmake/CMakeLists.txt +++ b/AMDiS/cmake/CMakeLists.txt @@ -243,7 +243,7 @@ endforeach () file(GLOB CMAKE_MACROS "${BASE_DIR}/cmake/enable_*.cmake") install(FILES ${CMAKE_MACROS} DESTINATION share/amdis/) -install(FILES ${BASE_DIR}/cmake3/ZoltanConfig.cmake DESTINATION share/amdis/) +install(FILES ${BASE_DIR}/cmake3/parse_zoltan_makefile.cmake DESTINATION share/amdis/) install(DIRECTORY ${BASE_DIR}/lib/mtl4/ DESTINATION include/amdis/mtl4/ FILES_MATCHING PATTERN "*.hpp" diff --git a/AMDiS/cmake/enable_zoltan.cmake b/AMDiS/cmake/enable_zoltan.cmake index c675609b..9491adc9 100644 --- a/AMDiS/cmake/enable_zoltan.cmake +++ b/AMDiS/cmake/enable_zoltan.cmake @@ -1,4 +1,4 @@ -include(ZoltanConfig) +include(parse_zoltan_makefile) macro(enable_zoltan _FLAGS_ _INC_DIRS_ _LIBS_) if (${ARGC} GREATER 3) set(LINK_EXECUTABLE ON) diff --git a/AMDiS/cmake/ZoltanConfig.cmake b/AMDiS/cmake/parse_zoltan_makefile.cmake similarity index 100% rename from AMDiS/cmake/ZoltanConfig.cmake rename to AMDiS/cmake/parse_zoltan_makefile.cmake diff --git a/AMDiS/cmake3/CMakeLists.txt b/AMDiS/cmake3/CMakeLists.txt index 762a8869..fb308342 100644 --- a/AMDiS/cmake3/CMakeLists.txt +++ b/AMDiS/cmake3/CMakeLists.txt @@ -210,7 +210,7 @@ endforeach () file(GLOB CMAKE_MACROS "${BASE_DIR}/cmake3/target_enable_*.cmake") install(FILES ${CMAKE_MACROS} DESTINATION share/amdis/) -install(FILES ${BASE_DIR}/cmake3/ZoltanConfig.cmake DESTINATION share/amdis/) +install(FILES ${BASE_DIR}/cmake3/parse_zoltan_makefile.cmake DESTINATION share/amdis/) install(DIRECTORY ${BASE_DIR}/lib/mtl4/ DESTINATION include/amdis/mtl4/ FILES_MATCHING PATTERN "*.hpp" diff --git a/AMDiS/cmake3/ZoltanConfig.cmake b/AMDiS/cmake3/parse_zoltan_makefile.cmake similarity index 100% rename from AMDiS/cmake3/ZoltanConfig.cmake rename to AMDiS/cmake3/parse_zoltan_makefile.cmake diff --git a/AMDiS/cmake3/target_enable_zoltan.cmake b/AMDiS/cmake3/target_enable_zoltan.cmake index aea37864..3b9aeee8 100644 --- a/AMDiS/cmake3/target_enable_zoltan.cmake +++ b/AMDiS/cmake3/target_enable_zoltan.cmake @@ -1,4 +1,4 @@ -include(ZoltanConfig) +include(parse_zoltan_makefile) macro(target_enable_zoltan _TARGET_ _SCOPE_) if (${ARGC} GREATER 2) set(LINK_EXECUTABLE ON) -- GitLab