diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-04-20 15:50:48 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-21 11:56:51 -0700 |
| commit | 396549ac210df6cebc662213d812a8ce4353f467 (patch) | |
| tree | 1d0f03c60940b1f76fdd66fdb4bc0304fe310857 | |
| parent | a9b6141d7c5f46fd85a629c568ff0e8ebd46ec24 (diff) | |
| download | uhd-396549ac210df6cebc662213d812a8ce4353f467.tar.gz uhd-396549ac210df6cebc662213d812a8ce4353f467.tar.bz2 uhd-396549ac210df6cebc662213d812a8ce4353f467.zip | |
cmake: Improve usage of C modules
| -rw-r--r-- | host/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/utils/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/utils/usrp_x3xx_fpga_burner.cpp | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 8dddb6552..1fa8b2cdb 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -24,7 +24,7 @@ # Project setup ######################################################################## CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(UHD CXX) +PROJECT(UHD CXX C) ENABLE_TESTING() #make sure our local CMake Modules path comes first diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index ed8640187..e24b417c1 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -15,8 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -SET(CMAKE_C_COMPILE_OBJECT ${CMAKE_CXX_COMPILE_OBJECT}) - ######################################################################## # Utilities that get installed into the runtime path ######################################################################## diff --git a/host/utils/usrp_x3xx_fpga_burner.cpp b/host/utils/usrp_x3xx_fpga_burner.cpp index e32e4d636..3c6225531 100644 --- a/host/utils/usrp_x3xx_fpga_burner.cpp +++ b/host/utils/usrp_x3xx_fpga_burner.cpp @@ -49,13 +49,9 @@ #include <uhd/utils/safe_main.hpp> #include <uhd/utils/safe_call.hpp> -#ifdef _MSC_VER extern "C" { -#endif #include "cdecode.h" -#ifdef _MSC_VER } -#endif #define X300_FPGA_BIN_SIZE_BYTES 15877916 #define X300_FPGA_BIT_MAX_SIZE_BYTES 15878022 |