From 0a29364afc1d8b4ae83907d30954e22b9759b83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20J=2E=20Saraiva?= Date: Wed, 16 Oct 2024 17:10:40 +0100 Subject: [PATCH] Change the DYNAMIPS_RENAME value to none. The empty value does not work properly with ccmake. --- cmake/configure.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/configure.cmake b/cmake/configure.cmake index 794421159..e9f94d592 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -67,10 +67,10 @@ else () endif () print_variables ( DYNAMIPS_CODE BUILD_DYNAMIPS_STABLE BUILD_DYNAMIPS_UNSTABLE ) -# Rename target (auto;stable;unstable;) -# XXX should auto or not renaming be the default? -set ( DYNAMIPS_RENAME "auto" CACHE STRING "which executable is renamed to dynamips (auto;stable;unstable;)" ) -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;)" ) +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 )