From af323de74127ded5e66337bdf585dfe4e19c3d45 Mon Sep 17 00:00:00 2001
From: sfalexrog <sfalexrog@gmail.com>
Date: Tue, 4 Dec 2018 23:28:50 +0300
Subject: [PATCH] Use ADD_ASSIMP_IMPORTER for STEP importer

---
 code/CMakeLists.txt                             | 3 +--
 code/Importer/StepFile/StepFileGen1.cpp         | 2 +-
 code/Importer/StepFile/StepFileImporter.cpp     | 4 ++--
 code/Importer/StepFile/StepFileImporter.h       | 4 ++--
 code/ImporterRegistry.cpp                       | 4 ++--
 scripts/StepImporter/StepReaderGen.cpp.template | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 6b8d3d322..e29467164 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -727,7 +727,7 @@ ADD_ASSIMP_IMPORTER( MMD
   MMDVmdParser.h
 )
 
-SET( Step_SRCS
+ADD_ASSIMP_IMPORTER( STEP
     STEPFile.h
     Importer/StepFile/StepFileImporter.h
     Importer/StepFile/StepFileImporter.cpp
@@ -738,7 +738,6 @@ SET( Step_SRCS
     StepExporter.h
     StepExporter.cpp
 )
-SOURCE_GROUP( Step FILES ${Step_SRCS})
 
 SET( Exporter_SRCS
   Exporter.cpp
diff --git a/code/Importer/StepFile/StepFileGen1.cpp b/code/Importer/StepFile/StepFileGen1.cpp
index 32df66c17..50c54818e 100644
--- a/code/Importer/StepFile/StepFileGen1.cpp
+++ b/code/Importer/StepFile/StepFileGen1.cpp
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** MACHINE-GENERATED by scripts/ICFImporter/CppGenerator.py */
 
-#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER
+#ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
 
 #include "code/Importer/StepFile/StepReaderGen.h"
 
diff --git a/code/Importer/StepFile/StepFileImporter.cpp b/code/Importer/StepFile/StepFileImporter.cpp
index 9bfaf7051..edfe30754 100644
--- a/code/Importer/StepFile/StepFileImporter.cpp
+++ b/code/Importer/StepFile/StepFileImporter.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER
+#ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
 
 #include "StepFileImporter.h"
 #include "../../Importer/STEPParser/STEPFileReader.h"
@@ -110,5 +110,5 @@ void StepFileImporter::InternReadFile(const std::string &file, aiScene* pScene,
 } // Namespace StepFile
 } // Namespace Assimp
 
-#endif // ASSIMP_BUILD_NO_STEPFILE_IMPORTER
+#endif // ASSIMP_BUILD_NO_STEP_IMPORTER
 
diff --git a/code/Importer/StepFile/StepFileImporter.h b/code/Importer/StepFile/StepFileImporter.h
index 7314a54f3..68d5a09ad 100644
--- a/code/Importer/StepFile/StepFileImporter.h
+++ b/code/Importer/StepFile/StepFileImporter.h
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
 
-#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER
+#ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
 
 #include <assimp/BaseImporter.h>
 
@@ -66,4 +66,4 @@ private:
 } // Namespace StepFile
 } // Namespace Assimp
 
-#endif // ASSIMP_BUILD_NO_STEPFILE_IMPORTER
+#endif // ASSIMP_BUILD_NO_STEP_IMPORTER
diff --git a/code/ImporterRegistry.cpp b/code/ImporterRegistry.cpp
index d3ae53c7d..e6cf8299e 100644
--- a/code/ImporterRegistry.cpp
+++ b/code/ImporterRegistry.cpp
@@ -197,7 +197,7 @@ corresponding preprocessor flag to selectively disable formats.
 #ifndef ASSIMP_BUILD_NO_MMD_IMPORTER
 #   include "MMDImporter.h"
 #endif
-#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER
+#ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
 #   include "Importer/StepFile/StepFileImporter.h"
 #endif
 
@@ -355,7 +355,7 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out)
 #ifndef ASSIMP_BUILD_NO_MMD_IMPORTER
     out.push_back( new MMDImporter() );
 #endif
-#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER
+#ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
     out.push_back(new StepFile::StepFileImporter());
 #endif
 }
diff --git a/scripts/StepImporter/StepReaderGen.cpp.template b/scripts/StepImporter/StepReaderGen.cpp.template
index 343c43019..91705f7a4 100644
--- a/scripts/StepImporter/StepReaderGen.cpp.template
+++ b/scripts/StepImporter/StepReaderGen.cpp.template
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** MACHINE-GENERATED by scripts/ICFImporter/CppGenerator.py */
 
-#ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER
+#ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
 
 #include "code/Importer/StepFile/StepReaderGen.h"