Changeset fd42c2

Timestamp:

09/08/10 07:19:20 (3 years ago)

Author:

Dan Dennedy <dan@…>

Branches:

b1faa09f4dfcf63d19d2cb9fc598a583e1df1c33

Children:

5761a5

Parents:

5ee9bb

git-author:

Dan Dennedy <dan@…> (09/08/10 07:19:20)

git-committer:

Dan Dennedy <dan@…> (09/08/10 07:19:20)

Message:

Fix CMake build for plugins dependent on gavl.

Files:

• CMakeLists.txt (modified) (1 diff)
• src/filter/rgbparade/CMakeLists.txt (modified) (1 diff)
• src/filter/scale0tilt/CMakeLists.txt (modified) (1 diff)
• src/filter/vectorscope/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -6 +6 @@
 
 find_package (OpenCV)
+include(FindPkgConfig)
+if (PKG_CONFIG_FOUND)
+   pkg_check_modules(GAVL gavl)
+endif (PKG_CONFIG_FOUND)
 
 include_directories (AFTER include)

src/filter/rgbparade/CMakeLists.txt

@@ +1 @@
+set (SOURCES rgbparade.c rgbparade_image.h)
+set (TARGET rgbparade)
+
 if (MSVC)
   set_source_files_properties (rgbparade.c PROPERTIES LANGUAGE CXX)
+  set (SOURCES ${SOURCES} ${FREI0R_DEF})
 endif (MSVC)
 
-add_library (${TARGET}  MODULE rgbparade.c rgbparade_image.h)
+include_directories (${GAVL_INCLUDE_DIRS})
+LINK_LIBRARIES(${GAVL_LIBRARIES})
+
+add_library (${TARGET}  MODULE ${SOURCES})
 set_target_properties (${TARGET} PROPERTIES PREFIX "")
 

src/filter/scale0tilt/CMakeLists.txt

@@ +1 @@
+set (SOURCES scale0tilt.c)
+set (TARGET scale0tilt)
+
 if (MSVC)
   set_source_files_properties (scale0tilt.c PROPERTIES LANGUAGE CXX)
+  set (SOURCES ${SOURCES} ${FREI0R_DEF})
 endif (MSVC)
 
-add_library (${TARGET}  MODULE scale0tilt.c)
+include_directories (${GAVL_INCLUDE_DIRS})
+LINK_LIBRARIES(${GAVL_LIBRARIES})
+
+add_library (${TARGET}  MODULE ${SOURCES})
 set_target_properties (${TARGET} PROPERTIES PREFIX "")
 

src/filter/vectorscope/CMakeLists.txt

@@ +1 @@
+set (SOURCES vectorscope.c vectorscope_image.h)
+set (TARGET vectorscope)
+
 if (MSVC)
   set_source_files_properties (vectorscope.c PROPERTIES LANGUAGE CXX)
+  set (SOURCES ${SOURCES} ${FREI0R_DEF})
 endif (MSVC)
 
-add_library (${TARGET}  MODULE vectorscope.c vectorscope_image.h)
+include_directories (${GAVL_INCLUDE_DIRS})
+LINK_LIBRARIES(${GAVL_LIBRARIES})
+
+add_library (${TARGET}  MODULE ${SOURCES})
 set_target_properties (${TARGET} PROPERTIES PREFIX "")