diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-04-09 14:59:42 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-04-09 14:59:42 -0700 |
| commit | c40b7c391d2601e600bed822c22c1dc1022b63f7 (patch) | |
| tree | d989e17268999550866b0466a68012f07263f7a1 | |
| parent | 4d28885465d10b1439b41caf0ac1435f68e1f5a0 (diff) | |
runtime: Fixed libgnuradio-pmt MSVC incompatibility errors
| -rw-r--r-- | gnuradio-runtime/include/pmt/api.h | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/pmt/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-runtime/include/pmt/api.h b/gnuradio-runtime/include/pmt/api.h index 2deba0a2d7..96f1f8c26b 100644 --- a/gnuradio-runtime/include/pmt/api.h +++ b/gnuradio-runtime/include/pmt/api.h @@ -24,7 +24,7 @@ #include <attributes.h> -#ifdef gnuradio_runtime_EXPORTS +#ifdef gnuradio_pmt_EXPORTS # define PMT_API __GR_ATTR_EXPORT #else # define PMT_API __GR_ATTR_IMPORT diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index fd4e169daf..98db673f5d 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -241,7 +241,7 @@ endif(TRY_SHM_VMCIRCBUF) add_library(gnuradio-runtime SHARED ${gnuradio_runtime_sources}) target_link_libraries(gnuradio-runtime ${gnuradio_runtime_libs}) -GR_LIBRARY_FOO(gnuradio-runtime RUNTIME_COMPONENT "runtime" DEVEL_COMPONENT "runtime_devel") +GR_LIBRARY_FOO(gnuradio-runtime RUNTIME_COMPONENT "runtime_runtime" DEVEL_COMPONENT "runtime_devel") add_dependencies(gnuradio-runtime pmt_generated runtime_generated_includes diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index 30a62ead7f..146a65016c 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -88,7 +88,7 @@ list(APPEND gnuradio_pmt_libs add_library(gnuradio-pmt SHARED ${pmt_sources}) target_link_libraries(gnuradio-pmt ${gnuradio_pmt_libs}) -GR_LIBRARY_FOO(gnuradio-pmt RUNTIME_COMPONENT "runtime" DEVEL_COMPONENT "runtime_devel") +GR_LIBRARY_FOO(gnuradio-pmt RUNTIME_COMPONENT "runtime_runtime" DEVEL_COMPONENT "runtime_devel") add_dependencies(gnuradio-pmt pmt_generated |