Commit 63d2b9b6 authored by Nick Laurenson's avatar Nick Laurenson
Browse files

Add PCL dependency in Superbuild

parent 1b517456
......@@ -122,6 +122,11 @@ set (CM_PROJECTS_ALL)
# Include all optional projects. These are the ones user can pick and choose.
# Some of these allow using system libraries too.
include(pcl)
include(flann)
include(zlib)
include(png)
include(qhull)
include(qt)
include(python)
include(pythonqt)
......
......@@ -6,11 +6,24 @@ if (APPLE)
message(STATUS "${boost_osx_opts}")
#macosx-version=${CMAKE_OSX_DEPLOYMENT_TARGET} macosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif(APPLE)
add_external_project_or_use_system(boost
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
<SOURCE_DIR>/bootstrap.sh ${boost_toolset} --prefix=<INSTALL_DIR>
--with-libraries=date_time,thread,regex,system,program_options,filesystem,iostreams,chrono
BUILD_COMMAND <SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi --with-regex --with-system --with-date_time --with-program_options --with-iostreams --with-filesystem --with-thread --with-chrono ${boost_osx_opts} --prefix=<INSTALL_DIR> install
<SOURCE_DIR>/bootstrap.sh
${boost_toolset}
--prefix=<INSTALL_DIR>
--with-libraries=mpi,date_time,thread,regex,system,program_options,filesystem,iostreams,chrono,serialization
BUILD_COMMAND
<SOURCE_DIR>/bjam
address-model=${VV_BUILD_ARCHITECTURE}
threading=multi
${boost_osx_opts}
--mmacosx-version-minprefix=<INSTALL_DIR>
install
INSTALL_COMMAND ""
)
add_external_project(flann
CMAKE_ARGS
-DBUILD_EXAMPLES:BOOL=OFF
-DBUILD_PYTHON_BINDINGS:BOOL=OFF
-DBUILD_MATLAB_BINDINGS:BOOL=OFF
)
\ No newline at end of file
cmake_minimum_required(VERSION 2.4.4)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
project(zlib C)
set(VERSION "1.2.7")
set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
include(CheckTypeSize)
include(CheckFunctionExists)
include(CheckIncludeFile)
include(CheckCSourceCompiles)
enable_testing()
check_include_file(sys/types.h HAVE_SYS_TYPES_H)
check_include_file(stdint.h HAVE_STDINT_H)
check_include_file(stddef.h HAVE_STDDEF_H)
#
# Check to see if we have large file support
#
set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
# We add these other definitions here because CheckTypeSize.cmake
# in CMake 2.4.x does not automatically do so and we want
# compatibility with CMake 2.4.x.
if(HAVE_SYS_TYPES_H)
list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
endif()
if(HAVE_STDINT_H)
list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
endif()
if(HAVE_STDDEF_H)
list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
endif()
check_type_size(off64_t OFF64_T)
if(HAVE_OFF64_T)
add_definitions(-D_LARGEFILE64_SOURCE=1)
endif()
set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
#
# Check for fseeko
#
check_function_exists(fseeko HAVE_FSEEKO)
if(NOT HAVE_FSEEKO)
add_definitions(-DNO_FSEEKO)
endif()
#
# Check for unistd.h
#
check_include_file(unistd.h Z_HAVE_UNISTD_H)
if(MSVC)
set(CMAKE_DEBUG_POSTFIX "d")
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
endif()
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
# If we're doing an out of source build and the user has a zconf.h
# in their source tree...
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
message(STATUS "Renaming")
message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
message(STATUS "to 'zconf.h.included' because this file is included with zlib")
message(STATUS "but CMake generates it automatically in the build directory.")
file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
endif()
endif()
set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
${ZLIB_PC} @ONLY)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
#============================================================================
# zlib
#============================================================================
set(ZLIB_PUBLIC_HDRS
${CMAKE_CURRENT_BINARY_DIR}/zconf.h
zlib.h
)
set(ZLIB_PRIVATE_HDRS
crc32.h
deflate.h
gzguts.h
inffast.h
inffixed.h
inflate.h
inftrees.h
trees.h
zutil.h
)
set(ZLIB_SRCS
adler32.c
compress.c
crc32.c
deflate.c
gzclose.c
gzlib.c
gzread.c
gzwrite.c
inflate.c
infback.c
inftrees.c
inffast.c
trees.c
uncompr.c
zutil.c
)
if(NOT MINGW)
set(ZLIB_SRCS ${ZLIB_SRCS}
win32/zlib1.rc # If present will override custom build rule below.
)
endif()
# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
"\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
if(MINGW)
# This gets us DLL resource information when compiling on MinGW.
if(NOT CMAKE_RC_COMPILER)
SET(CMAKE_RC_COMPILER windres.exe)
endif()
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
COMMAND ${CMAKE_RC_COMPILER}
-D GCC_WINDRES
-I ${CMAKE_CURRENT_SOURCE_DIR}
-I ${CMAKE_CURRENT_BINARY_DIR}
-o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
endif(MINGW)
add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
set_target_properties(zlib PROPERTIES SOVERSION 1)
if(NOT CYGWIN)
# This property causes shared libraries on Linux to have the full version
# encoded into their final filename. We disable this on Cygwin because
# it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
# seems to be the default.
#
# This has no effect with MSVC, on that platform the version info for
# the DLL comes from the resource file win32/zlib1.rc
set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
endif()
if(UNIX)
# On unix-like platforms the library is almost always called libz
set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
if (NOT APPLE)
# FIXME: Don't add --version-script option on Macs.
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map")
endif()
elseif(BUILD_SHARED_LIBS AND WIN32)
# Creates zlib1.dll when building shared library version
set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
endif()
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
install(TARGETS zlib zlibstatic
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
endif()
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
endif()
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
endif()
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
endif()
#============================================================================
# Example binaries
#============================================================================
add_executable(example test/example.c)
target_link_libraries(example zlib)
add_test(example example)
add_executable(minigzip test/minigzip.c)
target_link_libraries(minigzip zlib)
if(HAVE_OFF64_T)
add_executable(example64 test/example.c)
target_link_libraries(example64 zlib)
set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
add_test(example64 example64)
add_executable(minigzip64 test/minigzip.c)
target_link_libraries(minigzip64 zlib)
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
endif()
\ No newline at end of file
add_external_project(pcl
DEPENDS flann eigen boost png zlib qhull
CMAKE_ARGS
-DCMAKE_CXX_STANDARD=11
-DCMAKE_CXX_STANDARD_REQUIRED=true
-DBOOST_ROOT:PATH=<INSTALL_DIR>
-DBOOST_LIBRARYDIR:PATH=<INSTALL_DIR>/lib
-DBUILD_visualization:BOOL=OFF
-DBUILD_examples:BOOL=OFF
-DBUILD_tools:BOOL=OFF
-DBUILD_OPENNI:BOOL=OFF
-DBUILD_recognition:BOOL=OFF
-DEIGEN_INCLUDE_DIR=<INSTALL_DIR>/include/eigen3
-DWITH_PNG:BOOL=ON
-DQHULL_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qhullstatic${CMAKE_STATIC_LIBRARY_SUFFIX}
-DQHULL_LIBRARY_DEBUG:FILEPATH=<INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qhullstatic${CMAKE_STATIC_LIBRARY_SUFFIX}
-DWITH_OPENNI:BOOL=OFF
-DWITH_QT:BOOL=OFF
-DWITH_VTK:BOOL=OFF
-DWITH_LIBUSB:BOOL=OFF
-DWITH_PCAP:BOOL=OFF
-DWITH_FZAPI:BOOL=OFF
-DWITH_PXCAPI:BOOL=OFF
-DWITH_MPI:BOOL=OFF
-DWITH_CUDA:BOOL=OFF
-DWITH_DOCS:BOOL=OFF
)
add_external_project(png
DEPENDS zlib
CMAKE_ARGS
-DPNG_TESTS:BOOL=OFF
# VTK uses API that gets hidden when PNG_NO_STDIO is TRUE (default).
-DPNG_NO_STDIO:BOOL=OFF
)
\ No newline at end of file
## Builds qhull from git://gitorious.org/qhull/qhull.git
if(CMAKE_BUILD_TYPE MATCHES "[dD]ebug")
set(qhull_STATIC qhullstatic_d)
else()
set(qhull_STATIC qhullstatic)
endif()
add_external_project(qhull
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>/qhull
-Dqhull_TARGETS_INSTALL=${qhull_STATIC}
)
\ No newline at end of file
......@@ -8,4 +8,7 @@ add_external_project(veloview
-DEIGEN_INCLUDE_DIR:PATH=<INSTALL_DIR>/include/eigen3
-DPYTHONQT_DIR:PATH=<INSTALL_DIR>
-DVTK_DIR:PATH=${SuperBuild_BINARY_DIR}/paraview/src/paraview-build/VTK
-DBOOST_ROOT:PATH=<INSTALL_DIR>
-DBOOST_LIBRARYDIR:PATH=<INSTALL_DIR>/lib
-DPCL_DIR:PATH=<INSTALL_DIR>/share/pcl-1.8/
)
# zlib supports cmake. the only problem is that we need to remove the zconf.h
# file.
add_external_project_or_use_system(
zlib
# remove the zconf.h as a patch step.
PATCH_COMMAND ${CMAKE_COMMAND} -E remove -f <SOURCE_DIR>/zconf.h
)
#-------------------------------------------------------
# zlib needs a fix for '--version-script' linker option. The option needs to be
# removed on Macs. The fix to CMakeLists.txt works for all OSs.
add_external_project_step(patch_zlib_cmakelists
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${SuperBuild_PROJECTS_DIR}/patches/zlib.CMakeLists.txt"
"<SOURCE_DIR>/CMakeLists.txt"
DEPENDEES update # do after update
DEPENDERS patch # do before patch
)
\ No newline at end of file
......@@ -60,8 +60,8 @@ add_revision(boost
URL_MD5 7b493c08bc9557bbde7e29091f28b605)
add_revision(eigen
URL http://vtk.org/files/support/eigen-3.1.2.tar.gz
URL_MD5 bb639388192cb80f1ee797f5dbdbe74f)
GIT_REPOSITORY https://github.com/eigenteam/eigen-git-mirror.git
GIT_TAG 3.2.0)
#add_revision(liblas
# GIT_REPOSITORY git://github.com/libLAS/libLAS
......@@ -69,3 +69,24 @@ add_revision(eigen
add_revision(liblas
GIT_REPOSITORY git://github.com/bastienjacquet/libLAS.git
GIT_TAG fix-windows-stdint)
add_revision(pcl
GIT_REPOSITORY git://github.com/PointCloudLibrary/pcl.git
GIT_TAG pcl-1.8.1)
add_revision(qhull
GIT_REPOSITORY git://github.com/qhull/qhull.git
GIT_TAG master)
add_revision(flann
GIT_REPOSITORY git://github.com/gcasey/flann.git
GIT_TAG 6f6eabaf4e3741f556a12255a0d750b35bf166c0)
add_revision(zlib
URL "http://www.paraview.org/files/dependencies/zlib-1.2.7.tar.gz"
URL_MD5 60df6a37c56e7c1366cca812414f7b85)
# NOTE: if updating zlib version, fix patch in zlib.cmake
add_revision(png
URL "http://paraview.org/files/dependencies/libpng-1.4.8.tar.gz"
URL_MD5 49c6e05be5fa88ed815945d7ca7d4aa9)
\ 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