diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..df5221b88
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,22 @@
+#----------------------------------------------------------------------------
+# This file was automatically generated from the original CMakeLists.txt file
+# Add a variable to hold the headers for the library
+set (lib_headers
+    gil
+)
+
+# Add a library target to the build system
+boost_library_project(
+  gil
+  #  SRCDIRS 
+  TESTDIRS  test
+  HEADERS ${lib_headers}
+  #  DOCDIRS 
+  DESCRIPTION  "Generic Image Library"
+  MODULARIZED
+  AUTHORS  "Lubomir Bourdev <lbourdev -at- adobe.com>"
+           "Hailin Jin <hljin -at- adobe.com>"
+  #  MAINTAINERS 
+)
+
+
diff --git a/module.cmake b/module.cmake
new file mode 100644
index 000000000..e5c8cecd7
--- /dev/null
+++ b/module.cmake
@@ -0,0 +1 @@
+boost_module (gil DEPENDS type_traits mpl)
\ No newline at end of file
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 000000000..c9f50e145
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+boost_additional_test_dependencies(gil BOOST_DEPENDS test lambda crc)
+
+
+add_definitions(-DBOOST_GIL_NO_IO -D_SCL_SECURE_NO_WARNINGS)
+boost_test_run(channel channel.cpp error_if.cpp)
+boost_test_run(image image.cpp sample_image.cpp error_if.cpp)
+boost_test_run(image_io image_io.cpp error_if.cpp)
+boost_test_run(pixel pixel.cpp error_if.cpp)
+boost_test_run(pixel_iterator pixel_iterator.cpp error_if.cpp)