Blob Blame History Raw
From 4ae07fe4859108638e244912a21245c2156eb8f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
Date: Tue, 22 Mar 2022 21:41:44 +0100
Subject: [PATCH] Set tinyxml2_LIBRARIES after find_package()

If tinyxml2 is found by find_package(), then tinyxml2_LIBRARIES
is empty. Set tinyxml2_LIBRARIES to "tinyxml2::tinyxml2" in this case.

- Fixes "undefined reference to `tinyxml2::"
- printInfo.cmake: Fix indentation of tinyxml2_LIBRARIES
---
 cmake/findDependencies.cmake | 5 +++--
 cmake/printInfo.cmake        | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
index 4d5b9efc5e..b8c181763e 100644
--- a/cmake/findDependencies.cmake
+++ b/cmake/findDependencies.cmake
@@ -48,12 +48,13 @@ endif()
 
 if (NOT USE_BUNDLED_TINYXML2)
     find_package(tinyxml2 QUIET)
-    if (NOT tinyxml2_FOUND)
+    if (TARGET tinyxml2::tinyxml2)
+        set(tinyxml2_LIBRARIES "tinyxml2::tinyxml2")
+    else()
         find_library(tinyxml2_LIBRARIES tinyxml2)
         if (NOT tinyxml2_LIBRARIES)
             message(FATAL_ERROR "tinyxml2 has not been found")
         else()
-            message(STATUS "tinyxml2_LIBRARY: ${tinyxml2_LIBRARY}")
             set(tinyxml2_FOUND 1)
         endif()
     endif()
diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake
index 2fd971b1de..da5d15c211 100644
--- a/cmake/printInfo.cmake
+++ b/cmake/printInfo.cmake
@@ -52,9 +52,10 @@ if (USE_Z3)
     message( STATUS "Z3_LIBRARIES =          ${Z3_LIBRARIES}" )
     message( STATUS "Z3_CXX_INCLUDE_DIRS =   ${Z3_CXX_INCLUDE_DIRS}" )
 endif()
+message( STATUS )
 message( STATUS "USE_BUNDLED_TINYXML2 =  ${USE_BUNDLED_TINYXML2}" )
 if (NOT USE_BUNDLED_TINYXML2)
-    message(STATUS "tinyxml2_LIBRARIES =       ${tinyxml2_LIBRARIES}")
+    message(STATUS "tinyxml2_LIBRARIES =    ${tinyxml2_LIBRARIES}")
 endif()
 message( STATUS )