diff options
| author |   Aaron Mavrinac <mavrinac@gmail.com> | 2012-02-20 17:53:41 -0500 |
|---|---|---|
| committer | Aaron Mavrinac <mavrinac@gmail.com> | 2012-02-20 17:53:41 -0500 |
| commit | c70f1ccde8cb93fea643ea729a55b6a12ae9b5a4 (patch) | |
| tree | baa535ffe3eaafd4020bd1ddfc2cfc455c1aaadb | |
| parent | Remove retroshare from package list. (diff) | |
| download | ezod-c70f1ccde8cb93fea643ea729a55b6a12ae9b5a4.tar.gz ezod-c70f1ccde8cb93fea643ea729a55b6a12ae9b5a4.tar.bz2 ezod-c70f1ccde8cb93fea643ea729a55b6a12ae9b5a4.zip | |
Update USE flag handling in sci-libs/pcl.
| -rw-r--r-- | sci-libs/pcl/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/pcl/files/pcl-1.4.0-with.patch | 36 | ||||
| -rw-r--r-- | sci-libs/pcl/pcl-1.4.0.ebuild | 20 |
3 files changed, 49 insertions, 10 deletions
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 209abed..61b7c01 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1,3 +1,4 @@ AUX pcl-1.4.0-vtk.patch 2443 RMD160 26823e6d3b00ea32470d00a33fdea2353662f64b SHA1 b4b76b6953d4e8c93ff3f7574eda9f20c5cdbf7b SHA256 b388627bf89c16b6d5e682314311c4b9ddc4c49b7eb0c4f17d99fbc0b767280d +AUX pcl-1.4.0-with.patch 865 RMD160 e83ecd3d2aab276a3dcccbdd38ec61bed3dc5310 SHA1 f37d86a7bca5a43a507f7d4fafc29fb1074c6a13 SHA256 77acdee9fecfcfcf33de997124b3d1bafe0005a40f5c4b5041925bd32132a093 DIST PCL-1.4.0-Source.tar.bz2 10626702 RMD160 440de4c12c4aba81d2b6197180df85e008eef4d9 SHA1 dc2f89cfafb098c27291549115d39cc6b425d31f SHA256 20d49246773bb54d4b9e133ef3b8b5081c94d1677d823cc0c2d03bcd5bf30a2b -EBUILD pcl-1.4.0.ebuild 1533 RMD160 45fc73729892ec5d48a97f03f62e7db2d085af73 SHA1 aa22d42a925c7e43a4dd1eb5fec25be9cb4a24c2 SHA256 4d8d214b7daf81eb39a97a07a64b6183d1c2fe101b570499905ca2af01022fe7 +EBUILD pcl-1.4.0.ebuild 1504 RMD160 7fb38b0be469b78edf295c8bd0794ef887240abc SHA1 405b99449b0de5512a5e6ce9bef21ff182867f2a SHA256 f085f3c139398493be89510f7290040b1e7debe8eea5da58c0b7c3bb22193168 diff --git a/sci-libs/pcl/files/pcl-1.4.0-with.patch b/sci-libs/pcl/files/pcl-1.4.0-with.patch new file mode 100644 index 0000000..357fcd6 --- /dev/null +++ b/sci-libs/pcl/files/pcl-1.4.0-with.patch @@ -0,0 +1,36 @@ +--- PCL-1.4.0-Source.old/CMakeLists.txt 2012-01-01 20:39:43.000000000 -0500 ++++ PCL-1.4.0-Source/CMakeLists.txt 2012-02-20 17:21:10.000000000 -0500 +@@ -128,13 +128,19 @@ + # OpenMP + include(${PCL_SOURCE_DIR}/cmake/pcl_openmp.cmake) + # OpenNI +-find_package(OpenNI) ++if(WITH_OPENNI) ++ find_package(OpenNI) ++endif() + # Qhull +-find_package(Qhull) ++if(WITH_QHULL) ++ find_package(Qhull) ++endif() + # Find ROS + include(${PCL_SOURCE_DIR}/cmake/pcl_find_ros.cmake) + # Find VTK +-find_package(VTK) ++if(WITH_VTK) ++ find_package(VTK) ++endif() + if(VTK_FOUND) + set(VTK_FOUND TRUE) + message(STATUS "VTK found (include: ${VTK_INCLUDE_DIRS}, lib: ${VTK_LIBRARY_DIRS})") +@@ -142,7 +148,9 @@ + set(HAVE_VTK ON) + endif() + #Find MPI +-find_package(MPI) ++if(WITH_MPI) ++ find_package(MPI) ++endif() + if(MPI_CXX_FOUND) + include_directories(${MPI_INCLUDE_PATH}) + endif(MPI_CXX_FOUND) diff --git a/sci-libs/pcl/pcl-1.4.0.ebuild b/sci-libs/pcl/pcl-1.4.0.ebuild index 428a236..f690905 100644 --- a/sci-libs/pcl/pcl-1.4.0.ebuild +++ b/sci-libs/pcl/pcl-1.4.0.ebuild @@ -15,18 +15,22 @@ SRC_URI="http://dev.pointclouds.org/attachments/download/610/${MY_P}-Source.tar. LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cuda qhull sse sse2 sse3 ssse3" +IUSE="cuda mpi qhull +vtk" RDEPEND=" >=dev-libs/boost-1.46 dev-cpp/eigen:3 >=sci-libs/flann-1.7.1 - >=sci-libs/vtk-5.6.0 cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) + mpi? ( virtual/mpi ) qhull? ( >=media-libs/qhull-2011.1 ) + vtk? ( >=sci-libs/vtk-5.6.0 ) " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${P}-with.patch" +) CMAKE_BUILD_TYPE="Release" @@ -42,23 +46,21 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(cmake-utils_use_enable sse SSE) - $(cmake-utils_use_enable sse2 SSE2) - $(cmake-utils_use_enable sse3 SSE3) - $(cmake-utils_use_enable ssse3 SSSE3) + $(cmake-utils_use_with mpi) $(cmake-utils_use_with qhull) + $(cmake-utils_use_with vtk) $(cmake-utils_use_build test TESTS) ) if use cuda; then if [[ "$(gcc-version)" > "4.4" ]]; then ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support." - mycmakeargs+=( "-DWITH_CUDA=OFF" ) + mycmakeargs+=( "-DHAVE_CUDA=OFF" ) else - mycmakeargs+=( "-DWITH_CUDA=ON" ) + mycmakeargs+=( "-DHAVE_CUDA=ON" ) fi else - mycmakeargs+=( "-DWITH_CUDA=OFF" ) + mycmakeargs+=( "-DHAVE_CUDA=OFF" ) fi # no openni support yet |