diff '--color=auto' -r -U3 src.orig/CMakeLists.txt src/CMakeLists.txt --- src.orig/CMakeLists.txt 2025-10-05 20:31:58.000000000 +0700 +++ src/CMakeLists.txt 2025-10-13 11:23:23.257474930 +0700 @@ -1,10 +1,11 @@ # # -- CMakeLists.txt for GLE - Graphics Layout Engine # -cmake_minimum_required (VERSION 3.30) +cmake_minimum_required (VERSION 3.50) cmake_policy(SET CMP0091 NEW) # windows static runtimes selection #cmake_policy(SET CMP0167 NEW) # The FindBoost module is removed. only for cmake 3.30 and later live with the warning for now cmake_policy(SET CMP0074 NEW) # uses _ROOT variables. +cmake_policy(SET CMP0177 NEW) # normalize DESTINATION paths set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) include(CheckIncludeFile) @@ -595,18 +596,17 @@ # documentation file installation in doc folder install(FILES - ../doc/LICENSE.txt ../doc/README.txt ../doc/ChangeLog.txt CONFIGURATIONS Release Debug - DESTINATION ./doc + DESTINATION ./${GLEDOC} ) # # -- install include files from gle-library repo # install(DIRECTORY ${GLE_EXAMPLES_LIBRARY_PATH}/include/ - DESTINATION ./gleinc + DESTINATION ./share/gle/gleinc CONFIGURATIONS Release Debug OPTIONAL PATTERN "*.gle" @@ -617,7 +617,7 @@ # install(FILES ${GLE_USER_MANUAL_PATH}/gle-manual.pdf - DESTINATION ./doc + DESTINATION ./${GLEDOC} CONFIGURATIONS Release Debug OPTIONAL ) diff '--color=auto' -r -U3 src.orig/fonts/CMakeLists.txt src/fonts/CMakeLists.txt --- src.orig/fonts/CMakeLists.txt 2025-10-05 20:31:58.000000000 +0700 +++ src/fonts/CMakeLists.txt 2025-10-13 11:25:22.307477179 +0700 @@ -310,5 +310,5 @@ ${FMT_FILES} ${FVE_FILES} CONFIGURATIONS Release Debug - DESTINATION font) + DESTINATION ./share/gle/font) diff '--color=auto' -r -U3 src.orig/gle/CMakeLists.txt src/gle/CMakeLists.txt --- src.orig/gle/CMakeLists.txt 2025-10-05 20:31:58.000000000 +0700 +++ src/gle/CMakeLists.txt 2025-10-13 11:39:25.134159818 +0700 @@ -1,3 +1,4 @@ +cmake_policy(SET CMP0177 NEW) # normalize DESTINATION paths set(GLE_SOURCES bitmap/img2ps.cpp @@ -129,10 +130,10 @@ if(ZSTD_FOUND) target_link_libraries ( gle LINK_PUBLIC - zstd::libzstd_static + zstd::libzstd_shared ) target_link_libraries ( gle-graphics LINK_PUBLIC - zstd::libzstd_static + zstd::libzstd_shared ) endif() @@ -201,5 +202,5 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glerc CONFIGURATIONS Release Debug - DESTINATION . ) + DESTINATION ./share/gle ) diff '--color=auto' -r -U3 src.orig/gui/CMakeLists.txt src/gui/CMakeLists.txt --- src.orig/gui/CMakeLists.txt 2025-10-05 20:31:58.000000000 +0700 +++ src/gui/CMakeLists.txt 2025-10-13 11:40:02.467493862 +0700 @@ -126,7 +126,7 @@ endif() if(ZSTD_FOUND) list(APPEND QGLE_LIBRARIES - zstd::libzstd_static + zstd::libzstd_shared ) endif() diff '--color=auto' -r -U3 src.orig/TeX/CMakeLists.txt src/TeX/CMakeLists.txt --- src.orig/TeX/CMakeLists.txt 2025-10-05 20:31:58.000000000 +0700 +++ src/TeX/CMakeLists.txt 2025-10-13 12:42:14.357564475 +0700 @@ -1,8 +1,8 @@ # # -- generate inittex.ini from init.tex # -set(GLE_DIR ${CMAKE_BINARY_DIR}/gle$<$:$,/Debug,/Release>>) -set(GLE gle$<$:d>) +set(GLE_DIR ${CMAKE_BINARY_DIR}/gle) +set(GLE ${GLE_DIR}/gle) # inittex.ini is generated from init.tex by running "gle -mkinittex" # for gle to run: # - init.tex must reside one directory level up from location of the gle executable. @@ -29,7 +29,7 @@ COMMAND "$<$>:${CMAKE_COMMAND};-E;copy;${GLE_DIR}/glerc;${CMAKE_BINARY_DIR}/glerc>" COMMAND "$<$>:${CMAKE_COMMAND};-E;create_symlink;${GLE_DIR}/font;${CMAKE_BINARY_DIR}/font>" COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/init.tex ${CMAKE_BINARY_DIR}$<$:/gle>/init.tex - COMMAND ${GLE} -mkinittex + COMMAND GLE_TOP=${CMAKE_BINARY_DIR} ${GLE} -mkinittex COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}$<$:/gle>/inittex.ini ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}$<$:/gle>/inittex.ini ${CMAKE_BINARY_DIR}/TeX COMMAND ${CMAKE_COMMAND} -E rm ${CMAKE_BINARY_DIR}$<$:/gle>/init.tex @@ -40,6 +40,8 @@ COMMAND_EXPAND_LISTS ) +cmake_policy(SET CMP0177 NEW) # normalize DESTINATION paths + add_custom_target(inittex ALL DEPENDS inittex.ini ) @@ -48,7 +50,7 @@ init.tex inittex.ini CONFIGURATIONS Release Debug - DESTINATION . + DESTINATION ./share/gle )