diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index f8181c839..a4cebcee9 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -176,6 +176,11 @@ MACRO(SETUP_APPLICATION APPLICATION_NAME)
 
 ENDMACRO(SETUP_APPLICATION)
 
+MACRO(SETUP_COMMANDLINE_APPLICATION APPLICATION_NAME)
+
+    SETUP_APPLICATION(APPLICATION_NAME 1)
+
+ENDMACRO(SETUP_COMMANDLINE_APPLICATION)
 
 # Takes optional second argument (is_commandline_app?) in ARGV1
 MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
@@ -195,3 +200,8 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
 ENDMACRO(SETUP_EXAMPLE)
 
 
+MACRO(SETUP_COMMANDLINE_EXAMPLE EXAMPLE_NAME)
+
+    SETUP_EXAMPLE(EXAMPLE_NAME 1)
+
+ENDMACRO(SETUP_COMMANDLINE_EXAMPLE)
diff --git a/applications/osgversion/CMakeLists.txt b/applications/osgversion/CMakeLists.txt
index 1f52183fd..ddfb0fb62 100644
--- a/applications/osgversion/CMakeLists.txt
+++ b/applications/osgversion/CMakeLists.txt
@@ -3,5 +3,5 @@
 
 SET(TARGET_SRC osgversion.cpp )
 #### end var setup  ###
-# The YES denotes commandline app
-SETUP_APPLICATION(osgversion 1)
+
+SETUP_COMMANDLINE_APPLICATION(osgversion)
diff --git a/examples/osgunittests/CMakeLists.txt b/examples/osgunittests/CMakeLists.txt
index 058668245..481d34105 100644
--- a/examples/osgunittests/CMakeLists.txt
+++ b/examples/osgunittests/CMakeLists.txt
@@ -4,5 +4,5 @@
 SET(TARGET_SRC UnitTestFramework.cpp UnitTests_osg.cpp osgunittests.cpp performance.cpp )
 SET(TARGET_H UnitTestFramework.h performance.h )
 #### end var setup  ###
-# The 1 denotes commandline app (for TRUE)
-SETUP_EXAMPLE(osgunittests 1)
+
+SETUP_COMMANDLINE_EXAMPLE(osgunittests)