Fix package conflicts + typo from config (#358)

egecetin · Dec 8, 2024 · 8125242 · 8125242
1 parent 35c4040
commit 8125242
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -150,6 +150,7 @@ if(XXX_ENABLE_SYMBOL_GENERATION)
 endif()
 
 add_dependencies(${PROJECT_NAME} crashpad::handler)
+set_target_properties(crashpad_handler PROPERTIES OUTPUT_NAME ${PROJECT_NAME}-crashpad)
 
 install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}-lib crashpad_handler)
 

diff --git a/config.json.in b/config.json.in
@@ -1,7 +1,7 @@
 {
     "SENTRY_ADDRESS": "",
     "LOKI_ADDRESS": "",
-    "CRASHPAD_EXECUTABLE_PATH": "@CONFIG_BASE_DIR@/bin/crashpad_handler",
+    "CRASHPAD_EXECUTABLE_PATH": "@CONFIG_BASE_DIR@/bin/@PROJECT_NAME@-crashpad",
     "CRASHPAD_REMOTE": "",
     "CRASHPAD_PROXY": "",
     "CRASHPAD_REPORT_DIR": "@CONFIG_BASE_DIR@/share/@PROJECT_NAME@"

diff --git a/src/main.cpp b/src/main.cpp
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 	vCheckFlag.emplace_back("Crashpad Handler", std::make_shared<std::atomic_flag>(false));
 	crashpadController = std::make_unique<Tracer>(
 		vCheckFlag[vCheckFlag.size() - 1].second, config.get("CRASHPAD_REMOTE"), config.get("CRASHPAD_PROXY"),
-		config.get("CRASHPAD_EXECUTABLE_DIR"), config.get("CRASHPAD_REPORT_DIR"));
+		config.get("CRASHPAD_EXECUTABLE_PATH"), config.get("CRASHPAD_REPORT_DIR"));
 
 	// Initialize Prometheus server
 	std::unique_ptr<PrometheusServer> mainPrometheusServer(nullptr);
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,6 +150,7 @@ if(XXX_ENABLE_SYMBOL_GENERATION) @@
     endif()
     add_dependencies(${PROJECT_NAME} crashpad::handler)
+    set_target_properties(crashpad_handler PROPERTIES OUTPUT_NAME ${PROJECT_NAME}-crashpad)
     install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}-lib crashpad_handler)
@@ Expand Down @@