diff options
| author | Sebastien Braun | 2010-07-15 01:12:17 +0200 |
|---|---|---|
| committer | Sebastien Braun | 2010-07-15 01:12:17 +0200 |
| commit | 94b88e75b9ebeaf9abb2adef130fdf971884e7b4 (patch) | |
| tree | cc0bb545880b0d159267290d7aa5c63693905dcb /3rdparty/CMakeLists.txt | |
| parent | Change to shorter NAK intervals for performance. (diff) | |
| download | pvs-94b88e75b9ebeaf9abb2adef130fdf971884e7b4.tar.gz pvs-94b88e75b9ebeaf9abb2adef130fdf971884e7b4.tar.xz pvs-94b88e75b9ebeaf9abb2adef130fdf971884e7b4.zip | |
* Upgrade OpenPGM to current trunk
* Implement wait-for-shutdown for McastPGMSocket
* Work around bug in UDP encapsulation
Diffstat (limited to '3rdparty/CMakeLists.txt')
| -rw-r--r-- | 3rdparty/CMakeLists.txt | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 8a4cea0..e7676b6 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -6,14 +6,9 @@ INCLUDE(../OpenPGMConfig.cmake) ADD_DEFINITIONS(${LIBPGM_CFLAGS}) -# Set up build -SET(pgm_VERSION - 5.0.63alpha1 -) - # OpenPGM will be built in the binary tree SET(pgm - ${CMAKE_CURRENT_BINARY_DIR}/libpgm-src/openpgm/pgm + "${CMAKE_CURRENT_SOURCE_DIR}/openpgm-${pgm_VERSION}/pgm" ) # This has been adapted from SConscript.libpgm @@ -106,6 +101,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.c DEPENDS ${pgm}/version_generator.py ) +IF(comment_this_out_we_dont_need_it) # ... and we need to unpack the tree. ADD_CUSTOM_COMMAND( OUTPUT @@ -115,9 +111,11 @@ ADD_CUSTOM_COMMAND( ${pgm}/version_generator.py DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/libpgm-${pgm_VERSION}.tar.bz2" + "${CMAKE_CURRENT_SOURCE_DIR}/01-libpgm-fix-switch-fallthrough.patch" COMMAND rm -rf "${CMAKE_CURRENT_BINARY_DIR}/libpgm-src" COMMAND bzip2 -dc "${CMAKE_CURRENT_SOURCE_DIR}/libpgm-${pgm_VERSION}.tar.bz2" | tar -C "${CMAKE_CURRENT_BINARY_DIR}" -x - COMMAND mv "${CMAKE_CURRENT_BINARY_DIR}/libpgm-${pgm_VERSION}" "${CMAKE_CURRENT_BINARY_DIR}/libpgm-src" + COMMAND mv "${CMAKE_CURRENT_BINARY_DIR}/libpgm-${pgm_VERSION}" "${CMAKE_CURRENT_BINARY_DIR}/libpgm-src" + COMMAND cd ${pgm} && patch -p1 < "${CMAKE_CURRENT_SOURCE_DIR}/01-libpgm-fix-switch-fallthrough.patch" ) ADD_CUSTOM_COMMAND(TARGET clean @@ -128,11 +126,7 @@ ADD_CUSTOM_TARGET( unpack_libpgm DEPENDS ${pgm_SRCS} ${pgm_HDRS} ) - -INCLUDE_DIRECTORIES( - ${pgm}/include - ${GLIB_INCLUDES_DIRS} -) +ENDIF(comment_this_out_we_dont_need_it) ADD_LIBRARY( pgm @@ -153,4 +147,3 @@ LINK_DIRECTORIES( ADD_DEFINITIONS( ${GLIB_CFLAGS} ) - |