Commit c0cca2e7 authored by jcfr's avatar jcfr
Browse files

STYLE: ModuleDescriptionParser - Fix style

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16363 3bd1e089-480b-0410-8dfb-8563597acbee
parent 4c0fc43d
......@@ -11,16 +11,20 @@
Version: $Revision$
==========================================================================*/
#include "itksys/DynamicLoader.hxx"
#include "itksys/Directory.hxx"
#include "itksys/SystemTools.hxx"
#include "itksys/Process.h"
#include "itksys/Base64.h"
// ModuleDescriptionParser includes
#include "ModuleFactory.h"
#include "ModuleDescriptionParser.h"
#include "ModuleDescription.h"
// ITKSYS includes
#include <itksys/DynamicLoader.hxx>
#include <itksys/Directory.hxx>
#include <itksys/SystemTools.hxx>
#include <itksys/Process.h>
#include <itksys/Base64.h>
// STD includes
#include <set>
#include <map>
#include <sstream>
......@@ -366,18 +370,17 @@ void ModuleFactory::Scan()
// Scan for shared object modules first since they will be higher
// performance than command line module
int numberOfShared, numberOfExecutables, numberOfPeekedExecutables, numberOfPython = 0, numberOfOtherFiles;
numberOfShared = this->ScanForSharedObjectModules();
numberOfPeekedExecutables = this->ScanForCommandLineModulesByPeeking();
numberOfExecutables = this->ScanForCommandLineModulesByExecuting();
int numberOfShared = this->ScanForSharedObjectModules();
int numberOfPeekedExecutables = this->ScanForCommandLineModulesByPeeking();
int numberOfExecutables = this->ScanForCommandLineModulesByExecuting();
int numberOfPython = 0;
#ifdef ModuleDescriptionParser_USE_PYTHON
// Be sure that python is initialized
Py_Initialize();
numberOfPython = this->ScanForPythonModulesByLoading();
#endif
numberOfOtherFiles = this->ScanForNotAModuleFiles();
int numberOfOtherFiles = this->ScanForNotAModuleFiles();
// Store the module cache information
this->SaveModuleCache();
......
......@@ -30,14 +30,19 @@ FOREACH(policy ${project_policies})
ENDIF()
ENDFOREACH()
set(PARSER1TEST_SOURCE Parser1Test )
# --------------------------------------------------------------------------
# Build Parser1Test executable
# --------------------------------------------------------------------------
set(PARSER1TEST_SOURCE Parser1Test.cxx )
add_executable(Parser1Test ${PARSER1TEST_SOURCE})
target_link_libraries(Parser1Test ModuleDescriptionParser )
set(ModuleFactoryTest_SOURCE ModuleFactoryTest )
add_executable(ModuleFactoryTest ${ModuleFactoryTest_SOURCE})
target_link_libraries(ModuleFactoryTest ModuleDescriptionParser )
# --------------------------------------------------------------------------
# Build ModuleFactoryTest executable
# --------------------------------------------------------------------------
include_directories(
${ModuleDescriptionParser_SOURCE_DIR}
......
......@@ -11,11 +11,17 @@
Version: $Revision$
==========================================================================*/
// ModuleDescriptionParser includes
#include "ModuleFactory.h"
// ITKSYS includes
#include <itksys/Directory.hxx>
#include <itksys/SystemTools.hxx>
// STD includes
#include <string>
#include <cstdlib>
#include "ModuleFactory.h"
#include "itksys/Directory.hxx"
#include "itksys/SystemTools.hxx"
void WarningMessage(const char *msg);
void ErrorMessage(const char *msg);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment