Skip to content

Commit

Permalink
Distribute all packages w/o =distributed-packages file (cmake)
Browse files Browse the repository at this point in the history
  • Loading branch information
d-torrance committed Nov 23, 2024
1 parent a62980d commit 46e81ad
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 3 additions & 1 deletion M2/Macaulay2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ file(COPY LAYOUT COPYING-GPL-2 COPYING-GPL-3 DESTINATION ${M2_DIST_PREFIX}/${M2_
# eg: Style Macaulay2Doc ...
# This will be used by d/CMakeLists.txt and packages/CMakeLists.txt
# TODO: discontinue using this list
file(STRINGS "packages/\=distributed-packages" DISTRIBUTED_PACKAGES REGEX "^[a-zA-Z0-9]+$")
file(GLOB DISTRIBUTED_PACKAGES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/packages/"
"${CMAKE_CURRENT_SOURCE_DIR}/packages/*.m2")
string(REPLACE ".m2" "" DISTRIBUTED_PACKAGES "${DISTRIBUTED_PACKAGES}")
list(JOIN DISTRIBUTED_PACKAGES " " DISTRIBUTED_PACKAGES)

# This tells CMake how to set the RPATH on the installed executable
Expand Down
3 changes: 0 additions & 3 deletions M2/include/M2/config.h.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,6 @@
/* hostname used for compilation */
#define NODENAME "${NODENAME}"

/* the list of packages included with the release of Macaulay2 */
#define PACKAGES "${PACKAGES}"

/* Define to the full name of this package. */
#define PACKAGE_NAME "${PROJECT_NAME}"

Expand Down

0 comments on commit 46e81ad

Please sign in to comment.