Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configured CMake to copy and update dists.dss #83

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,20 @@ dbgen
# -------------------------------------
gmon.out

# IDE files (Eclipse, IntelliJ IDEA)
# IDE files (Eclipse, IntelliJ IDEA, vscode)
# -------------------------------------
.cproject
.project
.idea/
.vscode/

# Patch-related
# -------------------------------------
*.diff
*.rej
*.orig

# Build files
# -------------------------------------
build/
cmake-build*
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,4 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
set_property(TARGET dbgen qgen APPEND PROPERTY COMPILE_DEFINITIONS _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS)
endif()


configure_file(dists.dss dists.dss COPYONLY)
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ For a recent discussion of the benchmark, you may wish to also read [A Review of

The build is automated using [CMake](https://cmake.org/) now. You can run it in several modes:

* Default: `$ cmake . && cmake --build .`
* Passing options manually: `$ cmake [OPTIONS] . && cmake --build .`
* Interactive: `$ cmake . && ccmake . && cmake --build .`
+ Default: `$ cmake -S . -B ./build && cmake --build ./build`
* Passing options manually: `$ cmake -S . -B ./build [OPTIONS] && cmake --build ./build`
* Interactive: `$ cmake -S . -B ./build && ccmake -S . -B ./build && cmake --build ./build`

Of course, you should have C language compiler (C99/C2011 support is not necessary), linker, and corresponding make-tool preinstalled in your system. CMake will detect them automatically.

Expand All @@ -57,7 +57,7 @@ Building process was tested using [Travis CI](https://travis-ci.org/) with [gcc]

## <a name="using">Using the utility to generate data</a>

The `dbgen` utility should be run from within the source folder (it can be run from elsewhere but you would need to specify the location of the `dists.dss` file). A typical invocation:
The `dbgen` utility expects `dists.dss` in its working directory. If necessary, the location of the `dists.dss` file can be specified with the `-b` command line argument. CMake is configured to copy the `dists.dss` to the build directory automatically. A typical invocation:

$ ./dbgen -v -s 10

Expand Down