Skip to content

Commit

Permalink
- added sundials license file to cpp-runtime and to FMU distribution
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcus Walther committed Jun 23, 2015
1 parent c464299 commit 2ab8072
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 6 deletions.
2 changes: 2 additions & 0 deletions Compiler/Template/CodegenFMUCpp.tpl
Expand Up @@ -746,8 +746,10 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
<%\t%>$(CXX) -shared -o <%fileNamePrefix%>$(DLLEXT) $(OFILES) $(LDFLAGS) $(LIBS)
<%\t%>rm -rf binaries
<%\t%><%mkdir%> -p "binaries/$(PLATFORM)"
<%\t%><%mkdir%> -p "documentation"
<%\t%>cp <%fileNamePrefix%>$(DLLEXT) "binaries/$(PLATFORM)/"
<%\t%>cp $(SUNDIALS_LIBRARIES_KINSOL) "binaries/$(PLATFORM)/"
<%\t%>cp $(OMHOME)/share/omc/runtime/cpp/licenses/sundials.license "documentation/"
<%\t%>rm -f <%modelName%>.fmu
<%\t%>zip -r "<%modelName%>.fmu" modelDescription.xml binaries
<%\t%>rm -rf binaries
Expand Down
8 changes: 4 additions & 4 deletions SimulationRuntime/cpp/CMakeLists.txt
Expand Up @@ -593,10 +593,10 @@ ENDMACRO(INSTALL_HEADERS_WITH_DIRECTORY)

install (FILES "${PROJECT_BINARY_DIR}/LibrariesConfig.h" DESTINATION include/omc/cpp)

install (FILES "Licenses/sundials.license" DESTINATION share/omc/runtime/cpp/licenses)


#copy Utils/extension
SET(HS Include/Core/Object/IObject.h
#copy Utils/extension
SET(HS Include/Core/Object/IObject.h
Include/Core/Object/Object.h
Include/Core/Utils/extension/adaptable_factory.hpp
Include/Core/Utils/extension/common.hpp
Expand All @@ -610,7 +610,7 @@ install (FILES "${PROJECT_BINARY_DIR}/LibrariesConfig.h" DESTINATION include/omc
Include/Core/Utils/extension/registry.hpp
Include/Core/Utils/extension/shared_library.hpp
Include/Core/Utils/extension/type_map.hpp
Include/Core/Utils/extension/logger.hpp
Include/Core/Utils/extension/logger.hpp
Include/Core/Utils/extension/impl/adaptable_factory.hpp
Include/Core/Utils/extension/impl/adaptable_factory_free_functions.hpp
Include/Core/Utils/extension/impl/adaptable_factory_set.hpp
Expand Down
19 changes: 19 additions & 0 deletions SimulationRuntime/cpp/Licenses/sundials.license
@@ -0,0 +1,19 @@
Copyright © 2002-2014, Lawrence Livermore National Security.
Produced at the Lawrence Livermore National Laboratory.
All rights reserved.

This file is part of SUNDIALS.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Redistributions of source code must retain the above copyright notice, this list of conditions, and the disclaimer below.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the disclaimer (as noted below) in the documentation and/or other materials provided with the distribution.
Neither the name of the LLNS/LLNL nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

DISCLAIMER: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY, OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Additional BSD Notice

This notice is required to be provided under our contract with the U.S. Department of Energy (DOE). This work was produced at Lawrence Livermore National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
Neither the United States Government nor Lawrence Livermore National Security, LLC, nor any of their employees, makes any warranty, express or implied, or assumes any liability or responsibility for the accuracy, completeness, or usefulness of any information, apparatus, product, or process disclosed, or represents that its use would not infringe privately-owned rights.
Also, reference herein to any specific commercial products, process, or services by trade name, trademark, manufacturer or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United States Government or Lawrence Livermore National Security, LLC. The views and opinions of authors expressed herein do not necessarily state or reflect those of the United States Government or Lawrence Livermore National Security, LLC, and shall not be used for advertising or product endorsement purposes.
3 changes: 1 addition & 2 deletions SimulationRuntime/cpp/Solver/Euler/CMakeLists.txt
Expand Up @@ -19,5 +19,4 @@ endif(UNIX)
target_link_libraries (${EulerName} ${SolverName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} )

install (TARGETS ${EulerName} ${EulerName}_static DESTINATION ${LIBINSTALLEXT})
install (FILES "config/EulerSettings.xml"
DESTINATION share/omc/runtime/cpp/config)
install (FILES "config/EulerSettings.xml" DESTINATION share/omc/runtime/cpp/config)

0 comments on commit 2ab8072

Please sign in to comment.