From 5aabf7fd76487ad436d0ee386950652d0947ea9d Mon Sep 17 00:00:00 2001 From: Jordy Aaldering <33897257+JordyAaldering@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:26:57 +0100 Subject: [PATCH] Add missing variants --- src/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 909bec5..5f07434 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,7 +50,7 @@ ENDMACRO () STRING (REPLACE "/usr/local/" "" _install_mod_dir ${INSTALL_MOD_DIR}) STRING (REPLACE "/usr/local/" "" _install_tree_dir ${INSTALL_TREE_DIR}) -# This variable will hold all the Mod/Tree files that this module +# This variable will hold all the Mod/ files that this module # will deliver and they will become a part of the all-modules target # which will be the only default target generated by this makefile. SET (ALL_SAC_MODULES) @@ -440,7 +440,7 @@ FUNCTION (MATCH_NAME_IN_LIST list name ret) ENDFOREACH () ENDFUNCTION () -# For every sac file, compile Tree and Mod files. +# For every sac file, compile and Mod files. FOREACH (name ${SAC_SRC}) SET (src "${CMAKE_CURRENT_SOURCE_DIR}/${name}") # sac2c requires computes objectfiles relatively to the working directory @@ -515,9 +515,9 @@ FOREACH (name ${XSAC_SRC}) GET_FILENAME_COMPONENT (dir "${CMAKE_CURRENT_BINARY_DIR}/${name}" DIRECTORY) GET_FILENAME_COMPONENT (dst ${name} NAME_WE) SET (mod - "${DLL_BUILD_DIR}/${TARGET_ENV}/${SBI}/lib${dst}Mod${MODEXT}") + "${DLL_BUILD_DIR}/${TARGET_ENV}/${SBI}/lib${dst}Mod${VARIANT}${MODEXT}") SET (tree - "${DLL_BUILD_DIR}/tree/${TARGET_ENV}/${SBI}/lib${dst}Tree${TREE_DLLEXT}") + "${DLL_BUILD_DIR}/tree/${TARGET_ENV}/${SBI}/lib${dst}Tree${VARIANT}${TREE_DLLEXT}") RESOLVE_SAC_DEPS_AS_TARGETS ("${name}" "-module-" target_list objs_list source_list) MESSAGE (STATUS "Computing dependencies for `${name}'")