Skip to content
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
526 changes: 383 additions & 143 deletions .github/workflows/supercell-cicd.yml

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
build/
build_*/
nbproject/
tmp/
obsolete/
__pycache__/

# Compiled Object files
*.slo
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "libs/common_utils"]
path = libs/common_utils
url = https://github.com/orex/common_utils.git
[submodule "3rd_party/gemmi"]
path = 3rd_party/gemmi
url = https://github.com/project-gemmi/gemmi.git
Expand Down
316 changes: 0 additions & 316 deletions 3rd_party/cmake/FindTBB.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion 3rd_party/gemmi
Submodule gemmi updated 331 files
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)

project(supercell)
include(FeatureSummary)
include(CTest)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

option(BUILD_PROGRAM "Build supercell program" ON)
option(BUILD_DOC "Build supercell manual and tutorial" ON)
option(BUILD_TESTING "Build supercell unit tests" ON)

if (BUILD_PROGRAM)
if (CMAKE_BUILD_TYPE STREQUAL "")
Expand All @@ -19,11 +23,7 @@ if (BUILD_PROGRAM)

if (${CMAKE_COMPILER_IS_GNUCXX})
if (${LINK_STATIC_LIBS})
if(NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++ -fuse-ld=gold -Wl,--no-gnu-unique")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++ ")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
endif ()
endif ()
Expand Down
1 change: 0 additions & 1 deletion libs/common_utils
Submodule common_utils deleted from d8eeb7
Loading
Loading