From 765adcc5aa9e7456cb35f906b6f33381feb92cd7 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@dside.dyndns.org>
Date: Sat, 18 Aug 2012 03:30:13 +0200
Subject: Don't use gawk for gcc detection

---
 driver/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/driver/Makefile b/driver/Makefile
index ac4a14c..92fa913 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -10,7 +10,7 @@ EXTRA_CFLAGS += -I$(M)/..
 
 default:
 	@KERNEL_GCC_VERSION=`cat /proc/version | head -n1 | cut -d " " -f 7` ;\
-	GCC_VERSION=`$(CC) --version | head -n 1 | awk 'BEGIN { FPAT = "([^[:space:]]*)|(\\\\([^)]+\\\\))" } { print $$3 }'` ;\
+	GCC_VERSION=`$(CC) --version | head -n 1 | tr ' ' '\n' | tail -n 1` ;\
 	if [ $$KERNEL_GCC_VERSION != $$GCC_VERSION ]; then \
 	    echo "Kernel is compiled with gcc $$KERNEL_GCC_VERSION, but you are now using $$GCC_VERSION" ;\
 	    GCC_MAJOR=`echo $$KERNEL_GCC_VERSION | cut -d "." -f 1-2` ;\
@@ -20,7 +20,7 @@ default:
 		echo "No compiler of $$GCC_MAJOR series is installed" ;\
 		exit 1 ;\
 	    fi ;\
-	    GCC_VERSION=`$$CC --version | head -n 1 | awk 'BEGIN { FPAT = "([^[:space:]]*)|(\\\\([^)]+\\\\))" } { print $$3 }'` ;\
+	    GCC_VERSION=`$$CC --version | head -n 1 | tr ' ' '\n' | tail -n 1` ;\
 	    if [ $$KERNEL_GCC_VERSION != $$GCC_VERSION ]; then \
 		echo "The $$GCC_VERSION of $$GCC_MAJOR series is installed" ;\
 		exit 1 ;\
-- 
cgit v1.2.3


From a577cc5b8ef1f477e21f5f1c867c2936f86afa62 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@dside.dyndns.org>
Date: Sat, 18 Aug 2012 03:37:03 +0200
Subject: Use add_library to link against pthread

---
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54a7120..80355c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,13 +27,12 @@ add_subdirectory(ipecamera)
 add_subdirectory(pcitool)
 
 add_library(pcilib SHARED pci.c register.c kmem.c irq.c dma.c event.c default.c tools.c error.c) 
-target_link_libraries(pcilib ufodecode dma ipecamera)
+target_link_libraries(pcilib ufodecode dma ipecamera ${CMAKE_THREAD_LIBS_INIT})
 add_dependencies(pcilib dma ipecamera)
 
 set_target_properties(pcilib PROPERTIES
     VERSION ${PCILIB_VERSION}
     SOVERSION ${PCILIB_ABI_VERSION}
-    LINK_FLAGS ${CMAKE_THREAD_LIBS_INIT}
 #    LINK_FLAGS "-pthread"
 #    LINK_FLAGS "-pthread -Wl,--whole-archive,dma/libdma.a,ipecamera/libipecamera.a,--no-whole-archive"
 )
-- 
cgit v1.2.3


From 047cd8feb375de9528dd627e25961863acf4e10a Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@dside.dyndns.org>
Date: Sat, 18 Aug 2012 04:20:18 +0200
Subject: Fixes building in non-standard dirs

---
 CMakeLists.txt           | 14 +++++++++++---
 ipecamera/CMakeLists.txt |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80355c2..cb3be58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,8 +26,17 @@ add_subdirectory(dma)
 add_subdirectory(ipecamera)
 add_subdirectory(pcitool)
 
+include_directories(
+    ${FASTWRITER_INCLUDE_DIRS}
+)
+
+link_directories(
+    ${FASTWRITER_LIBRARY_DIRS}
+    ${UFODECODE_LIBRARY_DIRS}
+)
+
 add_library(pcilib SHARED pci.c register.c kmem.c irq.c dma.c event.c default.c tools.c error.c) 
-target_link_libraries(pcilib ufodecode dma ipecamera ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(pcilib dma ipecamera ${CMAKE_THREAD_LIBS_INIT} ${UFODECODE_LIBRARIES} )
 add_dependencies(pcilib dma ipecamera)
 
 set_target_properties(pcilib PROPERTIES
@@ -40,7 +49,7 @@ set_target_properties(pcilib PROPERTIES
 if (NOT DISABLE_PCITOOL)
     add_executable(pci cli.c)
     add_dependencies(pci pcitool)
-    target_link_libraries(pci pcilib pcitool fastwriter)
+    target_link_libraries(pci pcilib pcitool ${FASTWRITER_LIBRARIES})
     set_target_properties(pci PROPERTIES
 	LINK_FLAGS ${CMAKE_THREAD_LIBS_INIT}
     )
@@ -50,7 +59,6 @@ endif (NOT DISABLE_PCITOOL)
 #    LINK_FLAGS "-Wl,pcitool/libpcitool.a"
 #)
 
-
 if(NOT DEFINED BIN_INSTALL_DIR)
     set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
 endif(NOT DEFINED BIN_INSTALL_DIR)
diff --git a/ipecamera/CMakeLists.txt b/ipecamera/CMakeLists.txt
index 87699fa..5b536f2 100644
--- a/ipecamera/CMakeLists.txt
+++ b/ipecamera/CMakeLists.txt
@@ -1,5 +1,6 @@
 include_directories(
     ${CMAKE_SOURCE_DIR}
+    ${UFODECODE_INCLUDE_DIRS}
 )
 
 set(HEADERS ${HEADERS} ipecamera.h model.h reader.h events.h data.h public.h private.h)
-- 
cgit v1.2.3