From a245bb2174de3e4509c97d6de37ab483c4e1f89a Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sat, 28 Apr 2018 13:30:02 -0700
Subject: [PATCH] fix libquazip debug filename. link libatomic where needed
---
cmake/externals/quazip/CMakeLists.txt | 3 +++
tests/controllers/CMakeLists.txt | 6 +++++-
tests/render-perf/CMakeLists.txt | 4 ++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/cmake/externals/quazip/CMakeLists.txt b/cmake/externals/quazip/CMakeLists.txt
index f2690e0a7d..7bf6f05d9f 100644
--- a/cmake/externals/quazip/CMakeLists.txt
+++ b/cmake/externals/quazip/CMakeLists.txt
@@ -41,6 +41,9 @@ if (APPLE)
elseif (WIN32)
set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/quazip5.lib CACHE FILEPATH "Location of QuaZip release library")
set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/quazip5d.lib CACHE FILEPATH "Location of QuaZip release library")
+elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libquazip5.so CACHE FILEPATH "Location of QuaZip release library")
+ set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/libquazip5d.so CACHE FILEPATH "Location of QuaZip release library")
else ()
set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libquazip5.so CACHE FILEPATH "Location of QuaZip release library")
set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/libquazip5.so CACHE FILEPATH "Location of QuaZip release library")
diff --git a/tests/controllers/CMakeLists.txt b/tests/controllers/CMakeLists.txt
index b5e866ccce..ce1c150ed4 100644
--- a/tests/controllers/CMakeLists.txt
+++ b/tests/controllers/CMakeLists.txt
@@ -23,5 +23,9 @@ if (WIN32)
add_dependency_external_projects(wasapi)
endif()
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ target_link_libraries(${TARGET_NAME} atomic)
+endif()
+
package_libraries_for_deployment()
-endif()
\ No newline at end of file
+endif()
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index fd4d8d88dd..d688474379 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -27,6 +27,10 @@ if (WIN32)
add_dependency_external_projects(wasapi)
endif()
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ target_link_libraries(${TARGET_NAME} atomic)
+endif()
+
package_libraries_for_deployment()