diff --git a/scripts/cmake/Functions.cmake b/scripts/cmake/Functions.cmake
index 1a88d30f43efe903c9603be03593ab99461e37d1..e0e806c336b7258e17f2691d70570de6abe2d2f3 100644
--- a/scripts/cmake/Functions.cmake
+++ b/scripts/cmake/Functions.cmake
@@ -9,7 +9,7 @@ ENDMACRO()
 MACRO(GET_SOURCE_FILES SOURCE_FILES)
 	
 	IF(ARGC EQUAL 2)
-		SET(DIR "${arg2}/")
+		SET(DIR "${arg2}")
 	ELSE()
 		SET(DIR "")
 	ENDIF()
@@ -21,7 +21,8 @@ MACRO(GET_SOURCE_FILES SOURCE_FILES)
 	SET(${SOURCE_FILES} ${GET_SOURCE_FILES_HEADERS} ${GET_SOURCE_FILES_SOURCES})
 	
 	GET_CURRENT_SOURCE_SUBDIRECTORY(DIRECTORY)
-	MESSAGE("Curr: ${DIRECTORY}")
-	SOURCE_GROUP( ${DIRECTORY} FILES ${SOURCE_FILES})
+	SOURCE_GROUP( "${DIRECTORY}" FILES
+		${GET_SOURCE_FILES_HEADERS}
+		${GET_SOURCE_FILES_SOURCES})
 	
 ENDMACRO()
\ No newline at end of file