Skip to content

Commit 41ae517

Browse files
authored
Merge pull request #2034 from Exiv2/fix_README_ctest_main
Updating documentation on main to respect ctest
2 parents 29cc981 + 10661d6 commit 41ae517

File tree

5 files changed

+122
-119
lines changed

5 files changed

+122
-119
lines changed

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,21 @@ if( EXIV2_BUILD_SAMPLES )
110110
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
111111
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests
112112
)
113-
add_test(NAME bugfixes
113+
add_test(NAME bugfixTests
114114
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
115115
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bugfixes
116116
)
117+
add_test(NAME lensTests
118+
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
119+
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose lens_tests
120+
)
117121
add_test(NAME tiffTests
118122
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
119123
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose tiff_test
120124
)
121-
add_test(NAME lensTests
125+
add_test(NAME versionTests
122126
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
123-
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose lens_tests
127+
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests/version_test.py
124128
)
125129
endif()
126130
endif()

README-CONAN.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,21 +98,19 @@ os_build=Windows
9898
[env]
9999
```
100100

101-
_Profiles for Visual Studio are discussed in detail here: [Visual Studio Notes](#2-2)__
101+
_Profiles for Visual Studio are discussed in detail here: [Visual Studio Notes](#2-2)_
102102

103103
<name id="1-4"></a>
104104

105105
##### 1.4) Build dependencies, create build environment, build and test</a>
106106

107107

108-
| | Build Steps | Linux and macOS | Visual Studio |
109-
|:-- |:--------------|--------------------------------|------------------------------|
108+
| | Build Steps | Linux and macOS | Visual Studio |
109+
|:-- |:-------------------------------------------------------------------------|-----------------------|------------------------------|
110110
| _**1**_ | Get conan to fetch dependencies<br><br>The output can be quite<br>long as conan downloads and/or builds<br>zlib, expat, curl and other dependencies.| $ conan install ..<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--build missing | c:\\..\\build> conan install .. --build missing<br>&nbsp;&nbsp;&nbsp;&nbsp;--profile msvc2019Release64 |
111-
| _**2**_ | Get cmake to generate<br>makefiles or sln/vcxproj | $ cmake .. | c:\\..\\build> cmake&nbsp;..&nbsp;-G&nbsp;"Visual Studio 16 2019"
112-
| _**3**_ | Build | $ cmake --build . | c:\\..\\build>&nbsp;cmake&nbsp;--build&nbsp;.&nbsp;--config&nbsp;Release<br>You may prefer to open exiv2.sln and build using the IDE. |
113-
| _**4**_ | Optionally Run Test Suite | $ make tests | c:\\..\\build>&nbsp;cmake&nbsp;--build&nbsp;.&nbsp;--config&nbsp;Release --target tests<br/>[README.md](README.md) |
114-
115-
111+
| _**2**_ | Get cmake to generate<br>makefiles or sln/vcxproj | $ cmake .. | c:\\..\\build> cmake&nbsp;..&nbsp;-G&nbsp;"Visual Studio 16 2019"
112+
| _**3**_ | Build | $ cmake --build . | c:\\..\\build>&nbsp;cmake&nbsp;--build&nbsp;.&nbsp;--config&nbsp;Release<br>You may prefer to open exiv2.sln and build using the IDE. |
113+
| _**4**_ | Optionally Run Test Suite<br/>Test documentation: [README.md](README.md) | $ ctest | c:\\..\\build>&nbsp;ctest -C Release |
116114

117115
[TOC](#TOC)
118116
<name id="2"></a>
@@ -587,4 +585,4 @@ $ cmake -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON ..
587585
588586
[TOC](#TOC)
589587
590-
Written by Robin Mills<br>[email protected]<br>Updated: 2021-03-18
588+
Written by Robin Mills<br>[email protected]<br>Updated: 2021-12-17

0 commit comments

Comments
 (0)