Merge pull request #275 from flaviojs/change-DYNAMIPS_RENAME-empty-none

Change the DYNAMIPS_RENAME value <empty> to none.

cmake/configure.cmake

@@ -67,10 +67,10 @@ else ()
 endif ()
 print_variables ( DYNAMIPS_CODE BUILD_DYNAMIPS_STABLE BUILD_DYNAMIPS_UNSTABLE )
 
-# Rename target (auto;stable;unstable;<empty>)
-# XXX should auto or not renaming be the default?
-set ( DYNAMIPS_RENAME "auto" CACHE STRING "which executable is renamed to dynamips (auto;stable;unstable;<empty>)" )
-set_property ( CACHE DYNAMIPS_RENAME PROPERTY STRINGS "auto" "stable" "unstable" )
+# Rename target (auto;stable;unstable;none)
+# XXX should auto or none be the default?
+set ( DYNAMIPS_RENAME "auto" CACHE STRING "which executable is renamed to dynamips (auto;stable;unstable;none)" )
+set_property ( CACHE DYNAMIPS_RENAME PROPERTY STRINGS "auto" "stable" "unstable" "none" )
 set ( DYNAMIPS_RENAME_TARGET )
 if ( "auto" STREQUAL DYNAMIPS_RENAME )
    foreach ( _target "${DYNAMIPS_CODE}" "stable" "unstable" )
@@ -82,8 +82,8 @@ if ( "auto" STREQUAL DYNAMIPS_RENAME )
    endforeach ()
 elseif ( "stable" STREQUAL DYNAMIPS_RENAME OR "unstable" STREQUAL DYNAMIPS_RENAME )
    set ( DYNAMIPS_RENAME_TARGET "dynamips_${DYNAMIPS_ARCH}_${DYNAMIPS_RENAME}" )
-elseif ( DYNAMIPS_RENAME )
-   message ( FATAL_ERROR "unknown rename target DYNAMIPS_RENAME=${DYNAMIPS_RENAME} (auto;stable;unstable;<empty>)" )
+elseif ( NOT "none" STREQUAL DYNAMIPS_RENAME )
+   message ( FATAL_ERROR "unknown rename target DYNAMIPS_RENAME=${DYNAMIPS_RENAME} (auto;stable;unstable;none)" )
 endif ()
 print_variables ( DYNAMIPS_RENAME DYNAMIPS_RENAME_TARGET )