From 8e451c0d2ff142d915e31008e13d26e453daa2d8 Mon Sep 17 00:00:00 2001 From: Martin Weismann Date: Tue, 24 Apr 2018 14:16:13 +0200 Subject: [PATCH] Fix CMake-config for SDK-examples --- SDK/Examples/CMakeLists.txt | 8 ++++---- SDK/Examples/Source/TextureCube.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SDK/Examples/CMakeLists.txt b/SDK/Examples/CMakeLists.txt index 8d878e57d..2d9088cb2 100644 --- a/SDK/Examples/CMakeLists.txt +++ b/SDK/Examples/CMakeLists.txt @@ -2,14 +2,14 @@ cmake_minimum_required (VERSION 2.6) if (WIN32) set(LSUFFIX "dll") - set(LPREFIX "") + set(LSUFFIXOUT ".dll") elseif(UNIX AND NOT APPLE) set(LSUFFIX "so") - set(LPREFIX "lib") + set(LSUFFIXOUT ".so.1") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") else() set(LSUFFIX "dylib") - set(LPREFIX "lib") + set(LSUFFIXOUT ".1.dylib") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") endif() @@ -30,7 +30,7 @@ else() endif() function(CopySharedLibrary MyTarget) - add_custom_command(TARGET ${MyTarget} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../Lib/lib3MF.${LSUFFIX}" $/${LPREFIX}lib3MF.${LSUFFIX}) + add_custom_command(TARGET ${MyTarget} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../Lib/lib3MF.${LSUFFIX}" $/lib3MF${LSUFFIXOUT}) endfunction(CopySharedLibrary) add_executable(Example_ColorCube Source/ColorCube.cpp) diff --git a/SDK/Examples/Source/TextureCube.cpp b/SDK/Examples/Source/TextureCube.cpp index 3755d0b21..0ad9b183a 100644 --- a/SDK/Examples/Source/TextureCube.cpp +++ b/SDK/Examples/Source/TextureCube.cpp @@ -116,7 +116,7 @@ LIB3MFRESULT fnLoadModelTexture(PLib3MFModel * pModel, const char * pszPath, con bool SimpleCallback(int step, ProgressIdentifier identifier, void * pUserData) { std::cout << "Step = " << step; - if (identifier != ProgressIdentifier::PROGRESS_QUERYCANCELED) { + if (identifier != PROGRESS_QUERYCANCELED) { const char * progressMessage; NMR::lib3mf_retrieveprogressmessage(identifier, &progressMessage); std::cout << " \"" << progressMessage << "\"\n";