Permalink
Browse files

Merge branch 'filestream'

Conflicts:
	CMakeLists.txt
	test/speed_regression/CMakeLists.txt
	test/speed_regression/priority_queue.cpp
	test/speed_regression/sort.cpp
	test/speed_regression/stream.cpp
	tpie/CMakeLists.txt
	tpie/sysinfo.h
  • Loading branch information...
Mortal committed May 24, 2012
2 parents a8e9ef6 + 0884cc6 commit f611a2b14457edcb47e6c13467f4d7bcd24405fd
Showing 320 changed files with 16,338 additions and 9,728 deletions.
View
@@ -1,10 +1,13 @@
*.pyc
*.orig
*~
.*.swp
.swp
CMakeCache.txt
CMakeFiles
CMakeLists.txt.user
/build*
/example/build*
*#
.#*
/doc/tpie.aux
@@ -18,3 +21,5 @@ CMakeLists.txt.user
/doc/tpie.pdf
/doc/tpie.toc
.clang-completion-error
/Release
tags
View
40 AUTHORS

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 2.6)
# doc/CMakeLists.txt uses configure_file behavior from CMake 2.8
cmake_minimum_required(VERSION 2.8)
project(tpie)
@@ -12,6 +13,10 @@ if(NOT WIN32)
add_definitions("-Wall -Wextra")
endif(NOT WIN32)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
add_definitions("-Wno-c++11-extensions")
endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if(WIN32)
add_definitions("-DWIN32_LEAN_AND_MEAN")
endif(WIN32)
@@ -39,13 +44,6 @@ if(Boost_FOUND)
link_directories ( ${Boost_LIBRARY_DIRS} )
endif(Boost_FOUND)
## Intel Threading Building Blocks
find_package(TBB)
if(TBB_FOUND)
include_directories(${TBB_INCLUDE_DIRS})
link_directories(${TBB_LIBRARY_DIRS})
endif(TBB_FOUND)
check_include_files("unistd.h" TPIE_HAVE_UNISTD_H)
check_include_files("sys/unistd.h" TPIE_HAVE_SYS_UNISTD_H)
@@ -80,10 +78,10 @@ else()
option(TPIE_NDEBUG "Disable debugging information" ON)
endif()
set(S ${CMAKE_CURRENT_SOURCE_DIR}/cpp0xtest)
set(D ${CMAKE_CURRENT_BINARY_DIR}/cpp0xtest)
try_compile(TPIE_CPP_VARIADIC_TEMPLATES ${D}/variadic_templates ${S}/variadic_templates.cpp)
try_compile(TPIE_CPP_RVALUE_REFERENCE ${D}/rvalueref ${S}/rvalueref.cpp)
set(TPIE_S ${CMAKE_CURRENT_SOURCE_DIR})
set(TPIE_B ${CMAKE_CURRENT_BINARY_DIR})
try_compile(TPIE_CPP_VARIADIC_TEMPLATES ${TPIE_B}/cpp0xtest/variadic_templates ${TPIE_S}/cpp0xtest/variadic_templates.cpp)
try_compile(TPIE_CPP_RVALUE_REFERENCE ${TPIE_B}/cpp0xtest/rvalueref ${TPIE_S}/cpp0xtest/rvalueref.cpp)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tpie/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tpie/config.h)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tpie/config.h DESTINATION ${HEADERS_INSTALL_DIR})
@@ -92,18 +90,50 @@ add_subdirectory(tpie)
add_subdirectory(doc)
option(COMPILE_TEST "Compile test programs" ON)
option(TPIE_USE_EXCEPTIONS "Throw exceptions on certain errors." ON)
option(DEBUG_ASSERTIONS "Enable tpie_assert." OFF)
option(TPL_LOGGING "Enable tpie logging." ON)
option(TPIE_THREADSAFE_MEMORY_MANAGEMNT "Thread safe memory managment" ON)
option(TPIE_FRACTION_STATS "Output fraction statistics" OFF)
option(TPIE_DEPRECATED_WARNINGS "Enable warnings for deprecated classes, methods and typedefs" OFF)
option(TPIE_PARALLEL_SORT "Enable parallel quick sort implementation" ON)
if (COMPILE_TEST)
ENABLE_TESTING()
add_subdirectory(test)
add_subdirectory(apps)
endif (COMPILE_TEST)
include(CPack)
include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_CONTACT "rav@cs.au.dk")
set(CPACK_GENERATOR TGZ)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "TPIE")
set(CPACK_PACKAGE_VENDOR "The TPIE maintainers")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.md")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "TPIE ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
if(WIN32 AND NOT UNIX)
# There is a bug in NSI that does not handle full unix paths properly. Make
# sure there is at least one set of four (4) backlasshes.
#set(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\thomasmoelhave.github.com/tpie/")
set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\thomasmoelhave.github.com/tpie/")
set(CPACK_NSIS_CONTACT ${CPACK_PACKAGE_CONTACT})
set(CPACK_NSIS_MODIFY_PATH ON)
list(APPEND CPACK_GENERATOR NSIS)
else(WIN32 AND NOT UNIX)
list(APPEND CPACK_GENERATOR DEB)
endif(WIN32 AND NOT UNIX)
install(DIRECTORY tpie
DESTINATION include
FILES_MATCHING REGEX "\\.h$|\\.inl$"
PATTERN "deadcode" EXCLUDE)
install(DIRECTORY share/tpie
DESTINATION share)
include(CPack)
Oops, something went wrong.

0 comments on commit f611a2b

Please sign in to comment.