Skip to content

Commit

Permalink
DEV: Updated stable to latest default
Browse files Browse the repository at this point in the history
--HG--
branch : stable
  • Loading branch information
emminizer committed Mar 11, 2020
2 parents 8bf0596 + 410c619 commit 5519b98
Show file tree
Hide file tree
Showing 252 changed files with 8,462 additions and 7,357 deletions.
1 change: 1 addition & 0 deletions .hgtags
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
14518462105ba7e265e3e6bb970c127656302861 stable-2019-12
4174e5d213265d708442b7444a82e2e679ef5061 simdis10.0_SR6
4174e5d213265d708442b7444a82e2e679ef5061 simdissdk-1.11
24ae53881d9993f0500061fe9c2045acaa919359 simdissdk-1.9
Expand Down
6 changes: 3 additions & 3 deletions CMakeImport/ImportGDAL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Setting the GDAL_DIR environment variable will allow use of a custom built library

set(LIBRARYNAME GDAL)
set(${LIBRARYNAME}_VERSION 2.1.1)
set(${LIBRARYNAME}_VERSION 2.4.4)
set(${LIBRARYNAME}_INSTALL_COMPONENT ThirdPartyLibs)

# Setup search paths based off GDAL_ROOT
Expand All @@ -23,11 +23,11 @@ find_path(${LIBRARYNAME}_LIBRARY_INCLUDE_PATH
PATHS ${${LIBRARYNAME}_ROOT}/include NO_DEFAULT_PATH)
# GDAL_LIBRARY_RELEASE_PATH
find_library(${LIBRARYNAME}_LIBRARY_RELEASE_NAME
NAMES gdal gdal_i gdal201 gdal111
NAMES gdal gdal_i gdal204 gdal201 gdal111
PATHS ${${LIBRARYNAME}_ROOT}/lib NO_DEFAULT_PATH)
# GDAL_LIBRARY_DEBUG_PATH
find_library(${LIBRARYNAME}_LIBRARY_DEBUG_NAME
NAMES gdal_d gdal201_d gdal111_d
NAMES gdal_d gdal204_d gdal201_d gdal111_d
PATHS ${${LIBRARYNAME}_ROOT}/lib NO_DEFAULT_PATH)
# Fall back on release library explicitly, only on Windows
if(WIN32 AND ${LIBRARYNAME}_LIBRARY_RELEASE_NAME AND NOT ${LIBRARYNAME}_LIBRARY_DEBUG_NAME)
Expand Down
1 change: 1 addition & 0 deletions CMakeImport/ImportProtobuf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ function(CREATE_PROTOBUF_LIBRARY LIB_TARGETNAME LIB_PROJECTNAME FOLDER PROJECT_L
set_target_properties(${LIB_TARGETNAME} PROPERTIES
FOLDER "${FOLDER}"
PROJECT_LABEL "${PROJECT_LABEL}"
UNITY_BUILD OFF
)

endfunction()
2 changes: 1 addition & 1 deletion CMakeImport/ImportSQLite.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Setup SQLite library
# Setting the SQLITE3_DIR environment variable will allow use of a custom built library

set(SQLITE_VERSION 3.29.0)
set(SQLITE_VERSION 3.31.1)

# Setup search paths
initialize_ENV(SQLITE3_DIR)
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@ include(ImportProtobuf)
# --- SQLITE3 -----------------------------
set(SQLITE3_DIR "" CACHE PATH "Sqlite3 root directory")
include(ImportSQLite)
if (SQLITE3_FOUND)
set(SIM_HAVE_DB_SUPPORT 1)
endif()

# subprojects
add_subdirectory(SDK)
Expand Down
34 changes: 0 additions & 34 deletions CMakeModules/CreateInstallProperties.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -109,40 +109,6 @@ function(create_plugin_install_properties TARGET)
endfunction()


# Used for SIMDIS SDK osg/osgEarth plug-ins (osgdb_osgearth_db)
function(create_osg_plugin_install_properties TARGET)
# Separate ARGN into specific lists so that the INSTALLATION_COMPONENT can be removed from create_library arg list and iterated over
set(arglists "INSTALLATION_COMPONENT")
# Option names
set(options "RPATH")

# Get the argument lists
parse_arguments(ARG "${arglists}" "${options}" ${ARGN})

if(ARG_RPATH)
# Compute RPATH for lib directory containing dependencies relative to bin installation directory
set(LIBRARY_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALLSETTINGS_LIBRARY_DIR})
set(RUNTIME_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALLSETTINGS_OSGPLUGIN_DIR})
file(RELATIVE_PATH REL_INSTALL_PATH ${RUNTIME_INSTALL_PATH} ${LIBRARY_INSTALL_PATH})

# If the lib and bin paths were the same, an empty value will be returned
if(NOT REL_INSTALL_PATH)
set(REL_INSTALL_PATH ".")
endif()

# Set install RPATH variable
set_target_properties(${TARGET} PROPERTIES INSTALL_RPATH "\$ORIGIN/${REL_INSTALL_PATH}")
endif()

# Setup installation
foreach(COMPONENT ${ARG_INSTALLATION_COMPONENT})
install(TARGETS ${TARGET}
COMPONENT ${COMPONENT}
RUNTIME DESTINATION ${INSTALLSETTINGS_OSGPLUGIN_DIR} # Windows DLL destination
LIBRARY DESTINATION ${INSTALLSETTINGS_OSGPLUGIN_DIR}) # UNIX shared object destination
endforeach()
endfunction()

# Include the code for post_build_install() command
include(PostBuildInstall)

Expand Down
5 changes: 4 additions & 1 deletion CMakeModules/HelperFunctions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,10 @@ endfunction()
macro(vsi_require_target)
foreach(target ${ARGN})
if(NOT TARGET ${target})
if(VERBOSE)
if(WARN_SKIPPED_TARGETS)
get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}" NAME)
message(WARNING "Skipping ${_DIR}, missing target ${target}")
elseif(VERBOSE)
get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}" NAME)
message(STATUS "Skipping ${_DIR}, missing target ${target}")
endif()
Expand Down
7 changes: 4 additions & 3 deletions Examples/ASIViewer/ASIViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@
#include "simVis/Types.h"
#include "simUtil/ExampleResources.h"

#include <osgEarth/Controls>
#include <osgEarth/StringUtils>
#include <osg/ImageStream>
#include "osg/ImageStream"
#include "osgDB/ReadFile"
#include "osgEarth/Controls"
#include "osgEarth/StringUtils"

namespace ui = osgEarth::Util::Controls;

Expand Down
2 changes: 1 addition & 1 deletion Examples/ASIViewer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_asiviewer ${PROJECT_FILES})
target_link_libraries(example_asiviewer PRIVATE simVis simUtil)
set_target_properties(example_asiviewer PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - ASI Simple Viewer"
PROJECT_LABEL "ASI Simple Viewer"
)
vsi_install_target(example_asiviewer SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/AngleTest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_angletest ${PROJECT_FILES})
target_link_libraries(example_angletest PRIVATE simVis simUtil)
set_target_properties(example_angletest PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Angle Test"
PROJECT_LABEL "Angle Test"
)
vsi_install_target(example_angletest SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/AnimatedLine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_animatedline ${PROJECT_FILES})
target_link_libraries(example_animatedline PRIVATE simVis simUtil)
set_target_properties(example_animatedline PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Animated Line"
PROJECT_LABEL "Animated Line"
)
vsi_install_target(example_animatedline SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/AntennaPattern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_antennapattern ${PROJECT_FILES})
target_link_libraries(example_antennapattern PRIVATE simVis simUtil)
set_target_properties(example_antennapattern PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Antenna Pattern"
PROJECT_LABEL "Antenna Pattern"
)
vsi_install_target(example_antennapattern SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/ArticulatedModel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_articulatedmodel ${PROJECT_FILES})
target_link_libraries(example_articulatedmodel PRIVATE simVis simUtil)
set_target_properties(example_articulatedmodel PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Articulated Model"
PROJECT_LABEL "Articulated Model"
)
vsi_install_target(example_articulatedmodel SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/AsyncModelLoading/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_asyncmodelloading ${PROJECT_FILES})
target_link_libraries(example_asyncmodelloading PRIVATE simVis simUtil)
set_target_properties(example_asyncmodelloading PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Asynchronous Model Loading"
PROJECT_LABEL "Asynchronous Model Loading"
)
vsi_install_target(example_asyncmodelloading SDK_Examples)
1 change: 0 additions & 1 deletion Examples/BasicViewer/BasicViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
* map control. It shows how to adjust window appearance, how to add or remove
* inset views, and how to change the motion model.
*/

#include "simNotify/Notify.h"
#include "simCore/Common/Version.h"
#include "simCore/Common/HighPerformanceGraphics.h"
Expand Down
2 changes: 1 addition & 1 deletion Examples/BasicViewer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_basicviewer ${PROJECT_FILES})
target_link_libraries(example_basicviewer PRIVATE simVis simUtil)
set_target_properties(example_basicviewer PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Basic Viewer"
PROJECT_LABEL "Basic Viewer"
)
vsi_install_target(example_basicviewer SDK_Examples)
4 changes: 2 additions & 2 deletions Examples/BasicViewerText/BasicViewerText.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* BasicViewerText is the BasicViewer example with Help overlay removed and various HudManager HudText elements added.
* It demonstrates HudText layout behaviors.
*/

#include "osgDB/ReadFile"
#include "simNotify/Notify.h"
#include "simCore/Common/Version.h"
#include "simCore/Common/HighPerformanceGraphics.h"
Expand Down Expand Up @@ -234,7 +234,7 @@ int main(int argc, char** argv)
simVis::View* superHUD = new simVis::View();
superHUD->setUpViewAsHUD(mainView);
mainView->getViewManager()->addView(superHUD);
simUtil::HudManager hm(superHUD);
simUtil::HudManager hm(superHUD, superHUD->getOrCreateHUD());

// Create a background for some of the text using a large hyphen
osg::ref_ptr<simUtil::HudText> background1 = hm.createText("-", 130, 132, false, false);
Expand Down
2 changes: 1 addition & 1 deletion Examples/BasicViewerText/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_basicviewertext ${PROJECT_FILES})
target_link_libraries(example_basicviewertext PRIVATE simVis simUtil)
set_target_properties(example_basicviewertext PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Basic Viewer Text"
PROJECT_LABEL "Basic Viewer Text"
)
vsi_install_target(example_basicviewertext SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/BeamTest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_beamtest ${PROJECT_FILES})
target_link_libraries(example_beamtest PRIVATE simVis simUtil)
set_target_properties(example_beamtest PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Beams Test"
PROJECT_LABEL "Beams Test"
)
vsi_install_target(example_beamtest SDK_Examples)
9 changes: 6 additions & 3 deletions Examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ add_subdirectory(BasicViewer)
add_subdirectory(BasicViewerText)
add_subdirectory(CentroidEyePosition)
add_subdirectory(CustomRenderingTest)
add_subdirectory(DBReader)
add_subdirectory(GeoFencing)
add_subdirectory(GOGAttachments)
add_subdirectory(GOGReader)
Expand All @@ -20,7 +19,6 @@ add_subdirectory(MapScale)
add_subdirectory(MassiveData)
add_subdirectory(ObserverMaker)
add_subdirectory(Ocean)
add_subdirectory(Overhead)
add_subdirectory(Periscope)
add_subdirectory(Picking)
add_subdirectory(PlatformSymbology)
Expand All @@ -30,11 +28,16 @@ add_subdirectory(RangeTool)
add_subdirectory(RCS)
add_subdirectory(RFProp)
add_subdirectory(RocketBurn)
add_subdirectory(LoadEarthFile)
add_subdirectory(SkyModel)
add_subdirectory(SimpleServer)
add_subdirectory(TimestampedLayer)

if(SIM_HAVE_DB_SUPPORT)
add_subdirectory(DBReader)
add_subdirectory(LoadEarthFile)
add_subdirectory(Overhead)
endif()

