fix(cli): validate Vix runtime target in generated CMake · vixcpp/cli@f5752b4 · GitHub

vixcpp / cli Public

• Notifications You must be signed in to change notification settings
• Fork 2
• Star 10

• Code
• Issues
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit f5752b4

Browse filesBrowse the repository at this point in the historyBrowse files

GaspardKirira

committed

fix(cli): validate Vix runtime target in generated CMake

1 parent 99ada85 commit f5752b4
Copy full SHA for f5752b4

1 file changed

+5-1Lines changed: 5 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/app
  • AppCMakeGenerator.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/app/AppCMakeGenerator.cpp‎

Copy file name to clipboardExpand all lines: src/app/AppCMakeGenerator.cpp

+5-1Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1105,11 +1105,15 @@ namespace vix::cli::app
1105	1105	{
1106	1106	out << "# Vix runtime used by generated app glue\n";
1107	1107	out << "find_package(vix QUIET CONFIG)\n";
1108		- out << "if(NOT vix_FOUND)\n";
	1108	+ out << "if(NOT TARGET vix::vix AND NOT TARGET Vix::vix)\n";
1109	1109	out << " find_package(Vix QUIET CONFIG)\n";
1110	1110	out << "endif()\n";
1111	1111	out << "if(TARGET vix::vix)\n";
1112	1112	out << " target_link_libraries(" << targetName << " PRIVATE vix::vix)\n";
	1113	+ out << "elseif(TARGET Vix::vix)\n";
	1114	+ out << " target_link_libraries(" << targetName << " PRIVATE Vix::vix)\n";
	1115	+ out << "else()\n";
	1116	+ out << " message(FATAL_ERROR \"No umbrella Vix target found (vix::vix or Vix::vix). Generated application glue requires the full Vix package.\")\n";
1113	1117	out << "endif()\n\n";
1114	1118	}
1115	1119

0 commit comments

Comments

0 (0)