diff --git a/modules/softwareintegration/CMakeLists.txt b/modules/softwareintegration/CMakeLists.txt index cc7e2f3b68..62e0e83ecb 100644 --- a/modules/softwareintegration/CMakeLists.txt +++ b/modules/softwareintegration/CMakeLists.txt @@ -1,19 +1,19 @@ ########################################################################################## -# # +# # OpenSpace # -# # -# Copyright (c) 2014-2022 # -# # +# +# Copyright (c) 2014-2023 # +# # Permission is hereby granted, free of charge, to any person obtaining a copy of this # # software and associated documentation files (the "Software"), to deal in the Software # # without restriction, including without limitation the rights to use, copy, modify, # # merge, publish, distribute, sublicense, and/or sell copies of the Software, and to # # permit persons to whom the Software is furnished to do so, subject to the following # # conditions: # -# # +# # The above copyright notice and this permission notice shall be included in all copies # # or substantial portions of the Software. # -# # +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, # # INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A # # PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT # @@ -22,43 +22,43 @@ # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # ########################################################################################## -include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) +include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/softwareintegrationmodule.h - ${CMAKE_CURRENT_SOURCE_DIR}/softwareintegrationmodule.inl - ${CMAKE_CURRENT_SOURCE_DIR}/network/messagehandler.h - ${CMAKE_CURRENT_SOURCE_DIR}/network/messagehandler.inl - ${CMAKE_CURRENT_SOURCE_DIR}/network/network.h - ${CMAKE_CURRENT_SOURCE_DIR}/network/softwareconnection.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablepointscloud.h - ${CMAKE_CURRENT_SOURCE_DIR}/simp/simp.inl - ${CMAKE_CURRENT_SOURCE_DIR}/simp/simp.h - ${CMAKE_CURRENT_SOURCE_DIR}/utils/syncablestorage.h - ${CMAKE_CURRENT_SOURCE_DIR}/utils/syncablestorage.inl - ${CMAKE_CURRENT_SOURCE_DIR}/utils/interruptibleconcurrentqueue.h - ${CMAKE_CURRENT_SOURCE_DIR}/utils/interruptibleconcurrentqueue.inl - ${CMAKE_CURRENT_SOURCE_DIR}/session/session.h + softwareintegrationmodule.h + softwareintegrationmodule.inl + network/messagehandler.h + network/messagehandler.inl + network/network.h + network/softwareconnection.h + rendering/renderablepointscloud.h + simp/simp.inl + simp/simp.h + utils/syncablestorage.h + utils/syncablestorage.inl + utils/interruptibleconcurrentqueue.h + utils/interruptibleconcurrentqueue.inl + session/session.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/softwareintegrationmodule.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/softwareintegrationmodule_lua.inl - ${CMAKE_CURRENT_SOURCE_DIR}/network/messagehandler.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/network/network.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/network/softwareconnection.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablepointscloud.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/simp/simp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utils/syncablestorage.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/session/session.cpp + softwareintegrationmodule.cpp + softwareintegrationmodule_lua.inl + network/messagehandler.cpp + network/network.cpp + network/softwareconnection.cpp + rendering/renderablepointscloud.cpp + simp/simp.cpp + utils/syncablestorage.cpp + session/session.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/point_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/point_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/point_ge.glsl + shaders/point_vs.glsl + shaders/point_fs.glsl + shaders/point_ge.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) diff --git a/modules/softwareintegration/network/messagehandler.cpp b/modules/softwareintegration/network/messagehandler.cpp index 334a12b441..8a02610a49 100644 --- a/modules/softwareintegration/network/messagehandler.cpp +++ b/modules/softwareintegration/network/messagehandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/network/messagehandler.h b/modules/softwareintegration/network/messagehandler.h index 1a142023c2..5918205c40 100644 --- a/modules/softwareintegration/network/messagehandler.h +++ b/modules/softwareintegration/network/messagehandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/network/messagehandler.inl b/modules/softwareintegration/network/messagehandler.inl index 090c091f68..45ba94ca37 100644 --- a/modules/softwareintegration/network/messagehandler.inl +++ b/modules/softwareintegration/network/messagehandler.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/network/network.cpp b/modules/softwareintegration/network/network.cpp index ff3716b0c2..c925c16064 100644 --- a/modules/softwareintegration/network/network.cpp +++ b/modules/softwareintegration/network/network.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/network/network.h b/modules/softwareintegration/network/network.h index d3801dc487..c6a91e57bb 100644 --- a/modules/softwareintegration/network/network.h +++ b/modules/softwareintegration/network/network.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/network/softwareconnection.cpp b/modules/softwareintegration/network/softwareconnection.cpp index 1f03c71e6f..1f9cb03aa8 100644 --- a/modules/softwareintegration/network/softwareconnection.cpp +++ b/modules/softwareintegration/network/softwareconnection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/network/softwareconnection.h b/modules/softwareintegration/network/softwareconnection.h index 109f98a0f7..7597ce6738 100644 --- a/modules/softwareintegration/network/softwareconnection.h +++ b/modules/softwareintegration/network/softwareconnection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/rendering/renderablepointscloud.cpp b/modules/softwareintegration/rendering/renderablepointscloud.cpp index 1e8ea56b42..0780b29b03 100644 --- a/modules/softwareintegration/rendering/renderablepointscloud.cpp +++ b/modules/softwareintegration/rendering/renderablepointscloud.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/rendering/renderablepointscloud.h b/modules/softwareintegration/rendering/renderablepointscloud.h index 12c53317aa..cadf6de6d5 100644 --- a/modules/softwareintegration/rendering/renderablepointscloud.h +++ b/modules/softwareintegration/rendering/renderablepointscloud.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/session/session.cpp b/modules/softwareintegration/session/session.cpp index 2ac668e2c0..b39d999ae2 100644 --- a/modules/softwareintegration/session/session.cpp +++ b/modules/softwareintegration/session/session.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/session/session.h b/modules/softwareintegration/session/session.h index 8a88b90614..fb34f57c5e 100644 --- a/modules/softwareintegration/session/session.h +++ b/modules/softwareintegration/session/session.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/shaders/point_fs.glsl b/modules/softwareintegration/shaders/point_fs.glsl index eb7d70b0ed..00cd8ae641 100644 --- a/modules/softwareintegration/shaders/point_fs.glsl +++ b/modules/softwareintegration/shaders/point_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/shaders/point_ge.glsl b/modules/softwareintegration/shaders/point_ge.glsl index 5b8a80fca3..49055b3cef 100644 --- a/modules/softwareintegration/shaders/point_ge.glsl +++ b/modules/softwareintegration/shaders/point_ge.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/shaders/point_vs.glsl b/modules/softwareintegration/shaders/point_vs.glsl index d1c230cb25..55068e56c3 100644 --- a/modules/softwareintegration/shaders/point_vs.glsl +++ b/modules/softwareintegration/shaders/point_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/simp/simp.cpp b/modules/softwareintegration/simp/simp.cpp index 709386bbe9..7285bcb0da 100644 --- a/modules/softwareintegration/simp/simp.cpp +++ b/modules/softwareintegration/simp/simp.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/simp/simp.h b/modules/softwareintegration/simp/simp.h index b397461cfb..8439702c1a 100644 --- a/modules/softwareintegration/simp/simp.h +++ b/modules/softwareintegration/simp/simp.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/simp/simp.inl b/modules/softwareintegration/simp/simp.inl index aa7d20fe9a..b3ad5afc2f 100644 --- a/modules/softwareintegration/simp/simp.inl +++ b/modules/softwareintegration/simp/simp.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/softwareintegrationmodule.cpp b/modules/softwareintegration/softwareintegrationmodule.cpp index fa15c754b6..ac5995a95c 100644 --- a/modules/softwareintegration/softwareintegrationmodule.cpp +++ b/modules/softwareintegration/softwareintegrationmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/softwareintegrationmodule.h b/modules/softwareintegration/softwareintegrationmodule.h index 67dcf1647c..1edab78667 100644 --- a/modules/softwareintegration/softwareintegrationmodule.h +++ b/modules/softwareintegration/softwareintegrationmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/softwareintegrationmodule.inl b/modules/softwareintegration/softwareintegrationmodule.inl index dd827e9dd2..63fcad05d6 100644 --- a/modules/softwareintegration/softwareintegrationmodule.inl +++ b/modules/softwareintegration/softwareintegrationmodule.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/softwareintegrationmodule_lua.inl b/modules/softwareintegration/softwareintegrationmodule_lua.inl index de57629f6e..111487572b 100644 --- a/modules/softwareintegration/softwareintegrationmodule_lua.inl +++ b/modules/softwareintegration/softwareintegrationmodule_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/utils/interruptibleconcurrentqueue.h b/modules/softwareintegration/utils/interruptibleconcurrentqueue.h index b6d3bbb058..220a67967a 100644 --- a/modules/softwareintegration/utils/interruptibleconcurrentqueue.h +++ b/modules/softwareintegration/utils/interruptibleconcurrentqueue.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/utils/interruptibleconcurrentqueue.inl b/modules/softwareintegration/utils/interruptibleconcurrentqueue.inl index c3b50c1462..742aa6ea14 100644 --- a/modules/softwareintegration/utils/interruptibleconcurrentqueue.inl +++ b/modules/softwareintegration/utils/interruptibleconcurrentqueue.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/utils/syncablestorage.cpp b/modules/softwareintegration/utils/syncablestorage.cpp index b93093fde2..d012c03c1d 100644 --- a/modules/softwareintegration/utils/syncablestorage.cpp +++ b/modules/softwareintegration/utils/syncablestorage.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/utils/syncablestorage.h b/modules/softwareintegration/utils/syncablestorage.h index 3e6e08c75e..2db2c84dcf 100644 --- a/modules/softwareintegration/utils/syncablestorage.h +++ b/modules/softwareintegration/utils/syncablestorage.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/softwareintegration/utils/syncablestorage.inl b/modules/softwareintegration/utils/syncablestorage.inl index 73432eb06b..f084762bb0 100644 --- a/modules/softwareintegration/utils/syncablestorage.inl +++ b/modules/softwareintegration/utils/syncablestorage.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software *