From 745924e71aed4c26797c297bef8989a79154f63a Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Mon, 9 Jan 2017 14:03:30 +0100 Subject: [PATCH] CMake: prepend NETGEN_ to set variables in NetgenConfig.cmake --- cmake_modules/NetgenConfig.cmake.in | 82 +++++++++++++---------------- 1 file changed, 37 insertions(+), 45 deletions(-) diff --git a/cmake_modules/NetgenConfig.cmake.in b/cmake_modules/NetgenConfig.cmake.in index fe46fc80..8fdf209f 100644 --- a/cmake_modules/NetgenConfig.cmake.in +++ b/cmake_modules/NetgenConfig.cmake.in @@ -4,56 +4,48 @@ set(NETGEN_DIR "@CMAKE_INSTALL_PREFIX@") set(NETGEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include") set(NETGEN_SOURCE_DIR "@PROJECT_SOURCE_DIR@") -set(CMAKE_THREAD_LIBS_INIT "@CMAKE_THREAD_LIBS_INIT@") -set(FFMPEG_LIBRARIES "@FFMPEG_LIBRARIES@") -set(JPEG_INCLUDE_DIR "@JPEG_INCLUDE_DIR@") -set(JPEG_LIBRARIES "@JPEG_LIBRARIES@") -set(LIBTOGL "@LIBTOGL@") -set(METIS_INCLUDE_DIR "@METIS_INCLUDE_DIR@") -set(METIS_LIBRARY "@METIS_LIBRARY@") -set(MKL_LIBRARIES "@MKL_LIBRARIES@") -set(MPI_CXX_INCLUDE_PATH "@MPI_CXX_INCLUDE_PATH@") -set(MPI_CXX_LIBRARIES "@MPI_CXX_LIBRARIES@") +set(NETGEN_CMAKE_THREAD_LIBS_INIT "@CMAKE_THREAD_LIBS_INIT@") +set(NETGEN_FFMPEG_LIBRARIES "@FFMPEG_LIBRARIES@") +set(NETGEN_JPEG_INCLUDE_DIR "@JPEG_INCLUDE_DIR@") +set(NETGEN_JPEG_LIBRARIES "@JPEG_LIBRARIES@") +set(NETGEN_LIBTOGL "@LIBTOGL@") +set(NETGEN_METIS_INCLUDE_DIR "@METIS_INCLUDE_DIR@") +set(NETGEN_METIS_LIBRARY "@METIS_LIBRARY@") +set(NETGEN_MKL_LIBRARIES "@MKL_LIBRARIES@") +set(NETGEN_MPI_CXX_INCLUDE_PATH "@MPI_CXX_INCLUDE_PATH@") +set(NETGEN_MPI_CXX_LIBRARIES "@MPI_CXX_LIBRARIES@") set(NETGEN_INCLUDE_DIRS "@PROJECT_SOURCE_DIR@/libsrc/include;@PROJECT_SOURCE_DIR@/libsrc/general;@PROJECT_SOURCE_DIR@/libsrc/visualization") -set(OCC_INCLUDE_DIR "@OCC_INCLUDE_DIR@") -set(OCC_LIBRARIES_BIN "@OCC_LIBRARIES_BIN@") -set(OCC_LIBRARIES "@OCC_LIBRARIES@") -set(OCC_LIBRARY_DIR "@OCC_LIBRARY_DIR@") -set(OPENGL_LIBRARIES "@OPENGL_LIBRARIES@") -set(PYBIND_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include") -set(PYTHON_INCLUDE_DIRS "@PYTHON_INCLUDE_DIRS@") -set(PYTHON_LIBRARIES "@PYTHON_LIBRARIES@") -set(PYTHON_LIBS "@PYTHON_LIBS@") -set(PYTHON_PACKAGES_INSTALL_DIR "@PYTHON_PACKAGES_INSTALL_DIR@") -set(TCL_INCLUDE_PATH "@TCL_INCLUDE_PATH@") -set(TCL_LIBRARY "@TCL_LIBRARY@") -set(TK_DND_LIBRARY "@TK_DND_LIBRARY@") -set(TK_INCLUDE_PATH "@TK_INCLUDE_PATH@") -set(TK_LIBRARY "@TK_LIBRARY@") -set(X11_X11_LIB "@X11_X11_LIB@") -set(X11_Xmu_LIB "@X11_Xmu_LIB@") -set(ZLIB_INCLUDE_DIRS "@ZLIB_INCLUDE_DIRS@") -set(ZLIB_LIBRARIES "@ZLIB_LIBRARIES@") +set(NETGEN_OCC_INCLUDE_DIR "@OCC_INCLUDE_DIR@") +set(NETGEN_OCC_LIBRARIES_BIN "@OCC_LIBRARIES_BIN@") +set(NETGEN_OCC_LIBRARIES "@OCC_LIBRARIES@") +set(NETGEN_OCC_LIBRARY_DIR "@OCC_LIBRARY_DIR@") +set(NETGEN_OPENGL_LIBRARIES "@OPENGL_LIBRARIES@") +set(NETGEN_PYBIND_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include") +set(NETGEN_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@") +set(NETGEN_PYTHON_INCLUDE_DIR "@PYTHON_INCLUDE_DIR@") +set(NETGEN_PYTHON_LIBRARIES "@PYTHON_LIBRARIES@") +set(NETGEN_PYTHON_LIBS "@PYTHON_LIBS@") +set(NETGEN_PYTHON_PACKAGES_INSTALL_DIR "@PYTHON_PACKAGES_INSTALL_DIR@") +set(NETGEN_TCL_INCLUDE_PATH "@TCL_INCLUDE_PATH@") +set(NETGEN_TCL_LIBRARY "@TCL_LIBRARY@") +set(NETGEN_TK_DND_LIBRARY "@TK_DND_LIBRARY@") +set(NETGEN_TK_INCLUDE_PATH "@TK_INCLUDE_PATH@") +set(NETGEN_TK_LIBRARY "@TK_LIBRARY@") +set(NETGEN_X11_X11_LIB "@X11_X11_LIB@") +set(NETGEN_X11_Xmu_LIB "@X11_Xmu_LIB@") +set(NETGEN_ZLIB_INCLUDE_DIRS "@ZLIB_INCLUDE_DIRS@") +set(NETGEN_ZLIB_LIBRARIES "@ZLIB_LIBRARIES@") -set(USE_GUI @USE_GUI@) -set(USE_PYTHON @USE_PYTHON@) -set(USE_MPI @USE_MPI@) -set(USE_OCC @USE_OCC@) -set(USE_JPEG @USE_JPEG@) -set(USE_MPEG @USE_MPEG@) +set(NETGEN_USE_GUI @USE_GUI@) +set(NETGEN_USE_PYTHON @USE_PYTHON@) +set(NETGEN_USE_MPI @USE_MPI@) +set(NETGEN_USE_OCC @USE_OCC@) +set(NETGEN_USE_JPEG @USE_JPEG@) +set(NETGEN_USE_MPEG @USE_MPEG@) set(NETGEN_INTEL_MIC @INTEL_MIC@) set(NETGEN_INSTALL_PROFILES @INSTALL_PROFILES@) set(NETGEN_INSTALL_DEPENDENCIES @INSTALL_DEPENDENCIES@) -set(USE_CCACHE @USE_CCACHE@) - -if(@USE_GUI@) - find_package(TCL 8.5 REQUIRED) -endif(@USE_GUI@) - -if(@USE_PYTHON@) - find_package(PythonInterp @PYTHON_VERSION@ REQUIRED) - find_package(PythonLibs @PYTHON_VERSION@ REQUIRED) -endif(@USE_PYTHON@) +set(NETGEN_USE_CCACHE @USE_CCACHE@) include(${CMAKE_CURRENT_LIST_DIR}/netgen-targets.cmake) message(STATUS "Found Netgen: ${NETGEN_DIR}")