Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
bec55493
Unverified
Commit
bec55493
authored
May 02, 2020
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
fix paths
parent
08c94721
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
download_test_data.cmake
cmake/download_test_data.cmake
+1
-1
CMakeLists.txt
test/CMakeLists.txt
+2
-2
No files found.
cmake/download_test_data.cmake
View file @
bec55493
...
@@ -8,4 +8,4 @@ add_custom_target(download_test_data
...
@@ -8,4 +8,4 @@ add_custom_target(download_test_data
)
)
# create a header with the path to the downloaded test data
# create a header with the path to the downloaded test data
file
(
WRITE
${
CMAKE_
CURRENT_
BINARY_DIR
}
/include/test_data.hpp
"#define TEST_DATA_DIRECTORY
\"
${
CMAKE_BINARY_DIR
}
/json_test_data
\"
"
)
file
(
WRITE
${
CMAKE_BINARY_DIR
}
/include/test_data.hpp
"#define TEST_DATA_DIRECTORY
\"
${
CMAKE_BINARY_DIR
}
/json_test_data
\"
"
)
test/CMakeLists.txt
View file @
bec55493
...
@@ -4,7 +4,7 @@ option(JSON_NoExceptions "Build test suite without exceptions" OFF)
...
@@ -4,7 +4,7 @@ option(JSON_NoExceptions "Build test suite without exceptions" OFF)
option
(
JSON_Coverage
"Build test suite with coverage information"
OFF
)
option
(
JSON_Coverage
"Build test suite with coverage information"
OFF
)
# download test data
# download test data
include
(
${
CMAKE_
SOURCE_DIR
}
/cmake/download_test_data.cmake
)
include
(
${
CMAKE_
CURRENT_SOURCE_DIR
}
/..
/cmake/download_test_data.cmake
)
# test fixture to download test data
# test fixture to download test data
add_test
(
NAME
"download_test_data"
COMMAND
${
CMAKE_COMMAND
}
--build
${
CMAKE_BINARY_DIR
}
--target download_test_data
)
add_test
(
NAME
"download_test_data"
COMMAND
${
CMAKE_COMMAND
}
--build
${
CMAKE_BINARY_DIR
}
--target download_test_data
)
...
@@ -164,7 +164,7 @@ foreach(file ${files})
...
@@ -164,7 +164,7 @@ foreach(file ${files})
$<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
$<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
)
)
target_include_directories
(
${
testcase
}
PRIVATE
target_include_directories
(
${
testcase
}
PRIVATE
${
CMAKE_
CURRENT_
BINARY_DIR
}
/include
${
CMAKE_BINARY_DIR
}
/include
thirdparty/doctest
thirdparty/doctest
thirdparty/fifo_map
thirdparty/fifo_map
)
)
...
...
Write
Preview
Markdown
is supported
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