Skip to content

Commit 61f61df

Browse files
committed
XtalOpt 13 (v13.0.0): Multi-Objective Evolutionary Search
1 parent 124f808 commit 61f61df

File tree

224 files changed

+27251
-24247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+27251
-24247
lines changed

.appveyor.yml

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

.clang-format

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

.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
build
2-
.ctags
3-
.cscope.out
4-
.cscope.files
1+
*build*
2+
.DS_Store*
3+
*~
54
*.swp
5+
*.swo
6+
~$*

.gitmodules

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

.travis.yml

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

CMakeLists.txt

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
cmake_minimum_required(VERSION 3.0)
1+
cmake_minimum_required(VERSION 3.0...3.27)
22
project(XtalOpt)
33

4-
set(XtalOpt_VERSION_MAJOR 12)
5-
set(XtalOpt_VERSION_MINOR 1)
4+
set(XtalOpt_VERSION_MAJOR 13)
5+
set(XtalOpt_VERSION_MINOR 0)
66
set(XtalOpt_VERSION_PATCH 0)
77
set(XtalOpt_VERSION "${XtalOpt_VERSION_MAJOR}.${XtalOpt_VERSION_MINOR}")
88
set(XtalOpt_VERSION_FULL "${XtalOpt_VERSION}.${XtalOpt_VERSION_PATCH}")
@@ -41,6 +41,20 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
4141

4242
include(MacroEnsureVersion)
4343

44+
option( XTALOPT_DEBUG
45+
"Enable writing xtaloptDebug.log file to the working directory"
46+
OFF )
47+
if(XTALOPT_DEBUG)
48+
add_definitions(-DXTALOPT_DEBUG)
49+
endif(XTALOPT_DEBUG)
50+
51+
option( MOES_DEBUG
52+
"Enable some useful output for monitoring feature analysis"
53+
OFF )
54+
if(MOES_DEBUG)
55+
add_definitions(-DMOES_DEBUG)
56+
endif(MOES_DEBUG)
57+
4458
option( BUILD_TESTS
4559
"Whether to compile the test suite as well as the main code."
4660
OFF )
@@ -112,14 +126,6 @@ option( ENABLE_GAPC
112126
"Build the evolutionary cluster search extension - DOES NOT WORK CURRENTLY"
113127
OFF )
114128

115-
option(ENABLE_MOLECULAR
116-
"Whether or not to compile the molecular version of XtalOpt"
117-
OFF)
118-
119-
option(RDKIT_STATIC
120-
"Whether or not to statically compile RDKit. Does nothing if ENABLE_MOLECULAR is off"
121-
OFF)
122-
123129
if(BUILD_INDEPENDENT_PACKAGE)
124130
set(ENABLE_RPATH ON)
125131
set(INSTALL_DEPENDENCIES ON)
@@ -157,10 +163,6 @@ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
157163
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
158164
endif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
159165

160-
if(ENABLE_MOLECULAR)
161-
add_definitions(-DENABLE_MOLECULAR)
162-
endif(ENABLE_MOLECULAR)
163-
164166
add_subdirectory(external)
165167
include_directories(external)
166168

0 commit comments

Comments
 (0)