diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-08 17:11:12 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-10-08 17:11:12 -0700 |
| commit | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (patch) | |
| tree | 046d89555243ede65bfc7bc0a6cbfc7f870ff4cb /gnuradio-core/src/lib/swig | |
| parent | 63b87bf4e6e9a2f1112c17c57796b69b3b8a2b3e (diff) | |
gr: the CMakeLists.txt took a chill pill
Diffstat (limited to 'gnuradio-core/src/lib/swig')
| -rw-r--r-- | gnuradio-core/src/lib/swig/CMakeLists.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt index 9c7a75b4f0..ef07729440 100644 --- a/gnuradio-core/src/lib/swig/CMakeLists.txt +++ b/gnuradio-core/src/lib/swig/CMakeLists.txt @@ -18,20 +18,20 @@ # Boston, MA 02110-1301, USA. ######################################################################## -INCLUDE(GrPython) -INCLUDE(GrSwig) +include(GrPython) +include(GrSwig) -INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) -LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +include_directories(${Boost_INCLUDE_DIRS}) +link_directories(${Boost_LIBRARY_DIRS}) -SET(GR_SWIG_INCLUDE_DIRS +set(GR_SWIG_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${GNURADIO_CORE_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ) -SET(GR_SWIG_LIBRARIES gnuradio-core) +set(GR_SWIG_LIBRARIES gnuradio-core) ######################################################################## # Build and install the swig targets @@ -43,7 +43,7 @@ SET(GR_SWIG_LIBRARIES gnuradio-core) # X86_64, g++'s resident set size was 650MB! # ---------------------------------------------------------------- -SET(GR_SWIG_TARGET_DEPS gengen_generated filter_generated) +set(GR_SWIG_TARGET_DEPS gengen_generated filter_generated) GR_SWIG_MAKE(gnuradio_core_runtime gnuradio_core_runtime.i) GR_SWIG_MAKE(gnuradio_core_general gnuradio_core_general.i) @@ -66,7 +66,7 @@ GR_SWIG_INSTALL(TARGETS ######################################################################## # Install various files ######################################################################## -INSTALL(FILES +install(FILES gnuradio.i gr_swig_block_magic.i gr_shared_ptr.i @@ -86,7 +86,7 @@ GR_PYTHON_INSTALL( COMPONENT "core_python" ) -INSTALL( +install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio_swig_bug_workaround.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_swig" |