Merge pull request orbitersim#448 from orbitersim/sdk_samples

Install of SDK samples and LUA samples
TheGondos · Mar 22, 2024 · 8852860 · 8852860
2 parents 877340f + aafdccd
commit 8852860
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -261,11 +261,6 @@ option(ORBITER_MAKE_TESTS
 	ON
 )
 
-option(ORBITER_MAKE_SDK_SAMPLES
-	"Build the SDK sample projects"
-	OFF
-)
-
 option(ORBITER_SANITIZER
 	"Build binaries with Address Sanitizer"
 	OFF

diff --git a/Orbitersdk/samples/AscentMFD/CMakeLists.txt b/Orbitersdk/samples/AscentMFD/CMakeLists.txt
@@ -4,26 +4,33 @@
 # The target directory for plugin DLLs
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ORBITER_BINARY_PLUGIN_DIR})
 
-add_library(AscentMFD SHARED
+add_library(AscentMFD MODULE
 	AscentMFD.cpp
 	AscentMFD.rc
 )
 
-target_include_directories(AscentMFD
-	PUBLIC ${ORBITER_SOURCE_SDK_INCLUDE_DIR}
+add_dependencies(AscentMFD
+	${OrbiterTgt}
+	Orbitersdk
 )
 
 target_link_libraries(AscentMFD
 	${ORBITER_LIB}
 	${ORBITER_SDK_LIB}
 )
 
-add_dependencies(AscentMFD
-	${OrbiterTgt}
-	Orbitersdk
+target_include_directories(AscentMFD
+	PUBLIC ${ORBITER_SOURCE_SDK_INCLUDE_DIR}
 )
 
 set_target_properties(AscentMFD
 	PROPERTIES
-	FOLDER SDKSamples
+	LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Modules/Plugin
+	LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Modules/Plugin
+	FOLDER Modules
 )
+
+install(TARGETS AscentMFD
+	LIBRARY	
+	DESTINATION ${ORBITER_INSTALL_PLUGIN_DIR}
+) 
diff --git a/Orbitersdk/samples/CMakeLists.txt b/Orbitersdk/samples/CMakeLists.txt
@@ -1,12 +1,15 @@
 # Copyright (c) Martin Schweiger
 # Licensed under the MIT License
 
-if (ORBITER_MAKE_SDK_SAMPLES)
-
 add_subdirectory(AscentMFD)
 add_subdirectory(DialogTemplate)
 add_subdirectory(LaunchpadParamTemplate)
 add_subdirectory(MFDTemplate)
 add_subdirectory(Lua)
 
-endif()
+install(DIRECTORY ${ORBITER_SOURCE_SDK_DIR}/samples/AscentMFD/ DESTINATION ${ORBITER_INSTALL_ROOT_DIR}/Orbitersdk/samples/AscentMFD)
+install(DIRECTORY ${ORBITER_SOURCE_SDK_DIR}/samples/DialogTemplate/ DESTINATION ${ORBITER_INSTALL_ROOT_DIR}/Orbitersdk/samples/DialogTemplate)
+install(DIRECTORY ${ORBITER_SOURCE_SDK_DIR}/samples/LaunchpadParamTemplate/ DESTINATION ${ORBITER_INSTALL_ROOT_DIR}/Orbitersdk/samples/LaunchpadParamTemplate)
+install(DIRECTORY ${ORBITER_SOURCE_SDK_DIR}/samples/MFDTemplate/ DESTINATION ${ORBITER_INSTALL_ROOT_DIR}/Orbitersdk/samples/MFDTemplate)
+install(DIRECTORY ${ORBITER_SOURCE_SDK_DIR}/samples/Lua/ DESTINATION ${ORBITER_INSTALL_ROOT_DIR}/Orbitersdk/samples/Lua)
+
diff --git a/Orbitersdk/samples/MFDTemplate/CMakeLists.txt b/Orbitersdk/samples/MFDTemplate/CMakeLists.txt
@@ -23,7 +23,7 @@ add_dependencies(MFDTemplate
 	Orbitersdk
 )
 
-set_target_properties(LaunchpadParamTemplate
+set_target_properties(MFDTemplate
 	PROPERTIES
 	FOLDER SDKSamples
 )