Commit eb232bf1 authored by David Cole's avatar David Cole
Browse files

ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.8 -j1.9...

ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.8 -j1.9 Utilities/vtkmpeg2encode/CMakeLists.txt)
parent f626085d
......@@ -6,7 +6,7 @@ INCLUDE_REGULAR_EXPRESSION("^.*$")
# directory so that it gets built and then you will use the following variables
# in your CMakeLists files to get the proper include paths and libraries
SET (vtkMPEG2Encode_INCLUDE_PATH
"${vtkMPEG2Encode_SOURCE_DIR}"
"${vtkMPEG2Encode_SOURCE_DIR};${vtkMPEG2Encode_BINARY_DIR}"
CACHE INTERNAL "include paths for vtkMPEG2Encode"
)
SET (vtkMPEG2Encode_LIBRARIES vtkMPEG2Encode
......@@ -28,8 +28,6 @@ SET(srcs
idct.c predict.c putmpg.c putvlc.c readpic.c writepic.c
)
ADD_LIBRARY(vtkMPEG2Encode ${srcs})
ADD_DEFINITIONS(-DVTK_IN_MPEG2ENC)
IF(NOT BUILD_SHARED_LIBS)
SET(VTK_MPEG2ENC_STATIC 1)
......@@ -40,11 +38,17 @@ CONFIGURE_FILE(${vtkMPEG2Encode_SOURCE_DIR}/.NoDartCoverage
CONFIGURE_FILE(${vtkMPEG2Encode_SOURCE_DIR}/mpeg2encDllConfig.h.in
${vtkMPEG2Encode_BINARY_DIR}/mpeg2encDllConfig.h)
INCLUDE_DIRECTORIES(${vtkMPEG2Encode_INCLUDE_PATH})
ADD_LIBRARY(vtkMPEG2Encode ${srcs})
# Apply user-defined properties to the library target.
IF(VTK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(vtkMPEG2Encode PROPERTIES ${VTK_LIBRARY_PROPERTIES})
ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
IF(VTK_INSTALL_LIB_DIR)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtkMPEG2Encode)
ENDIF(VTK_INSTALL_LIB_DIR)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
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