Skip to content

Commit 8e451c0

Browse files
Fix CMake-config for SDK-examples
1 parent 0ebbad7 commit 8e451c0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

SDK/Examples/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ cmake_minimum_required (VERSION 2.6)
22

33
if (WIN32)
44
set(LSUFFIX "dll")
5-
set(LPREFIX "")
5+
set(LSUFFIXOUT ".dll")
66
elseif(UNIX AND NOT APPLE)
77
set(LSUFFIX "so")
8-
set(LPREFIX "lib")
8+
set(LSUFFIXOUT ".so.1")
99
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
1010
else()
1111
set(LSUFFIX "dylib")
12-
set(LPREFIX "lib")
12+
set(LSUFFIXOUT ".1.dylib")
1313
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
1414
endif()
1515

@@ -30,7 +30,7 @@ else()
3030
endif()
3131

3232
function(CopySharedLibrary MyTarget)
33-
add_custom_command(TARGET ${MyTarget} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../Lib/lib3MF.${LSUFFIX}" $<TARGET_FILE_DIR:${MyTarget}>/${LPREFIX}lib3MF.${LSUFFIX})
33+
add_custom_command(TARGET ${MyTarget} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../Lib/lib3MF.${LSUFFIX}" $<TARGET_FILE_DIR:${MyTarget}>/lib3MF${LSUFFIXOUT})
3434
endfunction(CopySharedLibrary)
3535

3636
add_executable(Example_ColorCube Source/ColorCube.cpp)

SDK/Examples/Source/TextureCube.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ LIB3MFRESULT fnLoadModelTexture(PLib3MFModel * pModel, const char * pszPath, con
116116
bool SimpleCallback(int step, ProgressIdentifier identifier, void * pUserData) {
117117

118118
std::cout << "Step = " << step;
119-
if (identifier != ProgressIdentifier::PROGRESS_QUERYCANCELED) {
119+
if (identifier != PROGRESS_QUERYCANCELED) {
120120
const char * progressMessage;
121121
NMR::lib3mf_retrieveprogressmessage(identifier, &progressMessage);
122122
std::cout << " \"" << progressMessage << "\"\n";

0 commit comments

Comments
 (0)