Commit c5fcec3f authored by Chris Harris's avatar Chris Harris
Browse files

LIBRARY_OUTPUT_PATH is depreciated use CMAKE_LIBRARY_OUTPUT_DIRECTORY

Also its not a cache entry
parent 9b4e652d
......@@ -85,14 +85,14 @@ IF(XDMF_HAS_NDGM)
MESSAGE(STATUS "......Looking for NDGM_INCLUDE_DIR")
FIND_PATH(NDGM_INCLUDE_DIR Ndgm ${Xdmf_SOURCE_DIR}/../Ndgm/libsrc "Include Directory for NDGM; Resolves #include <Ndgm/ndgm.h>")
MESSAGE(STATUS "......Looking for NDGM_LIBRARY")
FIND_LIBRARY(NDGM_LIBRARY ndgm ${LIBRARY_OUTPUT_PATH})
FIND_LIBRARY(NDGM_LIBRARY ndgm ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
INCLUDE_DIRECTORIES(${NDGM_INCLUDE_DIR})
SET(NDGM_LIBRARY ${NDGM_LIBRARY})
ENDIF(XDMF_HAS_NDGM_SOURCE)
SET(HAVE_NDGM 1)
ENDIF(XDMF_HAS_NDGM)
SET(XDMF2_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
SET(XDMF2_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR})
SET(XDMF2_VTK_DIR ${ParaView_BINARY_DIR}/VTK)
CONFIGURE_FILE(${Xdmf_SOURCE_DIR}/XDMFConfig.cmake.in
${Xdmf_BINARY_DIR}/XDMFConfig.cmake @ONLY IMMEDIATE)
......
SET(ENV{PYTHONPATH} $ENV{PYTHONPATH}:@LIBRARY_OUTPUT_PATH@:@Xdmf_BINARY_DIR@/libsrc)
SET(ENV{LD_LIBRARY_PATH} $ENV{LD_LIBRARY_PATH}:@LIBRARY_OUTPUT_PATH@:@Xdmf_BINARY_DIR@/libsrc)
SET(ENV{PYTHONPATH} $ENV{PYTHONPATH}:@CMAKE_LIBRARY_OUTPUT_DIRECTORY@:@Xdmf_BINARY_DIR@/libsrc)
SET(ENV{LD_LIBRARY_PATH} $ENV{LD_LIBRARY_PATH}:@CMAKE_LIBRARY_OUTPUT_DIRECTORY@:@Xdmf_BINARY_DIR@/libsrc)
MESSAGE("CALLING: " ${ARGV})
EXECUTE_PROCESS(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment