Update SDK generation and fix example

3MFConsortium · Apr 24, 2018 · 0ebbad7 · 0ebbad7
1 parent ea815f1
commit 0ebbad7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/SDK/Examples/CMakeLists.txt b/SDK/Examples/CMakeLists.txt
@@ -58,7 +58,7 @@ add_executable(Example_BeamLattice Source/BeamLattice.cpp)
 CopySharedLibrary(Example_BeamLattice)
 
 if (WIN32)
-	IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 3.6)
+	IF(${CMAKE_VERSION} VERSION_LESS 3.6.3)
 		MESSAGE ("Note: You need to manually select a StartUp-project in Visual Studio.")
 	ELSE()
 		set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Example_Cube)

diff --git a/SDK/Examples/Source/TextureCube.cpp b/SDK/Examples/Source/TextureCube.cpp
@@ -366,7 +366,7 @@ int main ()
 	}
 
 	// Set progress callback
-	lib3mf_writer_setprogresscallback(p3MFWriter, SimpleCallback, nullptr);
+	lib3mf_writer_setprogresscallback(p3MFWriter, SimpleCallback, NULL);
 
 	// Export Model into File
 	std::cout << "writing texturecube.3mf..." << std::endl;

diff --git a/SDK/GenerateSDK.sh b/SDK/GenerateSDK.sh
@@ -48,6 +48,7 @@ cp ../Include/Common/Platform/NMR_SAL.h $SDKARTIFACTS/Include/Common/Platform/.
 cp ../Include/Common/Platform/NMR_WinTypes.h $SDKARTIFACTS/Include/Common/Platform/.
 cp ../Include/Common/Platform/NMR_COM_Emulation.h $SDKARTIFACTS/Include/Common/Platform/.
 cp ../Include/Common/3MF_ProgressTypes.h $SDKARTIFACTS/Include/Common/.
+cp ../Lib3MF-1.pdf $SDKARTIFACTS/Doc/.
 
 #=Obtain latest lib3MF-shared libraries=#
 echo Obtain latest lib3MF-shared libraries