Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit 6c5d0ec

Browse files
authored
Merge pull request #667 from ORNL-AMO/develop
AMO-Tools-Suite v1.0.1
2 parents 8f7a58c + f342ab8 commit 6c5d0ec

File tree

64 files changed

+2327
-3463
lines changed

Some content is hidden

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

64 files changed

+2327
-3463
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ tags
2121
### Eclipse template
2222

2323
.metadata
24-
bin/
2524
tmp/
2625
*.tmp
2726
*.bak
@@ -126,7 +125,6 @@ CTestTestfile.cmake
126125
x64/
127126
x86/
128127
bld/
129-
[Bb]in/
130128
[Oo]bj/
131129
[Ll]og/
132130

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ if(BUILD_WASM)
4141
set(BUILD_PACKAGE false)
4242
set(BUILD_TESTING false)
4343
set(CMAKE_CXX_STANDARD 11)
44-
set(CMAKE_CXX_FLAGS "-fexceptions --bind -s WASM=1 -O3 -s ASSERTIONS=1 -std=c++11")
44+
set(CMAKE_CXX_FLAGS "-fexceptions -O3 -std=c++11")
45+
set(CMAKE_EXE_LINKER_FLAGS "--no-entry --bind -s WASM=1 -s ASSERTIONS=1 -s ERROR_ON_UNDEFINED_SYMBOLS=0")
4546
else ()
4647
include(cmake/CompilerFlags.cmake)
4748
endif ()
@@ -544,7 +545,7 @@ if( BUILD_TESTING )
544545
# Create unit testing executable
545546
add_executable(amo_tools_suite_tests tests/main.unit.cpp ${TEST_FILES})
546547
target_link_libraries( amo_tools_suite_tests Catch amo_tools_suite )
547-
else (BUILD_WASM)
548+
elseif ( BUILD_WASM )
548549
add_executable(client ${SOURCE_FILES} ${SOURCE_FILES_WASM})
549550
endif()
550551

@@ -571,4 +572,4 @@ if( BUILD_PACKAGE )
571572
)
572573

573574
include(cmake/Install.cmake)
574-
endif()
575+
endif()

Doxyfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = AMO-Tools-Suite
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = v.0.1.34
41+
PROJECT_NUMBER = v.1.0.1
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a
@@ -791,7 +791,7 @@ WARN_LOGFILE =
791791
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
792792
# Note: If this tag is empty the current directory is searched.
793793

794-
INPUT = /Users/g9a/ClionProjects/AMO-Tools-Suite
794+
INPUT = include
795795

796796
# This tag can be used to specify the character encoding of the source files
797797
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

0 commit comments

Comments
 (0)