Skip to content

Commit

Permalink
Add missing ALL case to makeCollector().
Browse files Browse the repository at this point in the history
  • Loading branch information
folded committed Feb 13, 2011
0 parents commit 89efbd1
Show file tree
Hide file tree
Showing 1,482 changed files with 573,684 additions and 0 deletions.
78 changes: 78 additions & 0 deletions .hgignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
syntax: glob

# backup files, etc.

*~
*.sw?

# autotools generated

aclocal.m4
autom4te.cache/output.0
autom4te.cache/output.1
autom4te.cache/requests
autom4te.cache/traces.0
autom4te.cache/traces.1
config.log
config.status
configure
include/carve/config.h
include/carve/stamp-h2
include/carve_config.h
include/carve_config.h.in
include/stamp-h1
libtool

# cmake generated

CMakeFiles

# debug info

*.dSYM

# regression test results

regression/*/test_*

# produced by compilation

*.la
*.o
*.lo
*.Plo
*.a
*.Po
*.dylib
*.so
Makefile.in
Makefile

.libs
.deps

# generated executables

src/convert
src/custom_collector
src/cutgraph
src/intersect
src/problem
src/test_aabb
src/test_aabb_tri
src/test_csg_interpolate
src/test_eigen
src/test_geom
src/test_hole_incorporate
src/test_interpolate
src/test_intersect
src/test_rescale
src/test_slice
src/test_slice_classify
src/test_spacetree
src/test_triangulate
src/tetrahedron
src/texture_example
src/triangulate
src/view

1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Toby Sargeant <[email protected]>
118 changes: 118 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
cmake_minimum_required(VERSION 2.6)

project(carve)

set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

set(carve_VERSION_MAJOR 1)
set(carve_VERSION_MINOR 2)
set(carve_VERSION_PATCH 0)

set(CARVE_VERSION ${carve_VERSION_MAJOR}.${carve_VERSION_MINOR}.${carve_VERSION_PATCH})

option(BUILD_SHARED_LIBS "Compile libcarve as shared" ON)
option(CARVE_WITH_GUI "Compile gui code" ON)
option(CARVE_SYSTEM_BOOST "Compile with system installed boost" ON)
option(CARVE_BOOST_COLLECTIONS "Compile with boost collections" ON)
option(CARVE_DEBUG "Compile in debug code" OFF)
option(CARVE_DEBUG_WRITE_PLY_DATA "Write geometry output during debug" OFF)



if(WIN32)
set(BUILD_SHARED_LIBS OFF) # until everything is exported
add_definitions(-D_USE_MATH_DEFINES)
add_definitions(-DNOMINMAX)
endif(WIN32)

set(HAVE_TR1_UNORDERED_COLLECTIONS FALSE)
set(HAVE_STD_UNORDERED_COLLECTIONS FALSE)
set(HAVE_LIBSTDCPP_UNORDERED_COLLECTIONS FALSE)

set(HAVE_BOOST_UNORDERED_COLLECTIONS FALSE)

if(CARVE_SYSTEM_BOOST)
find_package(BOOST 1.40)
if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
message(STATUS "Using system boost")
else(Boost_FOUND)
set(CARVE_SYSTEM_BOOST OFF)
endif(Boost_FOUND)
endif(CARVE_SYSTEM_BOOST)

if(CARVE_BOOST_COLLECTIONS)
set(HAVE_BOOST_UNORDERED_COLLECTIONS TRUE)

else(CARVE_BOOST_COLLECTIONS)
# attempt to work out which unordered collection implementation we can use
try_compile(_HAVE_STD_UNORDERED_COLLECTIONS
${CMAKE_BINARY_DIR}
"${carve_SOURCE_DIR}/cmake/test_std_unordered.cpp"
OUTPUT_VARIABLE OUTPUT)
try_compile(_HAVE_TR1_UNORDERED_COLLECTIONS
${CMAKE_BINARY_DIR}
"${carve_SOURCE_DIR}/cmake/test_tr1_unordered.cpp"
OUTPUT_VARIABLE OUTPUT)
try_compile(_HAVE_LIBSTDCPP_UNORDERED_COLLECTIONS
${CMAKE_BINARY_DIR}
"${carve_SOURCE_DIR}/cmake/test_libstdcpp_unordered.cpp"
OUTPUT_VARIABLE OUTPUT)

if(_HAVE_STD_UNORDERED_COLLECTIONS)
set(HAVE_STD_UNORDERED_COLLECTIONS TRUE)
message(STATUS "Using std::unordered_map")
elseif(_HAVE_TR1_UNORDERED_COLLECTIONS)
set(HAVE_TR1_UNORDERED_COLLECTIONS TRUE)
message(STATUS "Using tr1::unordered_map")
elseif(_HAVE_LIBSTDCPP_UNORDERED_COLLECTIONS)
set(HAVE_LIBSTDCPP_UNORDERED_COLLECTIONS TRUE)
message(STATUS "Using __gnu_cxx::unordered_map ")
endif(_HAVE_STD_UNORDERED_COLLECTIONS)

endif(CARVE_BOOST_COLLECTIONS)

if(CARVE_WITH_GUI)
find_package(OpenGL)
find_package(GLUT)

if(NOT OPENGL_FOUND)
message(WARNING "Unable to locate OpenGL")
set(CARVE_WITH_GUI OFF)

elseif(NOT GLUT_FOUND)
message(WARNING "Unable to locate GLUT")
set(CARVE_WITH_GUI OFF)

else(OPENGL_FOUND AND GLUT_FOUND)
message(STATUS "Found OpenGL and GLUT")
include_directories(${OPENGL_INCLUDE_DIR})
include_directories(${GLUT_INCLUDE_DIR})
if(WIN32)
add_definitions(-DGLUI_NO_LIB_PRAGMA)
add_definitions(-DGLUI_USE_STATIC_LIB)
add_definitions(-DGLEW_STATIC)
endif(WIN32)
add_subdirectory(external/GLEW)
add_subdirectory(external/GLUI)

endif(NOT OPENGL_FOUND)

endif(CARVE_WITH_GUI)

add_subdirectory(external/GLOOP)
add_subdirectory(external/gtest-1.5.0)

configure_file (
"${carve_SOURCE_DIR}/include/carve/cmake-config.h.in"
"${carve_BINARY_DIR}/include/carve/config.h"
)
include_directories(${carve_BINARY_DIR}/include)

add_subdirectory(lib)
add_subdirectory(include)
add_subdirectory(common)
add_subdirectory(src)
add_subdirectory(examples)
add_subdirectory(tests)
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
2009-06-01 Tobias Sargeant <[email protected]>

* Carve: initial GPL2 release.
Loading

0 comments on commit 89efbd1

Please sign in to comment.