Skip to content

Commit 15fe2fb

Browse files
committed
Revert "test: test installation of conan packages"
This reverts commit bf5dab5.
1 parent a12ae5b commit 15fe2fb

File tree

3 files changed

+17
-32
lines changed

3 files changed

+17
-32
lines changed

tests/myproj/CMakeLists.txt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,21 @@ project_options(
9494
add_executable(main ./src/main/main.cpp)
9595
target_link_libraries(main PRIVATE myproj_project_options myproj_project_warnings)
9696

97-
target_find_dependencies(main
97+
target_find_dependencies(
98+
main
9899
PUBLIC
99-
PACKAGE fmt CONFIG
100-
PACKAGE Eigen3 CONFIG
101-
PACKAGE docopt CONFIG
100+
PACKAGE
101+
fmt
102+
CONFIG
103+
PACKAGE
104+
Eigen3
105+
CONFIG
106+
PACKAGE
107+
docopt
108+
CONFIG
102109
)
103110

104-
target_link_system_libraries(main PRIVATE fmt::fmt Eigen3::Eigen docopt)
111+
target_link_system_libraries(main PRIVATE fmt::fmt Eigen3::Eigen)
105112

106113
add_subdirectory(libs)
107114

@@ -171,7 +178,7 @@ package_project(
171178
myproj_project_options
172179
myproj_project_warnings
173180
PUBLIC_INCLUDES
174-
${lib2_INCLUDE_DIR2}
181+
${lib2_INCLUDE_DIR22}
175182
)
176183

177184
package_project(NAME myproj_main TARGETS main)

tests/myproj/conanfile.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@
33
[requires]
44
docopt.cpp/0.6.3
55

6-
[options]
7-
docopt.cpp/*:shared=True
8-
96
[generators]
107
CMakeDeps

tests/myproj/src/main/main.cpp

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
// test external pac
2-
#include <docopt/docopt.h>
32
#include <Eigen/Dense>
43
#include <fmt/core.h>
5-
#include <fmt/ostream.h>
64
#include <fmt/ranges.h>
75

86
// test std libraries
97
#include <iostream>
10-
#include <map>
118
#include <string>
129
#include <string_view>
1310

@@ -18,31 +15,15 @@
1815
#include <cstdint>
1916
#include <cstring>
2017

21-
static std::string const usage{
22-
R"(main.
23-
24-
Usage:
25-
main
26-
main (-h | --help)
27-
main --version
28-
29-
Options:
30-
-h --help Show this screen.
31-
--version Show version.
32-
)"};
33-
34-
int main(int argc, char const* argv[]) {
35-
std::map<std::string, docopt::value> args{docopt::docopt(usage, {argv + 1, argv + argc}, /*help=*/true, "main 1.0")};
36-
for (auto const& arg : args) {
37-
fmt::println("{}: {}", arg.first, fmt::streamed(arg.second));
38-
}
18+
int main() {
19+
fmt::print("Hello from fmt{}", "!");
3920

4021
Eigen::VectorXd eigen_vec = Eigen::Vector3d(1, 2, 3);
41-
fmt::println("[{}]", fmt::join(eigen_vec, ", "));
22+
fmt::print("[{}]", fmt::join(eigen_vec, ", "));
4223

4324
#if !defined(__MINGW32__) && !defined(__MSYS__)// TODO fails
4425
Eigen::VectorXd eigen_vec2 = Eigen::VectorXd::LinSpaced(10, 0, 1);
45-
fmt::println("[{}]", fmt::join(eigen_vec2, ", "));
26+
fmt::print("[{}]", fmt::join(eigen_vec2, ", "));
4627
#endif
4728

4829
// trigger address sanitizer

0 commit comments

Comments
 (0)