diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000000..a2012bd5e1
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,68 @@
+##---------------------------------------------------------------------------
+## $RCSfile: CMakeLists.txt $
+## $Source: CMakeLists.txt $
+## $Revision: 1.48 $
+## $Date: Feb 26, 2006 10:39:43 PM $
+##---------------------------------------------------------------------------
+## Author:      Jorgen Bodde
+## Copyright:   (c) Jorgen Bodde
+## License:     wxWidgets License
+##---------------------------------------------------------------------------
+ 
+##---------------------------------------------------
+## Please set your wxWidgets configuration here
+##--------------------------------------------------- 
+ 
+SET(CMAKE_FIND_LIBRARY_PREFIXES "")
+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+ 
+# Here you can define what libraries of wxWidgets you need for your
+# application. You can figure out what libraries you need here;
+# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
+SET(wxWidgets_USE_LIBS base core gl net)
+ 
+# We need the Find package for wxWidgets to work
+FIND_PACKAGE(wxWidgets)
+ 
+##---------------------------------------------------
+## Actual config file starts here
+##--------------------------------------------------- 
+ 
+# Did we find wxWidgets ? This condition will fail
+# for as long as the internal vars do not point to
+# the proper wxWidgets configuration
+IF(wxWidgets_FOUND)
+     
+    # Include wxWidgets macros
+    INCLUDE(${wxWidgets_USE_FILE})
+ 
+    # Our project is called 'minimal' this is how it will be called in
+    # visual studio, and in our makefiles. 
+    PROJECT (KICAD_EDA)
+
+    # We define the include paths here, our minimal source dir is one, 
+    # and also the include dirs defined by wxWidgets
+    INCLUDE_DIRECTORIES(
+                        #${KICAD_EDA_SOURCE_DIR}/include                        
+                        #${KICAD_EDA_SOURCE_DIR}/common
+                        #${KICAD_EDA_SOURCE_DIR}/share
+                        #${KICAD_EDA_SOURCE_DIR}/kicad/bitmaps 
+                        #${KICAD_EDA_SOURCE_DIR}/common/bitmaps 
+                        ${CMAKE_BINARY_DIR}
+                        ${CMAKE_SOURCE_DIR}
+                        ${CMAKE_SOURCE_DIR}/include
+                        ${CMAKE_SOURCE_DIR}/common
+                        #${CMAKE_SOURCE_DIR}/share
+                        ${CMAKE_SOURCE_DIR}/kicad/bitmaps
+                        ${CMAKE_SOURCE_DIR}/common/bitmaps
+                        ${wxWidgets_INCLUDE_DIRS}
+                       )
+ 
+ELSE(wxWidgets_FOUND)
+    # For convenience. When we cannot continue, inform the user
+    MESSAGE("wxWidgets not found!")
+ENDIF(wxWidgets_FOUND)
+
+add_subdirectory (common)
+add_subdirectory (kicad)
+#SUBDIRS(common kicad)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
new file mode 100644
index 0000000000..8fc59d2568
--- /dev/null
+++ b/common/CMakeLists.txt
@@ -0,0 +1,51 @@
+# We define the include paths here, our minimal source dir is one, 
+# and also the include dirs defined by wxWidgets
+#INCLUDE_DIRECTORIES()
+ 
+# For convenience we define the sources as a variable. You can add 
+# header files and cpp / c files and CMake will sort them out
+SET(SRCS    	confirm
+		base_struct
+		copy_to_clipboard
+		basicframe
+		common_plot_functions
+		common_plotPS_functions
+		common_plotHPGL_functions
+		hotkeys_basic
+		drawtxt
+		wxwineda
+		string
+		gr_basic
+		gestfich
+		trigo
+		selcolor
+		bitmaps
+		common
+		eda_doc
+		toolbars
+		displlst
+		edaappl
+		block_commande
+		msgpanel
+		projet_config
+		get_component_dialog
+		eda_dde
+		worksheet
+		base_screen
+		dcsvg
+   )
+ 
+# If we build for windows systems, we also include the resource file
+# containing the manifest, icon and other resources
+#IF(WIN32)
+#  SET(SRCS ${SRCS} kicad.rc)
+#ENDIF(WIN32)
+ 
+# Here we define the executable kicad.exe or kicad on other systems
+# the above paths and defines will be used in this build
+ADD_LIBRARY(common ${SRCS})
+    
+# We add to our target 'kicad' the wxWidgets libraries. These are
+# set for us by the find script. If you need other libraries, you
+# can add them here as well. 
+#TARGET_LINK_LIBRARIES(kicad ${wxWidgets_LIBRARIES} )
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
new file mode 100644
index 0000000000..d73b8d11c3
--- /dev/null
+++ b/kicad/CMakeLists.txt
@@ -0,0 +1,31 @@
+# For convenience we define the sources as a variable. You can add 
+# header files and cpp / c files and CMake will sort them out
+SET(SRCS    kicad
+            treeprj_frame
+            treeprj_datas
+            buildmnu
+            ../share/infospgm
+            mainframe
+            prjconfig
+            preferences
+            commandframe
+            files-io
+   )
+ 
+# If we build for windows systems, we also include the resource file
+# containing the manifest, icon and other resources
+IF(WIN32)
+  SET(SRCS ${SRCS} kicad.rc)
+ENDIF(WIN32)
+ 
+# Here we define the executable kicad.exe or kicad on other systems
+# the above paths and defines will be used in this build
+ADD_EXECUTABLE(kicad WIN32 ${SRCS})
+    
+# We add to our target 'kicad' the wxWidgets libraries. These are
+# set for us by the find script. If you need other libraries, you
+# can add them here as well. 
+TARGET_LINK_LIBRARIES(kicad ${wxWidgets_LIBRARIES})
+
+LINK_DIRECTORIES(${KICAD_EDA_BINARY_DIR}/common
+)