From 47e7d24f458579cf8dd4231d5c31332d8eb14ae0 Mon Sep 17 00:00:00 2001
From: f3nix <Unknown>
Date: Wed, 6 Feb 2008 20:36:44 +0000
Subject: [PATCH] Fix win32 "filename.ico not found" error.

---
 CMakeLists.txt          | 13 ++++++++-----
 cvpcb/CMakeLists.txt    |  2 +-
 eeschema/CMakeLists.txt |  2 +-
 kicad/CMakeLists.txt    |  2 +-
 pcbnew/CMakeLists.txt   |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42027acf5d..c4f3547f4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,11 @@
 #
 # CMAKE_INSTALL_PREFIX (OPTIONAL)
 #   
+# KICAD_MINIZIP ON/OFF
+#   
+#
+# KICAD_PYTHON ON/OFF
+#    
 #
 
 # Our project is called 'kicad'. This is what it will be called in
@@ -25,15 +30,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
 # Path to local CMake modules
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
 
-# Command line option to enable or disable building minizip.  Minizip
-# is building is enabled by defaut.  Use -DKICAD_MINZIP=OFF to disable
+# Command line option to enable or disable building minizip. Minizip
+# building is enabled by default. Use -DKICAD_MINZIP=OFF to disable
 # building minizip.
 OPTION(KICAD_MINIZIP "enable/disable building minizip (default ON)" ON)
-# Comment this out if you don't want to build minizip.
-#SET(KICAD_MINIZIP ON CACHE BOOL "Build minizip?")
 
 # Comment this out if you don't want to build with Python support.
-# SET(KICAD_PYTHON ON CACHE BOOL "Build with Python support?")
+# OPTION(KICAD_PYTHON "enable/disable building with Python support (default OFF)")
 
 # Set default flags for Release build.
 SET(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index ceef9a5841..48557701d4 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -60,7 +60,7 @@ IF(WIN32)
     IF(MINGW)
         # resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
         ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o
-            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
+            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
                         -i ${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.rc
                         -o ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
         SET(CVPCB_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index a1b9b6752c..81b699a73e 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -106,7 +106,7 @@ IF(WIN32)
     IF(MINGW)
         # resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
         ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o
-            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
+            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
                         -i ${CMAKE_CURRENT_SOURCE_DIR}/eeschema.rc
                         -o ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
         SET(EESCHEMA_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 2547b40c3d..0d41db3642 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -17,7 +17,7 @@ IF(WIN32)
     IF(MINGW)
         # resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
         ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o
-            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
+            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
                         -i ${CMAKE_CURRENT_SOURCE_DIR}/kicad.rc
                         -o ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
         SET(KICAD_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index f2cb4cd19b..171bb67642 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -151,7 +151,7 @@ IF(WIN32)
     IF(MINGW)
         # resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
         ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_rc.o
-            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
+            COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
                         -i ${CMAKE_CURRENT_SOURCE_DIR}/pcbnew.rc
                         -o ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_rc.o)
         SET(PCBNEW_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_rc.o)