From c6eb43e62e0b69d7f0dd7f2871d10a8ebc2d56a7 Mon Sep 17 00:00:00 2001 From: Avery King Date: Wed, 1 Jan 2025 04:26:22 -0800 Subject: [PATCH] Fix nyquist target Restore the old installation directories. Fixes Inno Setup on Windows as well. Signed-off-by: Avery King --- nyquist/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nyquist/CMakeLists.txt b/nyquist/CMakeLists.txt index 2c974bdf3b..08e97a2c8b 100755 --- a/nyquist/CMakeLists.txt +++ b/nyquist/CMakeLists.txt @@ -56,7 +56,7 @@ list( APPEND RUNTIME foreach( source ${RUNTIME} ) set( src "${_SRCDIR}/${source}" ) - set( dst "${_DEST}/${TARGET}/${source}" ) + set( dst "${_DEST}/nyquist/${source}" ) # Fix this when reorganizing the Nyquist sources if( source STREQUAL "system.lsp" ) @@ -69,7 +69,7 @@ foreach( source ${RUNTIME} ) DEPENDS "${src}" COMMAND - ${CMAKE_COMMAND} -E make_directory "${_DEST}/${TARGET}" + ${CMAKE_COMMAND} -E make_directory "${_DEST}/nyquist" COMMAND ${CMAKE_COMMAND} -E copy "${src}" "${dst}" OUTPUT @@ -84,7 +84,7 @@ add_custom_target( ${TARGET} ALL DEPENDS ${OUTPUTS} SOURCES ${SOURCES} ) if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" ) if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*") - install( DIRECTORY "${_DEST}/${TARGET}" + install( DIRECTORY "${_DEST}/nyquist" DESTINATION "${_PKGDATA}" ) endif() endif()