diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-01 13:47:50 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-01 16:25:28 -0700 |
| commit | 882965a4a2e3ac9c0c3b24d1e576e74f0a472b5a (patch) | |
| tree | d310eade86d361f9e43d67168b4258e9cbc8df1f | |
| parent | 9e2eef3cfc7ead637e578eed73e8f33f24d3ed8a (diff) | |
video-sdl, trellis: adding windows files back into cmake.
| -rw-r--r-- | gr-trellis/lib/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | gr-video-sdl/lib/CMakeLists.txt | 13 |
2 files changed, 27 insertions, 0 deletions
diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt index fc08dbf7af..2fe7d3218c 100644 --- a/gr-trellis/lib/CMakeLists.txt +++ b/gr-trellis/lib/CMakeLists.txt @@ -134,6 +134,20 @@ list(APPEND trellis_libs ${Boost_LIBRARIES} ) +#Add Windows DLL resource file if using MSVC +IF(MSVC) + include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-trellis.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.rc + @ONLY) + + list(APPEND trellis_sources + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.rc + ) +ENDIF(MSVC) + add_library(gnuradio-trellis SHARED ${trellis_sources}) target_link_libraries(gnuradio-trellis ${trellis_libs}) GR_LIBRARY_FOO(gnuradio-trellis RUNTIME_COMPONENT "trellis_runtime" DEVEL_COMPONENT "trellis_devel") diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt index e90aa17273..f87ee3f007 100644 --- a/gr-video-sdl/lib/CMakeLists.txt +++ b/gr-video-sdl/lib/CMakeLists.txt @@ -50,6 +50,19 @@ list(APPEND video_sdl_libs ${SDL_LIBRARY} ) +#Add Windows DLL resource file if using MSVC +IF(MSVC) + include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-video-sdl.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.rc + @ONLY) + + list(APPEND video_sdl_sources + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.rc + ) +ENDIF(MSVC) add_library(gnuradio-video-sdl SHARED ${video_sdl_sources}) target_link_libraries(gnuradio-video-sdl ${video_sdl_libs}) |