diff --git a/examples/canvas_typed/CMakeLists.txt b/examples/canvas_typed/CMakeLists.txt
index 26cd220..9bffcd7 100644
--- a/examples/canvas_typed/CMakeLists.txt
+++ b/examples/canvas_typed/CMakeLists.txt
@@ -16,4 +16,4 @@ SET(KIT_SRCS
   )
 
 ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
-TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS})
+TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})
diff --git a/examples/canvas_variant/CMakeLists.txt b/examples/canvas_variant/CMakeLists.txt
index 2191be1..2a13215 100644
--- a/examples/canvas_variant/CMakeLists.txt
+++ b/examples/canvas_variant/CMakeLists.txt
@@ -16,4 +16,4 @@ SET(KIT_SRCS
   )
 
 ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
-TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS})
+TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})
diff --git a/examples/decoration/CMakeLists.txt b/examples/decoration/CMakeLists.txt
index 8eac86a..3a595c5 100644
--- a/examples/decoration/CMakeLists.txt
+++ b/examples/decoration/CMakeLists.txt
@@ -12,4 +12,4 @@ SET(KIT_SRCS
   )
 
 ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
-TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS})
+TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})
diff --git a/examples/demo/CMakeLists.txt b/examples/demo/CMakeLists.txt
index 4660375..a3febb5 100644
--- a/examples/demo/CMakeLists.txt
+++ b/examples/demo/CMakeLists.txt
@@ -16,4 +16,4 @@ ELSE()
 ENDIF()
 
 ADD_EXECUTABLE(${example_name} ${KIT_SRCS} ${KIT_QRC_SRCS})
-TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS})
+TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})
diff --git a/examples/extension/CMakeLists.txt b/examples/extension/CMakeLists.txt
index 83dcd06..25d6b9c 100644
--- a/examples/extension/CMakeLists.txt
+++ b/examples/extension/CMakeLists.txt
@@ -12,4 +12,4 @@ SET(KIT_SRCS
   )
   
 ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
-TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS})
\ No newline at end of file
+TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})
\ No newline at end of file
diff --git a/examples/object_controller/CMakeLists.txt b/examples/object_controller/CMakeLists.txt
index f466fd5..390d017 100644
--- a/examples/object_controller/CMakeLists.txt
+++ b/examples/object_controller/CMakeLists.txt
@@ -13,4 +13,4 @@ SET(KIT_SRCS
   )
   
 ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
-TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS})
\ No newline at end of file
+TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})
\ No newline at end of file
diff --git a/examples/simple/CMakeLists.txt b/examples/simple/CMakeLists.txt
index a3e5d3d..7c5acde 100644
--- a/examples/simple/CMakeLists.txt
+++ b/examples/simple/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 SET(example_name simple)
 
 SET(KIT_SRCS
@@ -6,4 +5,4 @@ SET(KIT_SRCS
   )
   
 ADD_EXECUTABLE(${example_name} ${KIT_SRCS})
-TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME} ${QT_TARGETS})
+TARGET_LINK_LIBRARIES(${example_name} ${PROJECT_NAME})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 75f1145..7f34358 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,25 +45,25 @@ ELSE()
   QT4_ADD_RESOURCES(KIT_QRC_SRCS ${KIT_resources})
 ENDIF()
 
-SET(libname ${PROJECT_NAME})
-ADD_LIBRARY(${libname} STATIC
+ADD_LIBRARY(${PROJECT_NAME} STATIC
   ${KIT_SRCS}
   ${KIT_UI_CPP}
   ${KIT_MOC_CPP}
   ${KIT_QRC_SRCS}
   )
 
-target_include_directories(${libname} PRIVATE ${QT_INCLUDE_DIRS})
-target_compile_definitions(${libname} PRIVATE ${QT_COMPILE_DEFS})
-set_target_properties(${libname} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_include_directories(${PROJECT_NAME} PRIVATE ${QT_INCLUDE_DIRS})
+target_compile_definitions(${PROJECT_NAME} PRIVATE ${QT_COMPILE_DEFS})
+set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-  
-SET(${PROJECT_NAME}_LINK_LIBRARIES ${QT_LIBRARIES})
+SET(${PROJECT_NAME}_LINK_LIBRARIES ${QT_TARGETS})
 TARGET_LINK_LIBRARIES(
-  ${libname}
+  ${PROJECT_NAME}
   ${${PROJECT_NAME}_LINK_LIBRARIES}
   )
 
+add_dependencies(${PROJECT_NAME} ${QT_TARGETS})
+
 # List of header that should go though moc
 SET(KIT_HEADERS_MOC_SRCS
   qtbuttonpropertybrowser.h
@@ -110,7 +110,7 @@ FOREACH(file ${KIT_CPP_MOC_SRCS})
   LIST(APPEND KIT_MOC_CPP ${output_file})
 ENDFOREACH()
 
-add_custom_target(${libname}GenerateMoc
+add_custom_target(${PROJECT_NAME}GenerateMoc
   DEPENDS ${KIT_MOC_CPP}
   )
-add_dependencies(${libname} ${libname}GenerateMoc)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}GenerateMoc)