Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
code
pfabric
Commits
c1fc2082
Commit
c1fc2082
authored
Aug 23, 2019
by
Philipp Götze
Browse files
Added custom targets for nvmDS and pmdk
parent
319b374a
Pipeline
#161
failed with stages
in 3 minutes and 1 second
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
cmake/Download3rdParty.cmake
View file @
c1fc2082
...
...
@@ -178,7 +178,7 @@ add_custom_target(linroad ALL DEPENDS ${THIRD_PARTY_DIR}/linroad)
endif
()
#--------------------------------------------------------------------------------
if
(
USE_NVM_TABLE
)
if
(
USE_NVM_TABLE
S
)
# Peristent Memory Development Kit (pmem.io)
download_project
(
PROJ pmdk
GIT_REPOSITORY https://github.com/pmem/pmdk.git
...
...
@@ -206,6 +206,7 @@ add_custom_command(
${
pmdk-cpp_SOURCE_DIR
}
/include
${
THIRD_PARTY_DIR
}
/pmdk/include
)
add_custom_target
(
pmdk ALL DEPENDS
${
THIRD_PARTY_DIR
}
/pmdk
${
THIRD_PARTY_DIR
}
/pmdk-cpp
)
# PTable (part of nvm-based data structures) for NVM
download_project
(
PROJ nvmDS
...
...
@@ -220,6 +221,7 @@ add_custom_command(
COMMAND
${
CMAKE_COMMAND
}
-E chdir
${
nvmDS_SOURCE_DIR
}
cmake -DBUILD_TEST_CASES=OFF -DPROJECT_INSTALL_DIR=
${
THIRD_PARTY_DIR
}
/nvmDS src
COMMAND
${
CMAKE_COMMAND
}
-E chdir
${
nvmDS_SOURCE_DIR
}
$
(
MAKE
)
install
)
add_custom_target
(
nvmDS ALL DEPENDS
${
THIRD_PARTY_DIR
}
/nvmDS
)
endif
()
#--------------------------------------------------------------------------------
...
...
src/CMakeLists.txt
View file @
c1fc2082
...
...
@@ -184,17 +184,17 @@ if (USE_NVM_TABLES)
"
${
THIRD_PARTY_DIR
}
/pmdk/include"
"
${
THIRD_PARTY_DIR
}
/nvmDS/include"
)
set
(
core_sources
${
core_sources
}
${
THIRD_PARTY_DIR
}
/pmdk
${
THIRD_PARTY_DIR
}
/nvmDS
)
set
(
core_libs
${
core_libs
}
${
PMDK_LIBRARIES
}
ndctl
daxctl
)
set
(
core_deps
${
core_deps
}
pmdk
nvmDS
)
else
()
message
(
STATUS
"don't use NVM based persistent table"
)
set
(
PMDK_LIBRARIES
""
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment