zoltan configuration cleaned up

049ab52c · Praetorius, Simon · 7abd6b1b · 049ab52c · 049ab52c · 049ab52c
Commit 049ab52c authored Nov 11, 2016 by Praetorius, Simon
6 changed files
--- 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"

--- a/AMDiS/cmake/enable_zoltan.cmake
+++ b/AMDiS/cmake/enable_zoltan.cmake
-include(ZoltanConfig)
+include(parse_zoltan_makefile)
 macro(enable_zoltan _FLAGS_ _INC_DIRS_ _LIBS_)
    if (${ARGC} GREATER 3)
      set(LINK_EXECUTABLE ON)

--- a/AMDiS/cmake/ZoltanConfig.cmake
+++ b/AMDiS/cmake/ZoltanConfig.cmake
--- 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"

--- a/AMDiS/cmake3/ZoltanConfig.cmake
+++ b/AMDiS/cmake3/ZoltanConfig.cmake
--- a/AMDiS/cmake3/target_enable_zoltan.cmake
+++ b/AMDiS/cmake3/target_enable_zoltan.cmake
-include(ZoltanConfig)
+include(parse_zoltan_makefile)
 macro(target_enable_zoltan _TARGET_ _SCOPE_)
    if (${ARGC} GREATER 2)
      set(LINK_EXECUTABLE ON)