kicad-developers team mailing list archive

[Niki Guldbrand <niki.guldbrand@xxxxxxxxx>]

* Move the generated PNG and temporary files to the build tree, but
  keep the generated c files in the source tree for easier
  addition/updates in tree.
* Syncronize .gitignore to the changes.

Signed-off-by: Niki Guldbrand <niki.guldbrand@xxxxxxxxx>
---
 .gitignore                 | 2 --
 bitmaps_png/CMakeLists.txt | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 14969d1..60256bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,4 @@ Documentation/development/doxygen
 .*.swp
 *.~*
 new/html
-bitmaps_png/png*
-bitmaps_png/tmp
 
diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index fbee18b..c3e2781 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -587,8 +587,7 @@ set( BMAPS_OTHER
     )
 
 
-# @todo keep these in sync with .bzrignore
-set( TMP_DIR   "${CMAKE_CURRENT_SOURCE_DIR}/tmp" )
+set( TMP_DIR   "${CMAKE_CURRENT_BINARY_DIR}/tmp" )
 
 function( svg2png inputFile outFile pngWidth pngHeight )
     #message( "svg2png( inputFile: ${inputFile} outFile: ${outFile} pngWidth: ${pngWidth} pngHeight: ${pngHeight})")
@@ -644,7 +643,7 @@ endfunction()
 function( bitmap_dir pngWidth pngHeight bmapList )
 
     set( cppDir "${CMAKE_CURRENT_SOURCE_DIR}/cpp_${pngHeight}" )
-    set( pngDir "${CMAKE_CURRENT_SOURCE_DIR}/png_${pngHeight}" )
+    set( pngDir "${CMAKE_CURRENT_BINARY_DIR}/png_${pngHeight}" )
 
     file( MAKE_DIRECTORY ${pngDir} ${cppDir} )