From b1ed22f7edc4b7ffe8ec1aca036ac6bb6edc52c5 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Sun, 28 Jul 2013 11:30:39 -0500 Subject: [PATCH] minor tweaks to debug statements and cmake --- pcbnew/CMakeLists.txt | 16 +++++++--------- pcbnew/legacy_plugin.cpp | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 06f0aa71fd..4b4c47f824 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -267,23 +267,19 @@ if (KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES) get_directory_property( DirDefs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMPILE_DEFINITIONS ) foreach( d ${DirDefs} ) - set(SWIG_FLAGS ${SWIG_FLAGS} -D${d} ) + set( SWIG_FLAGS ${SWIG_FLAGS} -D${d} ) endforeach() - # check if we have IO_MGR and KICAD_PLUGIN available - if ( USE_NEW_PCBNEW_LOAD OR USE_NEW_PCBNEW_SAVE ) - set(SWIG_FLAGS ${SWIG_FLAGS} -DBUILD_WITH_PLUGIN) - endif(USE_NEW_PCBNEW_LOAD OR USE_NEW_PCBNEW_SAVE) - - if ( USE_PCBNEW_NANOMETRES ) - set(SWIG_FLAGS ${SWIG_FLAGS} -DUSE_PCBNEW_NANOMETRES) + if( USE_PCBNEW_NANOMETRES ) + set( SWIG_FLAGS ${SWIG_FLAGS} -DUSE_PCBNEW_NANOMETRES ) endif( USE_PCBNEW_NANOMETRES ) endif(KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES) + if (KICAD_SCRIPTING) - set(SWIG_OPTS -python -c++ -outdir ${CMAKE_CURRENT_BINARY_DIR} ${SWIG_FLAGS} ) + set( SWIG_OPTS -python -c++ -outdir ${CMAKE_CURRENT_BINARY_DIR} ${SWIG_FLAGS} ) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_wrap.cxx DEPENDS pcbcommon @@ -316,6 +312,8 @@ endif() if (KICAD_SCRIPTING_MODULES) + #message( "building pcbnew scripting" ) + set(CMAKE_SWIG_FLAGS ${SWIG_FLAGS}) set_source_files_properties(scripting/pcbnew.i PROPERTIES CPLUSPLUS ON) swig_add_module(pcbnew python scripting/pcbnew.i ${PCBNEW_SCRIPTING_PYTHON_HELPERS} ${PCBNEW_SRCS} ${PCBNEW_COMMON_SRCS}) diff --git a/pcbnew/legacy_plugin.cpp b/pcbnew/legacy_plugin.cpp index f45a4a78cb..12a5ba39d2 100644 --- a/pcbnew/legacy_plugin.cpp +++ b/pcbnew/legacy_plugin.cpp @@ -4155,8 +4155,7 @@ void FPL_CACHE::Save() abs_lib_name.MakeAbsolute(); tempFileName = wxFileName::CreateTempFileName( abs_lib_name.GetFullPath() ); - wxLogDebug( wxT( "tempFileName:'%s' m_lib_path:'%s'\n" ), - TO_UTF8( tempFileName ), TO_UTF8( m_lib_path ) ); + //wxLogDebug( wxT( "tempFileName:'%s' m_lib_path:'%s'\n" ), TO_UTF8( tempFileName ), TO_UTF8( m_lib_path ) ); FILE* fp = wxFopen( tempFileName, wxT( "w" ) ); if( !fp )