Skip to content

Commit

Permalink
moved stuff around
Browse files Browse the repository at this point in the history
  • Loading branch information
martinus committed Feb 18, 2019
1 parent f29c7f6 commit 1239614
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "src/3rdparty/abseil-cpp"]
path = src/3rdparty/abseil-cpp
[submodule "external/abseil-cpp"]
path = external/abseil-cpp
url = https://github.com/abseil/abseil-cpp.git
[submodule "src/3rdparty/folly"]
path = src/3rdparty/folly
[submodule "external/folly"]
path = external/folly
url = https://github.com/facebook/folly.git
24 changes: 12 additions & 12 deletions src/CMakeLists.txt → CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ project (map_benchmark)
# set(CMAKE_CXX_EXTENSIONS OFF)
SET(CMAKE_CXX_FLAGS "-ggdb -O3 -march=native ${CMAKE_CXX_FLAGS}")

file(GLOB SRC_BENCHMARKS "benchmarks/*.cpp")
file(GLOB SRC_APP "app/*.cpp")
file(GLOB SRC_BENCHMARKS "src/benchmarks/*.cpp")
file(GLOB SRC_APP "src/app/*.cpp")

file(GLOB INC_HASHES "hashes/*")
file(GLOB INC_MAPS "maps/*")
file(GLOB INC_HASHES "src/hashes/*")
file(GLOB INC_MAPS "src/maps/*")

# 3rd party #####################################################################
# external code #####################################################################

add_subdirectory("3rdparty/robin_hood")
add_subdirectory("3rdparty/ska")
add_subdirectory("3rdparty/sparsepp")
add_subdirectory("3rdparty/tsl")
add_subdirectory("external/robin_hood")
add_subdirectory("external/ska")
add_subdirectory("external/sparsepp")
add_subdirectory("external/tsl")

# absl stuff: see https://github.com/abseil/abseil-cpp/tree/master/CMake
if(MSVC)
Expand All @@ -29,7 +29,7 @@ if(MSVC)
add_compile_options(/wd4005 /wd4068 /wd4244 /wd4267 /wd4800)
add_definitions(/DNOMINMAX /DWIN32_LEAN_AND_MEAN=1 /D_CRT_SECURE_NO_WARNINGS)
endif()
add_subdirectory("3rdparty/abseil-cpp")
add_subdirectory("external/abseil-cpp")

# pthread, required by absl see https://github.com/abseil/abseil-cpp/issues/183#issuecomment-458453010
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
Expand All @@ -56,7 +56,7 @@ find_package(Threads REQUIRED)
# libjemalloc-dev \
# libssl-dev \
# pkg-config
add_subdirectory("3rdparty/folly")
add_subdirectory("external/folly")


# build stuff #####################################################################
Expand Down Expand Up @@ -87,7 +87,7 @@ foreach(MAP_DIR ${INC_MAPS})
file(GLOB SRC_HASH_DIR "${HASH_DIR}/*.cpp")

add_executable(${EXECUTABLE_NAME} ${SRC_APP} ${SRC_BENCHMARKS} ${SRC_MAP_DIR} ${SRC_HASH_DIR})
target_include_directories(${EXECUTABLE_NAME} PRIVATE "app" "3rdparty" ${MAP_DIR} ${HASH_DIR} ${FOLLY_DIR})
target_include_directories(${EXECUTABLE_NAME} PRIVATE "src/app" "external" ${MAP_DIR} ${HASH_DIR} ${FOLLY_DIR})

# absl
target_link_libraries(${EXECUTABLE_NAME} absl::base absl::flat_hash_map)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion src/3rdparty/abseil-cpp
Submodule abseil-cpp deleted from 426eaa
1 change: 0 additions & 1 deletion src/3rdparty/folly
Submodule folly deleted from 08a5c3

0 comments on commit 1239614

Please sign in to comment.