Merge pull request #21 from suttonpd/master

Merge from suttonpd

cuhd/CMakeLists.txt

@@ -22,6 +22,7 @@
 ########################################################################
 # Install headers
 ########################################################################
+ADD_SUBDIRECTORY(include)
 INSTALL(DIRECTORY include/ DESTINATION "${INCLUDE_DIR}" 
     FILES_MATCHING     PATTERN "*.h"
             PATTERN ".svn" EXCLUDE

cuhd/include/CMakeLists.txt

@@ -0,0 +1,38 @@
+#
+# Copyright 2012-2013 The libLTE Developers. See the
+# COPYRIGHT file at the top-level directory of this distribution.
+#
+# This file is part of the libLTE library.
+#
+# libLTE is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# libLTE is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# A copy of the GNU Lesser General Public License can be found in
+# the LICENSE file in the top-level directory of this distribution
+# and at http://www.gnu.org/licenses/.
+#
+
+########################################################################
+# Add headers to cmake project (useful for IDEs)
+########################################################################
+SET(HEADERS_ALL "")
+FILE(GLOB_RECURSE tmp "*.h")
+LIST(APPEND HEADERS_ALL ${tmp})
+FILE(GLOB headers *)
+FOREACH (_header ${headers})
+	IF(IS_DIRECTORY ${_header})
+		FILE(GLOB_RECURSE tmp "${_header}/*.h")
+		LIST(APPEND HEADERS_ALL ${tmp})		
+	ENDIF(IS_DIRECTORY ${_header})
+ENDFOREACH()
+ADD_CUSTOM_TARGET (add_cuhd_headers SOURCES ${HEADERS_ALL})
+
+
+

graphics/CMakeLists.txt

@@ -22,6 +22,7 @@
 ########################################################################
 # Install headers
 ########################################################################
+ADD_SUBDIRECTORY(include)
 INSTALL(DIRECTORY include/ DESTINATION "${INCLUDE_DIR}" 
     FILES_MATCHING     PATTERN "*.h"
             PATTERN ".svn" EXCLUDE

graphics/include/CMakeLists.txt

@@ -0,0 +1,38 @@
+#
+# Copyright 2012-2013 The libLTE Developers. See the
+# COPYRIGHT file at the top-level directory of this distribution.
+#
+# This file is part of the libLTE library.
+#
+# libLTE is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# libLTE is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# A copy of the GNU Lesser General Public License can be found in
+# the LICENSE file in the top-level directory of this distribution
+# and at http://www.gnu.org/licenses/.
+#
+
+########################################################################
+# Add headers to cmake project (useful for IDEs)
+########################################################################
+SET(HEADERS_ALL "")
+FILE(GLOB_RECURSE tmp "*.h")
+LIST(APPEND HEADERS_ALL ${tmp})
+FILE(GLOB headers *) 
+FOREACH (_header ${headers})
+	IF(IS_DIRECTORY ${_header})
+		FILE(GLOB_RECURSE tmp "${_header}/*.h")
+		LIST(APPEND HEADERS_ALL ${tmp})		
+        ENDIF(IS_DIRECTORY ${_header})
+ENDFOREACH()
+ADD_CUSTOM_TARGET (add_graphics_headers SOURCES ${HEADERS_ALL})
+
+
+

graphics/lib/CMakeLists.txt

@@ -67,7 +67,7 @@ IF(QT4_FOUND AND QWT_FOUND AND QWT_MAJOR_VERSION EQUAL 6)
 
   INCLUDE_DIRECTORIES(common complexplot realplot scatterplot waterfallplot ${Boost_INCLUDE_DIRS}) 
   
-  ADD_LIBRARY(graphics ${eventwraps} ${lineplotwraps} ${pointplotwraps} ${spectrogramplotwraps} ${complex} ${real} ${scatter} ${waterfall} ${SOURCES_ALL} )
+  ADD_LIBRARY(graphics SHARED ${eventwraps} ${lineplotwraps} ${pointplotwraps} ${spectrogramplotwraps} ${complex} ${real} ${scatter} ${waterfall} ${SOURCES_ALL} )
   TARGET_LINK_LIBRARIES(graphics pthread ${QT_LIBRARIES} ${QWT_LIBRARIES})
   INSTALL(TARGETS graphics DESTINATION ${LIBRARY_DIR})
   LIBLTE_SET_PIC(graphics)

lte/include/CMakeLists.txt

@@ -22,15 +22,17 @@
 ########################################################################
 # Add headers to cmake project (useful for IDEs)
 ########################################################################
-FILE(GLOB headers *) 
 SET(HEADERS_ALL "")
+FILE(GLOB_RECURSE tmp "*.h")
+LIST(APPEND HEADERS_ALL ${tmp})
+FILE(GLOB headers *)
 FOREACH (_header ${headers})
 	IF(IS_DIRECTORY ${_header})
 		FILE(GLOB_RECURSE tmp "${_header}/*.h")
 		LIST(APPEND HEADERS_ALL ${tmp})		
 	ENDIF(IS_DIRECTORY ${_header})
 ENDFOREACH()
-ADD_CUSTOM_TARGET (add_headers SOURCES ${HEADERS_ALL})
+ADD_CUSTOM_TARGET (add_lte_headers SOURCES ${HEADERS_ALL})
 
 
 

lte/include/lte.h

@@ -32,6 +32,10 @@
 #ifndef _LTE_
 #define _LTE_
 
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
 #include "lte/utils/bit.h"
 #include "lte/utils/convolution.h"
 #include "lte/utils/debug.h"
@@ -90,4 +94,8 @@
 #include "lte/sync/sync.h"
 #include "lte/sync/cfo.h"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

lte/lib/CMakeLists.txt

@@ -51,7 +51,7 @@ FOREACH (_module ${modules})
 	ENDIF(IS_DIRECTORY ${_module})
 ENDFOREACH()
 
-ADD_LIBRARY(lte ${SOURCES_ALL})
+ADD_LIBRARY(lte SHARED ${SOURCES_ALL})
 TARGET_LINK_LIBRARIES(lte m ${FFTW3F_LIBRARIES})
 INSTALL(TARGETS lte DESTINATION ${LIBRARY_DIR})
 LIBLTE_SET_PIC(lte)