Commit 008d7714 authored by David Partyka's avatar David Partyka
Browse files

Merge branch 'vrpn' into release

parents 3d755cf5 6e7f1ce6
...@@ -13,7 +13,8 @@ ExternalProject_Add(VRPN ...@@ -13,7 +13,8 @@ ExternalProject_Add(VRPN
CMAKE_CACHE_ARGS CMAKE_CACHE_ARGS
-DCMAKE_CXX_FLAGS:STRING=${pv_tpl_cxx_flags} -DCMAKE_CXX_FLAGS:STRING=${pv_tpl_cxx_flags}
-DCMAKE_C_FLAGS:STRING=${pv_tpl_c_flags} -DCMAKE_C_FLAGS:STRING=${pv_tpl_c_flags}
-DCMAKE_BUILD_TYPE:STRING=OFF -DBUILD_SHARED_LIBS:BOOL=OFF
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
${pv_tpl_compiler_args} ${pv_tpl_compiler_args}
CMAKE_ARGS CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
......
...@@ -141,10 +141,19 @@ set(PNG_URL ftp://ftp.simplesystems.org/pub/libpng/png/src) ...@@ -141,10 +141,19 @@ set(PNG_URL ftp://ftp.simplesystems.org/pub/libpng/png/src)
set(PNG_GZ libpng-${PNG_VERSION}.tar.gz) set(PNG_GZ libpng-${PNG_VERSION}.tar.gz)
set(PNG_MD5 220035f111ea045a51e290906025e8b5) set(PNG_MD5 220035f111ea045a51e290906025e8b5)
set(VRPN_MAJOR 4) if(WIN32)
set(VRPN_MINOR 4) set(VRPN_MAJOR 4)
set(VRPN_PATCH 2011) set(VRPN_MINOR 4)
set(VRPN_VERSION ${VRPN_MAJOR}.${VRPN_MINOR}.${VRPN_PATCH}) set(VRPN_PATCH 2011)
set(VRPN_URL http://paraview.org/files/misc) set(VRPN_VERSION ${VRPN_MAJOR}.${VRPN_MINOR}.${VRPN_PATCH})
set(VRPN_GZ vrpn-${VRPN_VERSION}.tar.gz) set(VRPN_URL http://paraview.org/files/misc)
set(VRPN_MD5 aa88a400d31fd1290e0b1ba7810ee7c7) set(VRPN_GZ vrpn-${VRPN_VERSION}.tar.gz)
set(VRPN_MD5 aa88a400d31fd1290e0b1ba7810ee7c7)
else()
set(VRPN_MAJOR 07)
set(VRPN_MINOR 28)
set(VRPN_VERSION ${VRPN_MAJOR}.${VRPN_MINOR})
set(VRPN_URL ftp://ftp.cs.unc.edu/pub/packages/GRIP/vrpn)
set(VRPN_GZ vrpn_${VRPN_MAJOR}_${VRPN_MINOR}.zip)
set(VRPN_MD5 1eaf2afdc54a4faef8ff8eb7e0484ec6)
endif()
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment