equal
deleted
inserted
replaced
188 if(NOT NO_VIDEOREC) |
188 if(NOT NO_VIDEOREC) |
189 if(${FFMPEG_FOUND}) |
189 if(${FFMPEG_FOUND}) |
190 message(STATUS "Compiling with video recording") |
190 message(STATUS "Compiling with video recording") |
191 include_directories(${FFMPEG_INCLUDE_DIR}) |
191 include_directories(${FFMPEG_INCLUDE_DIR}) |
192 set(pascal_flags "-dUSE_VIDEO_RECORDING" ${pascal_flags}) |
192 set(pascal_flags "-dUSE_VIDEO_RECORDING" ${pascal_flags}) |
|
193 set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}) |
193 IF (WIN32) |
194 IF (WIN32) |
194 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) |
|
195 # there are some problems with linking our avwrapper as static lib, so link it as shared |
195 # there are some problems with linking our avwrapper as static lib, so link it as shared |
196 add_library(avwrapper SHARED avwrapper.c) |
196 add_library(avwrapper SHARED avwrapper.c) |
197 target_link_libraries(avwrapper ${FFMPEG_LIBRARIES}) |
197 target_link_libraries(avwrapper ${FFMPEG_LIBRARIES}) |
198 ELSE() |
198 ELSE() |
199 add_library(avwrapper STATIC avwrapper.c) |
199 add_library(avwrapper STATIC avwrapper.c) |
|
200 set(pascal_flags "-k${FFMPEG_LIBAVCODEC} ${FFMPEG_LIBAVFORMAT} ${FFMPEG_LIBAVUTIL}" ${pascal_flags}) |
|
201 # set(pascal_flags "-k${LIBRARY_OUTPUT_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}avwrapper${CMAKE_STATIC_LIBRARY_SUFFIX}" ${pascal_flags}) |
200 ENDIF() |
202 ENDIF() |
|
203 else() |
|
204 message(STATUS "FFMPEG library not found, video recording will be disabled") |
201 endif() |
205 endif() |
202 else() |
206 else() |
203 message(STATUS "Video recording disabled by user") |
207 message(STATUS "Video recording disabled by user") |
204 endif() |
208 endif() |
205 |
209 |