CMake:

* Require CMake version 2.6.1 on Windows and version 2.6.0 for other systems.
* Update FindSubversion to version from CMake 2.6.1 (localization issue solved).
* Remove FindwxWidgetsCVS and use the default one (some issues solved upstream).
* Formatting style changes.

CMakeLists.txt

@@ -1,15 +1,21 @@
 project(kicad-library)
 
-cmake_minimum_required(VERSION 2.4.6 FATAL_ERROR)
+if(WIN32)
+    cmake_minimum_required(VERSION 2.6.1 FATAL_ERROR)
+else(WIN32)
+    cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
+endif(WIN32)
 
 # Locations for install targets.
 if(UNIX)
     if(APPLE)
     else(APPLE)
         # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
-        set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "")
+        set(CMAKE_INSTALL_PREFIX /usr/local
+            CACHE PATH "")
         # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
-        set(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.")
+        set(KICAD_DATA share/kicad
+            CACHE PATH "Location of KiCad data files.")
         set(KICAD_MODULES ${KICAD_DATA}/modules)
         set(KICAD_LIBRARY ${KICAD_DATA}/library)
     endif(APPLE)
@@ -17,13 +23,16 @@ endif(UNIX)
 
 if(WIN32)
     # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
-    set(CMAKE_INSTALL_PREFIX c:/kicad CACHE PATH "")
+    set(CMAKE_INSTALL_PREFIX c:/kicad
+        CACHE PATH "")
     # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
     set(KICAD_MODULES modules)
     set(KICAD_LIBRARY library)
 endif(WIN32)
 
-mark_as_advanced(KICAD_DATA KICAD_MODULES KICAD_LIBRARY)
+mark_as_advanced(KICAD_DATA
+                 KICAD_MODULES
+                 KICAD_LIBRARY)
 
 # CMake will look in these dirs for nested 'CMakeLists.txt' files.
 # Resources.

library/CMakeLists.txt

@@ -2,11 +2,14 @@ file(GLOB dcm_files "*.dcm")
 file(GLOB lib_files "*.lib")
 file(GLOB sym_files "*.sym")
 
-install(FILES ${dcm_files} DESTINATION ${KICAD_LIBRARY}
-    COMPONENT resources)
+install(FILES ${dcm_files}
+        DESTINATION ${KICAD_LIBRARY}
+        COMPONENT resources)
 
-install(FILES ${lib_files} DESTINATION ${KICAD_LIBRARY}
-    COMPONENT resources)
+install(FILES ${lib_files}
+        DESTINATION ${KICAD_LIBRARY}
+        COMPONENT resources)
 
-install(FILES ${sym_files} DESTINATION ${KICAD_LIBRARY}
-    COMPONENT resources)
+install(FILES ${sym_files}
+        DESTINATION ${KICAD_LIBRARY}
+        COMPONENT resources)

modules/CMakeLists.txt

@@ -3,18 +3,23 @@ file(GLOB equ_files "*.equ")
 file(GLOB mdc_files "*.mdc")
 file(GLOB mod_files "*.mod")
 
-install(FILES ${brd_files} DESTINATION ${KICAD_MODULES}
-    COMPONENT resources)
+install(FILES ${brd_files}
+        DESTINATION ${KICAD_MODULES}
+        COMPONENT resources)
 
-install(FILES ${equ_files} DESTINATION ${KICAD_MODULES}
-    COMPONENT resources)
+install(FILES ${equ_files}
+        DESTINATION ${KICAD_MODULES}
+        COMPONENT resources)
 
-install(FILES ${mdc_files} DESTINATION ${KICAD_MODULES}
-    COMPONENT resources)
+install(FILES ${mdc_files}
+        DESTINATION ${KICAD_MODULES}
+        COMPONENT resources)
 
-install(FILES ${mod_files} DESTINATION ${KICAD_MODULES}
-    COMPONENT resources)
+install(FILES ${mod_files}
+        DESTINATION ${KICAD_MODULES}
+        COMPONENT resources)
 
-install(DIRECTORY packages3d DESTINATION ${KICAD_MODULES}
-    COMPONENT resources
-    PATTERN ".svn" EXCLUDE)
+install(DIRECTORY packages3d
+        DESTINATION ${KICAD_MODULES}
+        COMPONENT resources
+        PATTERN ".svn" EXCLUDE)