--- a/cmake-scripts/asy-base-files.cmake +++ b/cmake-scripts/asy-base-files.cmake @@ -76,7 +76,12 @@ file(MAKE_DIRECTORY ${ASY_BUILD_BASE_DIR set(ASYGL_OUTPUT_LOCATION_BASE webgl/asygl.js) if(USE_PREBUILT_WEBGL_LIB) - copy_base_file_with_custom_output_name(webgl/asygl-${ASY_GL_VERSION}.js ${ASYGL_OUTPUT_LOCATION_BASE}) + if(EXISTS ${ASY_SOURCE_BASE_DIR}/webgl/asygl-${ASY_GL_VERSION}.js) + copy_base_file_with_custom_output_name(webgl/asygl-${ASY_GL_VERSION}.js ${ASYGL_OUTPUT_LOCATION_BASE}) + else() + # release tarballs only ship the prebuilt asygl.js + copy_base_file_with_custom_output_name(webgl/asygl.js ${ASYGL_OUTPUT_LOCATION_BASE}) + endif() else() set(ASYGL_OUTPUT ${ASY_BUILD_BASE_DIR}/${ASYGL_OUTPUT_LOCATION_BASE}) add_custom_command( --- a/cmake-scripts/linux-install.cmake +++ b/cmake-scripts/linux-install.cmake @@ -55,8 +55,14 @@ install( ) # extra base files -> / +if (ENABLE_MISCFILES_GEN) + set(ASY_KEYWORDS_EL_FILE ${ASY_MISC_FILES_OUT_DIR}/asy-keywords.el) +else() + # shipped in release tarballs + set(ASY_KEYWORDS_EL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/asy-keywords.el) +endif() install( - FILES ${ASY_MISC_FILES_OUT_DIR}/asy-keywords.el ${ASY_BASE_EXTRA_FILES} + FILES ${ASY_KEYWORDS_EL_FILE} ${ASY_BASE_EXTRA_FILES} DESTINATION ${ASY_INSTALL_SYSDIR_VALUE} COMPONENT ${ASY_BASE_INSTALL_COMPONENT} PERMISSIONS ${PERMISSION_644_LIST} --- a/cmake-scripts/subrepo-projects.cmake +++ b/cmake-scripts/subrepo-projects.cmake @@ -4,10 +4,10 @@ set(LSP_REPO_ROOT ${ASY_SUBREPO_CLONE_RO set(TINYEXR_SUBREPO_ROOT ${ASY_SUBREPO_CLONE_ROOT}/tinyexr) set(BOEHM_GC_ROOT ${ASY_SUBREPO_CLONE_ROOT}/gc) set(LIBATOMIC_OPS_ROOT ${ASY_SUBREPO_CLONE_ROOT}/libatomic_ops) -# boehm gc +# boehm gc, bundled sub projects are linked statically, not installed if (ENABLE_GC) set(enable_gpl OFF CACHE INTERNAL "libatomicops gpl libs option") - add_subdirectory(${LIBATOMIC_OPS_ROOT}) + add_subdirectory(${LIBATOMIC_OPS_ROOT} EXCLUDE_FROM_ALL) set(OLD_CFLAG_EXTRA ${CFLAG_EXTRA}) set(CFLAGS_EXTRA -I${LIBATOMIC_OPS_ROOT}/src) # for bdwgc @@ -21,7 +21,7 @@ if (ENABLE_GC) set(enable_throw_bad_alloc_library OFF CACHE INTERNAL "bdwgc gctba library (Windows-only in asymptote)") endif() set(enable_large_config ON CACHE INTERNAL "bdwgc large config") - add_subdirectory(${BOEHM_GC_ROOT}) + add_subdirectory(${BOEHM_GC_ROOT} EXCLUDE_FROM_ALL) set(CFLAG_EXTRA ${OLD_CFLAG_EXTRA}) unset(BUILD_SHARED_LIBS CACHE) @@ -75,7 +75,7 @@ if (ENABLE_LSP) set(LSPCPP_GC_STATIC ON CACHE INTERNAL "lsp use static gc") endif() - add_subdirectory(${LSP_REPO_ROOT}) + add_subdirectory(${LSP_REPO_ROOT} EXCLUDE_FROM_ALL) list(APPEND ASY_STATIC_LIBRARIES lspcpp) list(APPEND ASY_MACROS HAVE_LSP=1)