if(QT_FOUND)
add_subdirectory(Qt)
add_subdirectory(QtActionItemModelTest)
Expand Down
2 changes: 1 addition & 1 deletion Examples/CentroidEyePosition/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_centroideyeposition ${PROJECT_FILES})
target_link_libraries(example_centroideyeposition PRIVATE simVis simUtil)
set_target_properties(example_centroideyeposition PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Centroid Eye Position"
PROJECT_LABEL "Centroid Eye Position"
)
vsi_install_target(example_centroideyeposition SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/CustomRenderingTest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_customrenderingtest ${PROJECT_FILES})
target_link_libraries(example_customrenderingtest PRIVATE simVis simUtil)
set_target_properties(example_customrenderingtest PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Custom Rendering"
PROJECT_LABEL "Custom Rendering"
)
vsi_install_target(example_customrenderingtest SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/DBReader/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_dbreader ${PROJECT_FILES})
target_link_libraries(example_dbreader PRIVATE simVis simUtil)
set_target_properties(example_dbreader PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - DB Reader"
PROJECT_LABEL "DB Reader Test"
)
vsi_install_target(example_dbreader SDK_Examples)
1 change: 0 additions & 1 deletion Examples/DBReader/DBReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "simCore/Common/HighPerformanceGraphics.h"
#include "simUtil/ExampleResources.h"
#include "simVis/Viewer.h"
#include "simVis/DBOptions.h"
#include "simVis/osgEarthVersion.h"
#include "simUtil/ExampleResources.h"
#include "simVis/DBFormat.h"
Expand Down
2 changes: 1 addition & 1 deletion Examples/GOGAttachments/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_gogattachments ${PROJECT_FILES})
target_link_libraries(example_gogattachments PRIVATE simVis simUtil)
set_target_properties(example_gogattachments PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - GOG Attachments"
PROJECT_LABEL "GOG Attachments"
)
vsi_install_target(example_gogattachments SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/GOGReader/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_gogreader ${PROJECT_FILES})
target_link_libraries(example_gogreader PRIVATE simVis simUtil)
set_target_properties(example_gogreader PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - GOG Reader"
PROJECT_LABEL "GOG Reader"
)
vsi_install_target(example_gogreader SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/GateTest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_gatetest ${PROJECT_FILES})
target_link_libraries(example_gatetest PRIVATE simVis simUtil)
set_target_properties(example_gatetest PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Gates Test"
PROJECT_LABEL "Gates Test"
)
vsi_install_target(example_gatetest SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/GeoFencing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_geofencing ${PROJECT_FILES})
target_link_libraries(example_geofencing PRIVATE simVis simUtil)
set_target_properties(example_geofencing PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - GeoFencing"
PROJECT_LABEL "GeoFencing"
)
vsi_install_target(example_geofencing SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/HudPositionManager/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_hudpositionmanager ${PROJECT_FILES})
target_link_libraries(example_hudpositionmanager PRIVATE simVis simUtil)
set_target_properties(example_hudpositionmanager PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - HUD Position Manager"
PROJECT_LABEL "HUD Position Manager"
)
vsi_install_target(example_hudpositionmanager SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/ImageIcons/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_imageicons ${PROJECT_FILES})
target_link_libraries(example_imageicons PRIVATE simVis simUtil)
set_target_properties(example_imageicons PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Image Icons"
PROJECT_LABEL "Image Icons"
)
vsi_install_target(example_imageicons SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/LOBTest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_lobtest ${PROJECT_FILES})
target_link_libraries(example_lobtest PRIVATE simVis simUtil)
set_target_properties(example_lobtest PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Line of Bearing Test"
PROJECT_LABEL "Line of Bearing Test"
)
vsi_install_target(example_lobtest SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/LoadEarthFile/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ add_executable(example_loadearthfile LoadEarthFile.cpp)
target_link_libraries(example_loadearthfile PRIVATE simVis simUtil OSGDB OSGEARTH)
set_target_properties(example_loadearthfile PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Load Earth File"
PROJECT_LABEL "Load Earth File"
)
vsi_install_target(example_loadearthfile SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/LocalGrid/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_localgrid ${PROJECT_FILES})
target_link_libraries(example_localgrid PRIVATE simVis simUtil simData)
set_target_properties(example_localgrid PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Local Grid"
PROJECT_LABEL "Local Grid"
)
vsi_install_target(example_localgrid SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/LocatorTest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_locatortest ${PROJECT_FILES})
target_link_libraries(example_locatortest PRIVATE simVis simUtil)
set_target_properties(example_locatortest PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Locator Test"
PROJECT_LABEL "Locator Test"
)
vsi_install_target(example_locatortest SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/MapScale/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_mapscale ${PROJECT_FILES})
target_link_libraries(example_mapscale PRIVATE simVis simUtil)
set_target_properties(example_mapscale PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Map Scale"
PROJECT_LABEL "Map Scale"
)
vsi_install_target(example_mapscale SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/MassiveData/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_massivedata ${PROJECT_FILES})
target_link_libraries(example_massivedata PRIVATE simVis simUtil)
set_target_properties(example_massivedata PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Massive Data"
PROJECT_LABEL "Massive Data"
)
vsi_install_target(example_massivedata SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/ObserverMaker/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable(example_observermaker ${PROJECT_FILES})
target_link_libraries(example_observermaker PRIVATE simVis)
set_target_properties(example_observermaker PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Observer Maker"
PROJECT_LABEL "Observer Maker"
)
vsi_install_target(example_observermaker SDK_Examples)
2 changes: 1 addition & 1 deletion Examples/Ocean/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ add_executable(example_ocean ${PROJECT_FILES})
target_link_libraries(example_ocean PRIVATE simVis simUtil)
set_target_properties(example_ocean PROPERTIES
FOLDER "Examples"
PROJECT_LABEL "Example - Ocean"
PROJECT_LABEL "Ocean"
)
vsi_install_target(example_ocean SDK_Examples)

Expand Down
Loading

0 comments on commit 5519b98

Please sign in to comment.