summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Rogalsky <ed.rogalsky@googlemail.com>2014-03-08 14:25:42 (GMT)
committerEd Rogalsky <ed.rogalsky@googlemail.com>2014-03-08 14:25:42 (GMT)
commitb2f37cecd90d42af8cc8f655462c91cf6624cb01 (patch)
treea86e608c279ad8b0b63389e1980763e814f9f992
parentaec01436823fc842d7bf7158e79bac84c1521552 (diff)
jogshuttle: cmake files cleaned up a little bit
-rw-r--r--src/CMakeLists.txt12
-rw-r--r--src/jogshuttle.h2
-rw-r--r--src/lib/external/kiss_fft/CMakeLists.txt10
3 files changed, 7 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b74ca37..aedb54d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -295,6 +295,8 @@ include_directories(
${KDE4_INCLUDES} # Adds Qt include directories too.
${LIBMLT_INCLUDE_DIR}
${LIBMLTPLUS_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/lib/external
+ ${CMAKE_CURRENT_SOURCE_DIR}/lib
)
@@ -320,14 +322,9 @@ target_link_libraries(kdenlive
${LIBMLTPLUS_LIBRARY}
${CMAKE_DL_LIBS}
${CMAKE_THREAD_LIBS_INIT}
+ kiss_fft
)
-if(BUILD_JogShuttle)
- target_link_libraries(kdenlive
- ${CMAKE_SOURCE_DIR}/lib/libmedia_ctrl.a
- )
-endif(BUILD_JogShuttle)
-
if(Q_WS_X11)
include_directories(${X11_Xlib_INCLUDE_PATH})
target_link_libraries(kdenlive ${X11_LIBRARIES})
@@ -368,6 +365,9 @@ endif(BUILD_V4L)
if(BUILD_JogShuttle)
add_definitions(-DUSE_JOGSHUTTLE)
+ target_link_libraries(kdenlive
+ media_ctrl
+ )
endif(BUILD_JogShuttle)
install(TARGETS kdenlive DESTINATION ${BIN_INSTALL_DIR})
diff --git a/src/jogshuttle.h b/src/jogshuttle.h
index 2533dcd..36e1f4c 100644
--- a/src/jogshuttle.h
+++ b/src/jogshuttle.h
@@ -27,7 +27,7 @@
#include <linux/input.h>
#include <sys/time.h>
-#include "lib/external/media_ctrl/mediactrl.h"
+#include <media_ctrl/mediactrl.h>
typedef struct input_event EV;
diff --git a/src/lib/external/kiss_fft/CMakeLists.txt b/src/lib/external/kiss_fft/CMakeLists.txt
index eff1f9b..e74453f 100644
--- a/src/lib/external/kiss_fft/CMakeLists.txt
+++ b/src/lib/external/kiss_fft/CMakeLists.txt
@@ -1,14 +1,4 @@
-set(kdenlive_SRCS
- ${kdenlive_SRCS}
- lib/external/kiss_fft/_kiss_fft_guts.h
- lib/external/kiss_fft/kiss_fft.c
- lib/external/kiss_fft/tools/kiss_fftr.c
- PARENT_SCOPE
-)
-
-
# Create a static library from kiss_fft
-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99")
include_directories(
${CMAKE_BINARY_DIR}