Add cmake find scripts; fix template API export declarations

Author: scheibel

cmake/FindFFMPEG.cmake

@@ -59,6 +59,7 @@ else (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
       ${FFMPEG_LIBAVCODEC}
       ${FFMPEG_LIBAVFORMAT}
       ${FFMPEG_LIBAVUTIL}
+      ${FFMPEG_LIBSWSCALE}
     )
 
   endif (FFMPEG_FOUND)

cmake/FindHIDAPI.cmake

@@ -0,0 +1,32 @@
+
+# HIDAPI_FOUND
+# HIDAPI_INCLUDE_DIRS
+# HIDAPI_LIBRARIES
+
+find_path(HIDAPI_INCLUDE_DIRS
+	NAMES hidapi/hidapi.h
+	/usr/include
+	/usr/local/include
+	/sw/include
+	/opt/local/include
+	DOC "The directory where hidapi/hidapi.h resides")
+
+find_library(HIDAPI_LIBRARIES
+	NAMES hidapi-hidraw hidapi-libusb
+	PATHS
+	/usr/lib64
+	/usr/local/lib64
+	/sw/lib64
+	/opt/loca/lib64
+	/usr/lib
+	/usr/local/lib
+	/sw/lib
+	/opt/local/lib
+	DOC "The hidapi library")
+
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(HIDAPI REQUIRED_VARS HIDAPI_LIBRARIES HIDAPI_INCLUDE_DIRS)
+
+mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY)
+

source/codegeneration/template_api.h.in

@@ -8,7 +8,7 @@
 #  define ${target_id}_TEMPLATE_API
 #else
 #  ifndef ${target_id}_TEMPLATE_API
-#    ifdef ${target}_EXPORTS
+#    ifdef ${target_id}_EXPORTS
         /* We are building this library */
 #      define ${target_id}_TEMPLATE_API __attribute__((visibility("default")))
 #    else

source/codegeneration/template_msvc_api.in

@@ -8,7 +8,7 @@
 #  define ${target_id}_TEMPLATE_API
 #else
 #  ifndef ${target_id}_TEMPLATE_API
-#    ifdef ${target}_EXPORTS
+#    ifdef ${target_id}_EXPORTS
         /* We are building this library */
 #      define ${target_id}_TEMPLATE_API
 #    else

source/fiblib/CMakeLists.txt

@@ -93,6 +93,7 @@ generate_export_header(${target}
     EXPORT_FILE_NAME  ${export_file}
     EXPORT_MACRO_NAME ${export_macro}
 )
+
 generate_template_export_header(${target}
     ${target_id}
     ${template_export_file}