diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt
index c7f63d0..a7be75a 100644
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -36,24 +36,23 @@ if (LIBPROJECT)
 endif()
 
 if (NOT DEFINED ENV{QNX_HOST})
-	set(CPPS "pidumper.cpp" "pidumper_main.cpp")
-	set(MOCS "pidumper.h")
-	set(UIS "pidumper.ui")
 	file(GLOB RES "*.qrc")
-	qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
-	qt4_wrap_ui(CUIS ${UIS})
 	qt4_add_resources(RESS ${RES})
-	add_executable(pidumper ${CPPS} ${CMOCS} ${CUIS} ${RESS})
+	
+	set(PIDUMPER_CPPS "pidumper.cpp" "pidumper_main.cpp")
+	set(PIDUMPER_MOCS "pidumper.h")
+	set(PIDUMPER_UIS "pidumper.ui")
+	qt4_wrap_cpp(PIDUMPER_CMOCS ${PIDUMPER_MOCS} OPTIONS -nw)
+	qt4_wrap_ui(PIDUMPER_CUIS ${PIDUMPER_UIS})
+	add_executable(pidumper ${PIDUMPER_CPPS} ${PIDUMPER_CMOCS} ${PIDUMPER_CUIS} ${RESS})
 	target_link_libraries(pidumper ${LIBS} ${PROJECT_NAME})
 
-	set(ICPPS "piintrospector.cpp" "piintrospector_main.cpp")
-	set(IMOCS "piintrospector.h")
-	set(IUIS "piintrospector.ui")
-	file(GLOB IRES "*.qrc")
-	qt4_wrap_cpp(ICMOCS ${IMOCS} OPTIONS -nw)
-	qt4_wrap_ui(ICUIS ${IUIS})
-	qt4_add_resources(IRESS ${IRES})
-	add_executable(piintrospector ${ICPPS} ${ICMOCS} ${ICUIS} ${IRESS})
+	set(PIINTROSPECTOR_CPPS "piintrospector.cpp" "piintrospector_main.cpp")
+	set(PIINTROSPECTOR_MOCS "piintrospector.h")
+	set(PIINTROSPECTOR_UIS "piintrospector.ui")
+	qt4_wrap_cpp(PIINTROSPECTOR_CMOCS ${PIINTROSPECTOR_MOCS} OPTIONS -nw)
+	qt4_wrap_ui(PIINTROSPECTOR_CUIS ${PIINTROSPECTOR_UIS})
+	add_executable(piintrospector ${PIINTROSPECTOR_CPPS} ${PIINTROSPECTOR_CMOCS} ${PIINTROSPECTOR_CUIS} ${RESS})
 	target_link_libraries(piintrospector ${LIBS} ${PROJECT_NAME})
 
 	add_executable(piconnectionedit "piconnedit_main.cpp" ${RESS})