Skip to content

GitLab

Commit 69f661a0 authored by Clint Stimpson's avatar Clint Stimpson
Browse files

Update copyright notice in Verdict source. 

Increment to version 1.3.

git-svn-id: file:///scratch/cjstimp/svn/cubit/CUBIT_SOURCE/trunk@416429 d353b8dc-a10e-11dd-9ca7-d543032e456e
parent 0bf941ef
master julin/master 1.4.2 1.4.1 1.4.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 104 additions and 218 deletions
+104 -218
CMakeLists.txt
View file @ 69f661a0
# Copyright (c) 2003,2006 Sandia National Laboratories <cubit@sandia.gov>
project(verdict)
# Copyright 2006 National Technology & Engineering Solutions of Sandia,
# LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
# the U.S. Government retains certain rights in this software.
cmake_minimum_required( VERSION 3.1 )
project(verdict)
if(POLICY CMP0063)
cmake_policy(SET CMP0063 NEW)
endif()
set( verdict_MAJOR_VERSION "1")
set( verdict_MINOR_VERSION "2")
set( verdict_MINOR_VERSION "3")
set( verdict_BUILD_VERSION "0")
set( verdict_VERSION_FLAT "${verdict_MAJOR_VERSION}${verdict_MINOR_VERSION}${verdict_BUILD_VERSION}" )
set( verdict_VERSION "${verdict_MAJOR_VERSION}.${verdict_MINOR_VERSION}.${verdict_BUILD_VERSION}" )
......@@ -47,11 +50,6 @@ configure_file(
@ONLY
)
# temporary - remove old configured verdict.h file from build directory
if(EXISTS ${verdict_BINARY_DIR}/verdict.h)
file(REMOVE ${verdict_BINARY_DIR}/verdict.h)
endif()
add_library( verdict ${verdict_SRCS} )
target_include_directories(verdict PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
......@@ -73,6 +71,9 @@ endif ()
if ( VERDICT_ENABLE_TESTING )
enable_testing()
if(NOT TARGET GTest::GTest)
find_package(GTest REQUIRED)
endif()
function(ADD_VERDICT_UNITTESTS DIR)
ADD_SUBDIRECTORY(${verdict_SOURCE_DIR}/${DIR} ${verdict_BINARY_DIR}/${DIR})
......@@ -135,47 +136,3 @@ export(EXPORT ${VERDICT_EXPORT_GROUP} FILE VerdictConfig.cmake)
install(EXPORT ${VERDICT_EXPORT_GROUP} FILE VerdictConfig.cmake
DESTINATION ${verdict_INSTALL_LIB_DIR} COMPONENT VerdictDevelopment
)
#
# Packing stuff
#
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
if (EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
set (CMAKE_INSTALL_MFC_LIBRARIES 1)
# include (InstallRequiredSystemLibraries)
endif ()
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "VERDICT - a geometric quality functions library")
set (CPACK_PACKAGE_VENDOR "Sandia National Laboratories")
set (CPACK_PACKAGE_INSTALL_DIRECTORY "Verdict ${verdict_MAJOR_VERSION}.${verdict_MINOR_VERSION}")
set (CPACK_SOURCE_PACKAGE_FILE_NAME "verdict-${verdict_VERSION}")
set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
set (CPACK_PACKAGE_VERSION_MAJOR "${verdict_MAJOR_VERSION}")
set (CPACK_PACKAGE_VERSION_MINOR "${verdict_MINOR_VERSION}")
set (CPACK_PACKAGE_VERSION_PATCH "${verdict_BUILD_VERSION}")
set (CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
if (${CMAKE_SYSTEM_NAME} MATCHES Windows)
if (CMAKE_CL_64)
set (CPACK_SYSTEM_NAME win64)
else (CMAKE_CL_64)
set (CPACK_SYSTEM_NAME win32)
endif ()
endif ()
set (CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
if (WIN32 AND NOT UNIX)
# There is a bug in NSI that does not handle full unix paths properly.
# Make sure there is at least one set of four (4) backslashes.
set (CPACK_PACKAGE_ICON "${verdict_SOURCE_DIR}/Utilities/Release\\\\VerdictIcon.bmp")
#set (CPACK_PACKAGE_EXECUTABLES "CMakeSetup" "CMake")
#set (CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\CMakeSetup.exe")
set (CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} a geometric quality functions library")
set (CPACK_NSIS_HELP_LINK "http:\\\\\\\\cubit.sandia.gov/verdict.html")
set (CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.sandia.gov")
set (CPACK_NSIS_CONTACT "cubit@sandia.gov")
set (CPACK_NSIS_MODIFY_PATH ON)
else (WIN32 AND NOT UNIX)
#set (CPACK_STRIP_FILES "bin/ccmake;bin/cmake;bin/cpack;bin/ctest")
#set (CPACK_PACKAGE_EXECUTABLES "")
endif ()
include(CPack)
endif ()
LICENSE 0 → 100644
View file @ 69f661a0
Copyright 2003,2006,2019 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
Under the terms of Contract DE-NA0003525 with NTESS, the U.S. Government retains certain rights in this software.
All rights reserved.
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 following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the <organization> nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
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 <COPYRIGHT HOLDER> 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.
V_EdgeMetric.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_EdgeMetric.cpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_GaussIntegration.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_GaussIntegration.cpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_GaussIntegration.hpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_GaussIntegration.hpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_HexMetric.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_HexMetric.cpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_HexMetric.hpp
View file @ 69f661a0
/*=========================================================================
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_KnifeMetric.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_KnifeMetric.cpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_PyramidMetric.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_PyramidMetric.cpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_QuadMetric.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_QuadMetric.cpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_TetMetric.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_TetMetric.cpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_TriMetric.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_TriMetric.cpp
Copyright (c) 2007 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
V_WedgeMetric.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: V_WedgeMetric.cpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
VerdictVector.cpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: VerdictVector.cpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
VerdictVector.hpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: VerdictVector.hpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
unittests/CMakeLists.txt
View file @ 69f661a0
PROJECT(unittests_verdict)
INCLUDE_DIRECTORIES( SYSTEM
${gtest_SOURCE_DIR}
${gtest_SOURCE_DIR}/include)
SET(TEST_SRCS
unittest_main.cpp
......@@ -10,4 +5,4 @@ SET(TEST_SRCS
)
ADD_EXECUTABLE(unittests_verdict ${TEST_SRCS})
TARGET_LINK_LIBRARIES(unittests_verdict verdict gtest gtest_main)
TARGET_LINK_LIBRARIES(unittests_verdict verdict GTest::GTest GTest::Main)
v_vector.h
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: v_vector.h
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......
verdict.h
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: verdict.h.in
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......@@ -23,9 +21,6 @@
*
*/
// .SECTION Thanks
// Prior to its inclusion within VTK, this code was developed by the CUBIT
// project at Sandia National Laboratories.
#ifndef __verdict_h
#define __verdict_h
......@@ -74,12 +69,6 @@ namespace verdict { using namespace VERDICT_NAMESPACE; }
Verdict calculates individual metrics on a single elment.
\section GetVerdict Obtaining, Configuring, Building, and Installing Verdict
Since your are reading reference documentation generated from the source code,
you ostensibly already have Verdict.
Instructions for this are on a separate page: \ref ObtainConfigureBuildInstall .
\section UsingVerdict Using Verdict
Verdict functions take the parameters below and return the calculated
......@@ -121,47 +110,6 @@ namespace verdict { using namespace VERDICT_NAMESPACE; }
\endcode
*/
/*!\page ObtainConfigureBuildInstall Obtain, Configure, Build, and Install Verdict
\section ObtainVerdict Obtaining the Verdict Source Code
The verdict source code repository is now maintained by <a href="http://www.kitware.com/">Kitware</a>.
You can check out the source with \code
cvs -d :pserver:anonymous@public.kitware.com:/cvsroot/Verdict login
cvs -d :pserver:anonymous@public.kitware.com:/cvsroot/Verdict -z3 co Verdict
\endcode
When asked for a password, enter "verdict".
\section ConfiguringVerdict Configuring Verdict
Verdict uses <a href="http://www.cmake.org/">CMake</a> to create project files.
To build Verdict from source, you will need to obtain CMake.
We strongly suggest that you build Verdict in a separate directory tree from the source code.
Life is just too short to explain why; if you're curious, search the CMake mailing list.
To make the instructions clear, we'll assume that you have the Verdict source code in \c /tmp/Verdict.
Configuring Verdict is then as simple as \code
mkdir /tmp/VerdictBuild
cd /tmp/VerdictBuild
cmake ../Verdict
\endcode
At this point, you may wish to edit <tt>/tmp/VerdictBuild/CMakeCache.txt</tt> to change settings
from their default values.
If you are going to include Verdict inside another library, you might want to read
how to use \ref VerdictAsASubProject.
\section BuildingAndInstallingVerdict Building and Installing Verdict
Assuming you are using CMake's Makefile generator, building and installing Verdict
is accomplished with \code
make
make install
\endcode
By default, Verdict will be installed in \c /usr/local.
If you wish to change the location, edit your <tt>CMakeCache.txt</tt> file so that
\c CMAKE_INSTALL_PREFIX contains a different directory and re-run \c cmake.
*/
namespace VERDICT_NAMESPACE
{
......
verdict_config.h.in
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: verdict_config.h.in
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......@@ -20,10 +18,6 @@
*
*/
// .SECTION Thanks
// Prior to its inclusion within VTK, this code was developed by the CUBIT
// project at Sandia National Laboratories.
#ifndef __verdict_config_h
#define __verdict_config_h
......
verdict_defines.hpp
View file @ 69f661a0
......@@ -2,13 +2,11 @@
Module: verdict_defines.hpp
Copyright (c) 2006 Sandia Corporation.
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
Copyright 2006 National Technology & Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS,
the U.S. Government retains certain rights in this software.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
See LICENSE for details.
=========================================================================*/
......@@ -20,10 +18,6 @@
*
*/
// .SECTION Thanks
// Prior to its inclusion within VTK, this code was developed by the CUBIT
// project at Sandia National Laboratories.
#ifndef VERDICT_DEFINES
#define VERDICT_DEFINES
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Menu

Help