Skip to content

Commit b899f94

Browse files
committed
Remove old-style gauge theory package. Disable mathematica support by default.
1 parent 70769b9 commit b899f94

File tree

4 files changed

+2
-72
lines changed

4 files changed

+2
-72
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ endif()
7272
# )
7373

7474
# Turn Mathematica support on/off.
75-
option(ENABLE_MATHEMATICA "Enable Mathematica support" ON)
75+
option(ENABLE_MATHEMATICA "Enable Mathematica support" OFF)
7676

7777
# Are we trying to build cadabra as a c++ library?
7878
option(BUILD_AS_CPP_LIBRARY "Build cadabra as a C++ library" OFF)

core/packages/CMakeLists.txt

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ set(PACKAGEDIR ${CMAKE_BINARY_DIR}/core/packages/cdb)
1717
# Enumerate packages
1818
#---------------------------------------------------------------------------
1919

20-
set(OLDPACKAGES
21-
# relativity/__init__
22-
# relativity/schwarzschild
23-
gauge_theory/__init__
24-
gauge_theory/instantons
25-
)
26-
2720
set(PACKAGES
2821
core/component
2922
core/manip
@@ -32,55 +25,16 @@ set(PACKAGES
3225
utils/node
3326
utils/develop
3427
sympy/solvers
28+
gauge_theory/instantons
3529
relativity/abstract
3630
relativity/schwarzschild
3731
)
3832

39-
set(PDIRS
40-
relativity
41-
gauge_theory
42-
)
43-
44-
45-
#---------------------------------------------------------------------------
46-
# Convert packages from cdb to python.
47-
#---------------------------------------------------------------------------
48-
49-
message(STATUS "Packages built in ${PACKAGEDIR}")
50-
file(MAKE_DIRECTORY ${PACKAGEDIR})
51-
foreach(PDIR ${PDIRS})
52-
add_custom_target("${PDIR}" ALL
53-
COMMAND ${CMAKE_COMMAND} -E make_directory ${PACKAGEDIR}/${PDIR}
54-
COMMENT "Creating package ${PDIR}...")
55-
endforeach()
56-
foreach(PACKAGE ${OLDPACKAGES})
57-
string(REGEX REPLACE "/" "_" PACKAGETARGET ${PACKAGE})
58-
message(STATUS "\t${PACKAGETARGET}")
59-
add_custom_target("${PACKAGETARGET}" ALL
60-
COMMAND cadabra2python ${CMAKE_SOURCE_DIR}/core/packages/cdb/${PACKAGE}.cdb ${PACKAGEDIR}/${PACKAGE}.py
61-
COMMENT "Creating ${PACKAGE}.py...")
62-
endforeach()
63-
6433

6534
#---------------------------------------------------------------------------
6635
# Install packages
6736
#---------------------------------------------------------------------------
6837

69-
foreach(PACKAGE ${OLDPACKAGES})
70-
get_filename_component(PINSTALL ${PACKAGE} DIRECTORY)
71-
# Remove old packages in the global site path
72-
if(NOT WIN32)
73-
remove_file(${OLD_PYTHON_SITE_PATH}/${PACKAGEDIR}/${PACKAGE}.py)
74-
remove_file(${OLDER_PYTHON_SITE_PATH}/${PACKAGEDIR}/${PACKAGE}.py)
75-
endif()
76-
install(
77-
FILES
78-
"${PACKAGEDIR}/${PACKAGE}.py"
79-
DESTINATION
80-
${PYTHON_CDB_PACKAGE_PATH}/${PINSTALL}
81-
)
82-
endforeach()
83-
8438
foreach(PACKAGE ${PACKAGES})
8539
get_filename_component(PINSTALL ${PACKAGE} DIRECTORY)
8640
install(

core/packages/cdb/gauge_theory/__init__.cdb

Lines changed: 0 additions & 8 deletions
This file was deleted.

core/packages/cdb/gauge_theory/instantons.cdb

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)