Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove old dla tools #46

Merged
merged 1 commit into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ option(Document "Build HTML document" OFF)

option(USE_SYSTEM_BOOST "use Boost installed in system" OFF)

option(BUILD_NEW_GENERATORS "build new file-generators" ON)
option(BUILD_OLD_GENERATORS "build old file-generators" OFF)

enable_language(C CXX)

set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
Expand Down Expand Up @@ -69,16 +66,14 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/plog)
set(python_version_required 3.6)

if(NOT PYTHON_EXECUTABLE)
if(BUILD_NEW_GENERATORS OR Testing OR Document)
if(${CMAKE_VERSION} VERSION_LESS 3.12)
find_package(PythonInterp ${python_version_required} REQUIRED)
set(python_version_mm "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
else(${CMAKE_VERSION} VERSION_LESS 3.12)
find_package(Python3 ${python_version_required} COMPONENTS Interpreter REQUIRED)
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
set(python_version_mm "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}")
endif(${CMAKE_VERSION} VERSION_LESS 3.12)
endif()
if(${CMAKE_VERSION} VERSION_LESS 3.12)
find_package(PythonInterp ${python_version_required} REQUIRED)
set(python_version_mm "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
else(${CMAKE_VERSION} VERSION_LESS 3.12)
find_package(Python3 ${python_version_required} COMPONENTS Interpreter REQUIRED)
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
set(python_version_mm "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}")
endif(${CMAKE_VERSION} VERSION_LESS 3.12)
else()
# check python version
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-V" OUTPUT_VARIABLE result ERROR_VARIABLE result)
Expand All @@ -105,9 +100,7 @@ if(MPI_FOUND)
add_subdirectory(src/pmwa)
endif(MPI_FOUND)

if(BUILD_NEW_GENERATORS)
add_subdirectory(tool)
endif()
add_subdirectory(tool)

if (Testing)
enable_testing()
Expand Down
5 changes: 0 additions & 5 deletions src/dla/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,3 @@ if(MPI_FOUND)
endif(MPI_FOUND)

set(dla_deps dla)

if(BUILD_OLD_GENERATORS)
add_subdirectory(generators)
set(dla_deps ${dla_deps} dla_alg_old lattgene_C lattgene_T hamgen_H hamgen_B cfgene sfgene)
endif(BUILD_OLD_GENERATORS)
26 changes: 0 additions & 26 deletions src/dla/generators/CMakeLists.txt

This file was deleted.

127 changes: 0 additions & 127 deletions src/dla/generators/boson_B.h

This file was deleted.

78 changes: 0 additions & 78 deletions src/dla/generators/canonical.h

This file was deleted.

Loading