From 86670ee3baef50448d0d4e637ab9ba2e51ed1f27 Mon Sep 17 00:00:00 2001 From: Caelan Sayler Date: Sun, 10 Nov 2024 22:21:30 +0000 Subject: [PATCH] add all platform libs to cmake --- samples/CPlusPlusWidgets/CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/samples/CPlusPlusWidgets/CMakeLists.txt b/samples/CPlusPlusWidgets/CMakeLists.txt index dd30cbae..7b3f5d59 100644 --- a/samples/CPlusPlusWidgets/CMakeLists.txt +++ b/samples/CPlusPlusWidgets/CMakeLists.txt @@ -31,11 +31,19 @@ if(NOT wxWidgets_FOUND) set(wxWidgets_LIBRARIES wxcore wxnet) endif() - # include the Velopack library (headers + precompiled lib) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../src/lib-cpp/include") -set(VELOPACK_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/velopack_libc.dll.lib") -set(VELOPACK_DLL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/velopack_libc.dll") + +if(WIN32) + set(VELOPACK_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/velopack_libc.dll.lib") + set(VELOPACK_DLL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/velopack_libc.dll") +elseif(APPLE) + set(VELOPACK_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/libvelopack_libc.dylib") + set(VELOPACK_DLL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/libvelopack_libc.dylib") +else() + set(VELOPACK_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/libvelopack_libc.so") + set(VELOPACK_DLL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/libvelopack_libc.so") +endif() if(WIN32) # the WIN32 is needed for Windows in order for it to look for WinMain