Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dpilger26 committed Jul 23, 2020
2 parents 2ecc131 + 0ba6995 commit fc68d89
Show file tree
Hide file tree
Showing 2,162 changed files with 67,255 additions and 65,885 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ __pycache__/
*build/
*buildVS/
*bin/
*lib/

test/lib/
install/out/
*.tar
59 changes: 59 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
cmake_minimum_required(VERSION 3.14)

project("NumCpp"
VERSION 2.1.0
DESCRIPTION "A Templatized Header Only C++ Implementation of the Python NumPy Library"
HOMEPAGE_URL "https://github.com/dpilger26/NumCpp"
LANGUAGES CXX
)

if (NUMCPP_TEST)
add_subdirectory(test)
endif()

if (NUMCPP_EXAMPLES)
add_subdirectory(examples)
endif()

include(GNUInstallDirs)
add_library(${PROJECT_NAME} INTERFACE)
target_include_directories(${PROJECT_NAME} INTERFACE
$<BUILD_INTERFACE:${${PROJECT_NAME}_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)

target_compile_features(${PROJECT_NAME} INTERFACE $<INSTALL_INTERFACE:cxx_std_17>)

install(TARGETS ${PROJECT_NAME}
EXPORT ${PROJECT_NAME}_Targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)

include(CMakePackageConfigHelpers)
write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
VERSION ${PROJECT_VERSION}
COMPATIBILITY SameMajorVersion)

configure_package_config_file(
"${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in"
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
INSTALL_DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
)

install(EXPORT ${PROJECT_NAME}_Targets
FILE ${PROJECT_NAME}Targets.cmake
NAMESPACE ${PROJECT_NAME}::
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
)

install(FILES
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
)

install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include)
26 changes: 21 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

## Author: David Pilger dpilger26@gmail.com

## Version: 2.0.0
## Version: 2.1.0

## License [![MIT license](https://img.shields.io/badge/License-MIT-blue.svg)](https://lbesson.mit-license.org/)

Expand All @@ -29,18 +29,34 @@ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PA

## Testing

**C++ Standards:** C++14, C++17, and C++2a
**Compilers:** VS 2017/2019, GCC 6.5.0/7.5.0/8.4.0/9.3.0, and Clang 8.0/9.0/10.0
**Boost Versions:** 1.68, 1.70, 1.72, and 1.73
**C++ Standards:**
C++14
C++17
C++2a

**Compilers:**
Visual Studio: 2017, 2019
GNU: 6.5, 7.5, 8.4, 9.3, 10.1
Clang: 6, 7, 8, 9, 10

**Boost Versions:**
1.68, 1.70, 1.72, and 1.73

## [Documentation](https://dpilger26.github.io/NumCpp)

## [GitHub](https://github.com/dpilger26/NumCpp)

## [Installation](https://dpilger26.github.io/NumCpp/doxygen/html/md__c_1__users_pilgeda__documents__git_hub__num_cpp_install__r_e_a_d_m_e.html)
## [Installation](https://dpilger26.github.io/NumCpp/doxygen/html/md__c_1__github__num_cpp_docs_markdown__installation.html)

## [Building](https://dpilger26.github.io/NumCpp/doxygen/html/md__c_1__github__num_cpp_docs_markdown__building.html)

## Release Notes

### Version 2.1.0

* Improved installation and usage with CMake find_package support
* Various minor improvements

### Version 2.0.0

* Dropped support of C++11, now requires a C++14 or higher compiler
Expand Down
28 changes: 28 additions & 0 deletions cmake/NumCppConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# @PROJECT_NAME@Config.cmake
# --------------------
#
# @PROJECT_NAME@ cmake module.
# This module sets the following variables in your project::
#
# @PROJECT_NAME@_FOUND - true if @PROJECT_NAME@ found on the system
# @PROJECT_NAME@_VERSION - @PROJECT_NAME@ version in format Major.Minor.Release
# @PROJECT_NAME@_INCLUDE_DIR - Directory where @PROJECT_NAME@ headers are located.
#
# The following variables can be set to guide the search for this package::
#
# @PROJECT_NAME@_DIR - CMake variable, set to directory containing this Config file
# CMAKE_PREFIX_PATH - CMake variable, set to root directory of this package
# PATH - environment variable, set to bin directory of this package
#
@PACKAGE_INIT@

if(NOT TARGET @PROJECT_NAME@::@PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
set_and_check(@PROJECT_NAME@_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
check_required_components("@PROJECT_NAME@")

find_package(Boost REQUIRED)
set_property(TARGET @PROJECT_NAME@::@PROJECT_NAME@ APPEND PROPERTY INTERFACE_LINK_LIBRARIES Boost::headers)

message(STATUS "Found NumCpp: ${@PROJECT_NAME@_INCLUDE_DIR} (found version ${@PROJECT_NAME@_VERSION})")
endif()
7 changes: 4 additions & 3 deletions docs/doxygen/generator/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "NumCpp"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.0
PROJECT_NUMBER = 2.1.0

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand All @@ -51,7 +51,7 @@ PROJECT_BRIEF = "A C++ implementation of the Python Numpy library"
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.

PROJECT_LOGO = ..\logo\logo.png
PROJECT_LOGO = ../../logo/NumCppLogoDoxygen.png

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
Expand Down Expand Up @@ -792,7 +792,8 @@ WARN_LOGFILE =
# Note: If this tag is empty the current directory is searched.

INPUT = ../../../README.md \
../../../install/README.md \
../../markdown/Installation.md \
../../markdown/Building.md \
../../../include \

# This tag can be used to specify the character encoding of the source files
Expand Down
Binary file added docs/doxygen/html/NumCppLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/doxygen/html/NumCppLogoDoxygen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions docs/doxygen/html/_bisection_8hpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<table cellspacing="0" cellpadding="0">
<tbody>
<tr style="height: 56px;">
<td id="projectlogo"><img alt="Logo" src="logo.png"/></td>
<td id="projectlogo"><img alt="Logo" src="NumCppLogoDoxygen.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">NumCpp
&#160;<span id="projectnumber">1.0</span>
&#160;<span id="projectnumber">2.1.0</span>
</div>
<div id="projectbrief">A C++ implementation of the Python Numpy library</div>
</td>
Expand Down Expand Up @@ -113,7 +113,7 @@
</table>
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
<div class="textblock"><dl class="section author"><dt>Author</dt><dd>David Pilger <a href="#" onclick="location.href='mai'+'lto:'+'dpi'+'lg'+'er2'+'6@'+'gma'+'il'+'.co'+'m'; return false;">dpilg<span style="display: none;">.nosp@m.</span>er26<span style="display: none;">.nosp@m.</span>@gmai<span style="display: none;">.nosp@m.</span>l.co<span style="display: none;">.nosp@m.</span>m</a> <a href="https://github.com/dpilger26/NumCpp">GitHub Repository</a> </dd></dl>
<dl class="section version"><dt>Version</dt><dd>2.0.0</dd></dl>
<dl class="section version"><dt>Version</dt><dd>2.1.0</dd></dl>
<h1><a class="anchor" id="License"></a>
License</h1>
<p>Copyright 2019 Benjamin Mahr Copyright 2020 David Pilger</p>
Expand Down
Loading

0 comments on commit fc68d89

Please sign in to comment.