Now coding tests compile and pass.

3 files changed, 91 insertions, 68 deletions

diff --git a/3party/minizip/CMakeLists.txt b/3party/minizip/CMakeLists.txt
new file mode 100644
index 0000000000..cbcee9962e
--- /dev/null
+++ b/3party/minizip/CMakeLists.txt
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.2)
+
+project(minizip C CXX)
+
+add_compile_options(
+    "-Wall"
+    "-pedantic"
+)
+
+add_definitions(-DUSE_FILE32ZPI -DNOCRYPT)
+
+set(
+    SRC
+    ioapi.c
+    ioapi.h
+    unzip.c
+    unzip.h
+    zip.c
+    zip.h
+)
+
+add_library(minizip ${SRC})
+set_target_properties(minizip PROPERTIES ENABLE_EXPORTS ON)
diff --git a/3party/succinct/CMakeLists.txt b/3party/succinct/CMakeLists.txt
index efdcee594f..6ad024e8ac 100644
--- a/3party/succinct/CMakeLists.txt
+++ b/3party/succinct/CMakeLists.txt
@@ -1,68 +1,43 @@
-cmake_minimum_required(VERSION 2.6)
-project(SUCCINCT)
-
-configure_file(
-  ${SUCCINCT_SOURCE_DIR}/succinct_config.hpp.in
-  ${SUCCINCT_SOURCE_DIR}/succinct_config.hpp)
-
-option(SUCCINCT_USE_LIBCXX
-  "Use libc++ with Clang instead of libstdc++ (must be same as that used to compile Boost)"
-  OFF)
-option(SUCCINCT_USE_INTRINSICS
-  "Use a set of intrinsics available on all x86-64 architectures"
-  ON)
-option(SUCCINCT_USE_POPCNT
-  "Use popcount intrinsic. Available on x86-64 since SSE4.2."
-  OFF)
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-   if (SUCCINCT_USE_LIBCXX)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-   endif ()
-endif ()
-
-if (SUCCINCT_USE_POPCNT)
-  if (UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2")
-  endif ()
-  # XXX(ot): what to do for MSVC?
-endif ()
-
-
-# XXX(ot): enable this on all compilers
-if (UNIX)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-missing-braces")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wconversion")
-endif ()
-
-
-find_package(Boost 1.42.0 COMPONENTS
-  unit_test_framework iostreams system filesystem REQUIRED)
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories (${Boost_LIBRARY_DIRS})
-
-include_directories(${PROJECT_SOURCE_DIR})
-
-set(SUCCINCT_SOURCES
-  rs_bit_vector.cpp
-  bp_vector.cpp
-  )
-
-add_library(succinct STATIC ${SUCCINCT_SOURCES})
-
-add_subdirectory(perftest)
-
-# make and run tests only if library is compiled stand-alone
-if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-  enable_testing()
-  file(GLOB SUCCINCT_TEST_SOURCES test_*.cpp)
-  foreach(TEST_SRC ${SUCCINCT_TEST_SOURCES})
-    get_filename_component (TEST_SRC_NAME ${TEST_SRC} NAME_WE)
-    add_executable(${TEST_SRC_NAME} ${TEST_SRC})
-    target_link_libraries(${TEST_SRC_NAME}
-      succinct
-      ${Boost_LIBRARIES}
-      )
-    add_test(${TEST_SRC_NAME} ${TEST_SRC_NAME})
-  endforeach(TEST_SRC)
-endif ()
+cmake_minimum_required(VERSION 3.2)
+
+project(succinct C CXX)
+
+add_compile_options(
+    "-Wall"
+    "-pedantic"
+    "-std=c++11"
+)
+
+add_definitions(-DLTC_NO_ROLC)
+
+include_directories(src/headers)
+
+set(
+    SRC
+    bit_vector.hpp
+    bp_vector.cpp 
+    bp_vector.hpp
+    broadword.hpp
+    cartesian_tree.hpp
+    darray.hpp
+    darray64.hpp
+    elias_fano_compressed_list.hpp
+    elias_fano_list.hpp
+    elias_fano.hpp
+    forward_enumerator.hpp
+    gamma_bit_vector.hpp
+    gamma_vector.hpp
+    intrinsics.hpp
+    mappable_vector.hpp
+    mapper.hpp
+    nibble_vector.hpp
+    rs_bit_vector.cpp
+    rs_bit_vector.hpp
+    tables.hpp
+    topk_vector.hpp
+    util.hpp
+    vbyte.hpp
+)
+
+add_library(succinct ${SRC})
+set_target_properties(succinct PROPERTIES ENABLE_EXPORTS ON)
diff --git a/3party/tomcrypt/CMakeLists.txt b/3party/tomcrypt/CMakeLists.txt
new file mode 100644
index 0000000000..fd1c084b0f
--- /dev/null
+++ b/3party/tomcrypt/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.2)
+
+project(tomcrypt C CXX)
+
+add_compile_options(
+    "-Wall"
+    "-pedantic"
+)
+
+add_definitions(-DLTC_NO_ROLC)
+
+include_directories(src/headers)
+
+set(
+    SRC
+    src/hashes/sha2/sha256.c
+    src/headers/tomcrypt.h
+    src/headers/tomcrypt_misc.h
+    src/misc/base64/base64_decode.c
+    src/misc/base64/base64_encode.c
+    src/misc/crypt/crypt_argchk.c 
+)
+
+add_library(tomcrypt ${SRC})
+set_target_properties(tomcrypt PROPERTIES ENABLE_EXPORTS ON)