update windows build

nervosys · Feb 20, 2024 · 23557d1 · 23557d1
1 parent 477db0a
commit 23557d1
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 62 deletions.
diff --git a/cmake/AutonomyLib/CMakeLists.txt b/cmake/AutonomyLib/CMakeLists.txt
@@ -3,8 +3,8 @@ project(AutonomyLib)
 
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
-CommonSetup()
 
+CommonSetup()
 IncludeEigen()
 
 include_directories(
@@ -26,6 +26,7 @@ file(GLOB_RECURSE ${PROJECT_NAME}_sources
 add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_sources})
 
 CommonTargetLink()
+
 target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
 target_link_libraries(${PROJECT_NAME} MavLinkCom)
 

diff --git a/cmake/AutonomyLibUnitTests/CMakeLists.txt b/cmake/AutonomyLibUnitTests/CMakeLists.txt
@@ -3,10 +3,9 @@ project(AutonomyLibUnitTests)
 
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
-CommonSetup()
 
+CommonSetup()
 IncludeEigen()
-
 SetupConsoleBuild()
 
 include_directories(
@@ -16,8 +15,8 @@ include_directories(
 )
 
 AddExecutableSource()
-
 CommonTargetLink()
+
 target_link_libraries(${PROJECT_NAME} AutonomyLib)
 target_link_libraries(${PROJECT_NAME} MavLinkCom)
 target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.5.0)
 project(AutonomySim)
 
-add_subdirectory("rpclib_wrapper")
 add_subdirectory("AutonomyLib")
-add_subdirectory("MavLinkCom")
 add_subdirectory("AutonomyLibUnitTests")
+add_subdirectory("rpclib_wrapper")
+add_subdirectory("MavLinkCom")
+add_subdirectory("HelloCar")
 add_subdirectory("HelloDrone")
 add_subdirectory("HelloSpawnedDrones")
-add_subdirectory("HelloCar")
 add_subdirectory("DroneShell")
 add_subdirectory("DroneServer")
diff --git a/cmake/DroneServer/CMakeLists.txt b/cmake/DroneServer/CMakeLists.txt
@@ -3,10 +3,9 @@ project(DroneServer)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
 include("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
-CommonSetup()
 
+CommonSetup()
 IncludeEigen()
-
 SetupConsoleBuild()
 
 include_directories(
@@ -17,8 +16,8 @@ include_directories(
 )
 
 AddExecutableSource()
-
 CommonTargetLink()
+
 target_link_libraries(${PROJECT_NAME} AutonomyLib)
 target_link_libraries(${PROJECT_NAME} MavLinkCom)
 target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
diff --git a/cmake/DroneShell/CMakeLists.txt b/cmake/DroneShell/CMakeLists.txt
@@ -3,10 +3,9 @@ project(DroneShell)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
 include("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
-CommonSetup()
 
+CommonSetup()
 IncludeEigen()
-
 SetupConsoleBuild()
 
 include_directories(
@@ -18,7 +17,7 @@ include_directories(
 )
 
 AddExecutableSource()
-
 CommonTargetLink()
+
 target_link_libraries(${PROJECT_NAME} AutonomyLib)
 target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
diff --git a/cmake/HelloCar/CMakeLists.txt b/cmake/HelloCar/CMakeLists.txt
@@ -3,10 +3,9 @@ project(HelloCar)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
 include("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
-CommonSetup()
 
+CommonSetup()
 IncludeEigen()
-
 SetupConsoleBuild()
 
 ## Specify additional locations of header files
@@ -18,8 +17,8 @@ include_directories(
   ${AUTONOMYSIM_ROOT}/MavLinkCom/common_utils
 )
 
-AddExecutableSource()
-
+AddExecutableSource()			
 CommonTargetLink()
+
 target_link_libraries(${PROJECT_NAME} AutonomyLib)
 target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
diff --git a/cmake/HelloDrone/CMakeLists.txt b/cmake/HelloDrone/CMakeLists.txt
@@ -3,10 +3,9 @@ project(HelloDrone)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
 include("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
-CommonSetup()
 
+CommonSetup()
 IncludeEigen()
-
 SetupConsoleBuild()
 
 ## Specify additional locations of header files
@@ -18,8 +17,8 @@ include_directories(
   ${AUTONOMYSIM_ROOT}/MavLinkCom/common_utils
 )
 
-AddExecutableSource()
-
+AddExecutableSource()			
 CommonTargetLink()
+
 target_link_libraries(${PROJECT_NAME} AutonomyLib)
 target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
diff --git a/cmake/HelloSpawnedDrones/CMakeLists.txt b/cmake/HelloSpawnedDrones/CMakeLists.txt
@@ -3,10 +3,9 @@ project(HelloSpawnedDrones)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
 include("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
-CommonSetup()
 
+CommonSetup()
 IncludeEigen()
-
 SetupConsoleBuild()
 
 ## Specify additional locations of header files
@@ -18,8 +17,8 @@ include_directories(
   ${AUTONOMYSIM_ROOT}/MavLinkCom/common_utils
 )
 
-AddExecutableSource()
-
+AddExecutableSource()			
 CommonTargetLink()
+
 target_link_libraries(${PROJECT_NAME} AutonomyLib)
 target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
diff --git a/cmake/MavLinkCom/CMakeLists.txt b/cmake/MavLinkCom/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory("MavLinkTest")
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
 include("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
+
 CommonSetup()
 
 include_directories(

diff --git a/cmake/rpclib_wrapper/CMakeLists.txt b/cmake/rpclib_wrapper/CMakeLists.txt
@@ -3,6 +3,7 @@ project(rpclib_wrapper)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake-modules") 
 include("${CMAKE_CURRENT_LIST_DIR}/../cmake-modules/CommonSetup.cmake")
+
 CommonSetup()
 
 if(UNIX)

diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -47,21 +47,21 @@ param(
 
 # NOTE: Prefer Import-Module to Get-Content for its scoping rules
 
-# Common utilities:
-#   Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory, Test-VariableDefined,
-#   Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor, Get-VersionMajorMinorBuild,
-#   Get-WindowsInfo, Get-WindowsVersion, Get-Architecture, Get-ArchitectureWidth, Set-ProcessorCount
-Import-Module "${PWD}\scripts\utils.psm1"
+# Common utilities
+Import-Module "${PWD}\scripts\utils.psm1"               # imports: Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory,
+                                                        # Test-VariableDefined, Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor,
+                                                        # Get-VersionMajorMinorBuild, Get-WindowsInfo, Get-WindowsVersion, Get-Architecture,
+                                                        # Get-ArchitectureWidth, Set-ProcessorCount
 
 # Documentation
-Import-Module "${PWD}\scripts\build_docs.psm1"         # imports: Build-Documentation
+Import-Module "${PWD}\scripts\build_docs.psm1"          # imports: Build-Documentation
 
 # Tests
-Import-Module "${PWD}\scripts\test_visualstudio.psm1"  # imports: VS_VERSION_MINIMUM, Set-VsInstance, Get-VsInstanceVersion, Test-VisualStudioVersion
-Import-Module "${PWD}\scripts\test_cmake.psm1"         # imports: CMAKE_VERSION_MINIMUM, Test-CmakeVersion
-Import-Module "${PWD}\scripts\test_rpclib.psm1"        # imports: RPCLIB_VERSION, Test-RpcLibVersion
-Import-Module "${PWD}\scripts\test_eigen.psm1"         # imports: EIGEN_VERSION, Test-EigenVersion
-Import-Module "${PWD}\scripts\test_unrealasset.psm1"   # imports: ASSET_SUV_VERSION, Test-AssetSuvVersion
+Import-Module "${PWD}\scripts\test_visualstudio.psm1"   # imports: VS_VERSION_MINIMUM, Set-VsInstance, Get-VsInstanceVersion, Test-VisualStudioVersion
+Import-Module "${PWD}\scripts\test_cmake.psm1"          # imports: CMAKE_VERSION_MINIMUM, Test-CmakeVersion
+Import-Module "${PWD}\scripts\test_rpclib.psm1"         # imports: RPCLIB_VERSION, Test-RpcLibVersion
+Import-Module "${PWD}\scripts\test_eigen.psm1"          # imports: EIGEN_VERSION, Test-EigenVersion
+Import-Module "${PWD}\scripts\test_unrealasset.psm1"    # imports: ASSET_SUV_VERSION, Test-AssetSuvVersion
 
 ###
 ### Variables

diff --git a/scripts/test_cmake.psm1 b/scripts/test_cmake.psm1
@@ -17,11 +17,11 @@ NOTES:
 ### Imports
 ###
 
-# Common utilities:
-#   Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory, Test-VariableDefined,
-#   Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor, Get-VersionMajorMinorBuild,
-#   Get-WindowsInfo, Get-WindowsVersion, Get-Architecture, Get-ArchitectureWidth, Set-ProcessorCount
-Import-Module "${PWD}\scripts\utils.psm1"
+# Common utilities
+Import-Module "${PWD}\scripts\utils.psm1"               # imports: Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory,
+                                                        # Test-VariableDefined, Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor,
+                                                        # Get-VersionMajorMinorBuild, Get-WindowsInfo, Get-WindowsVersion, Get-Architecture,
+                                                        # Get-ArchitectureWidth, Set-ProcessorCount
 
 ###
 ### Variables
@@ -47,7 +47,7 @@ function Install-Cmake {
     $VersionMajMinBuild = Get-VersionMajorMinorBuild $Version
     $Installer = "cmake-${VersionMajMinBuild}-x86_64.msi"
     Invoke-WebRequest "https://cmake.org/files/v${VersionMajMin}/${Installer}" -OutFile "temp\${Installer}"
-    Start-Process -FilePath "temp\${Installer}" -Wait
+    Start-Process -FilePath "temp\${Installer}" -Wait -NoNewWindow
     Remove-Item -Path "temp\${Installer}"
   }
   else {

diff --git a/scripts/test_eigen.psm1 b/scripts/test_eigen.psm1
@@ -17,11 +17,11 @@ NOTES:
 ### Imports
 ###
 
-# Common utilities:
-#   Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory, Test-VariableDefined,
-#   Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor, Get-VersionMajorMinorBuild,
-#   Get-WindowsInfo, Get-WindowsVersion, Get-Architecture, Get-ArchitectureWidth, Set-ProcessorCount
-Import-Module "${PWD}\scripts\utils.psm1"
+# Common utilities
+Import-Module "${PWD}\scripts\utils.psm1"               # imports: Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory,
+                                                        # Test-VariableDefined, Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor,
+                                                        # Get-VersionMajorMinorBuild, Get-WindowsInfo, Get-WindowsVersion, Get-Architecture,
+                                                        # Get-ArchitectureWidth, Set-ProcessorCount
 
 ###
 ### Variables

diff --git a/scripts/test_rpclib.psm1 b/scripts/test_rpclib.psm1
@@ -17,11 +17,11 @@ NOTES:
 ### Imports
 ###
 
-# Common utilities:
-#   Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory, Test-VariableDefined,
-#   Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor, Get-VersionMajorMinorBuild,
-#   Get-WindowsInfo, Get-WindowsVersion, Get-Architecture, Get-ArchitectureWidth, Set-ProcessorCount
-Import-Module "${PWD}\scripts\utils.psm1"
+# Common utilities
+Import-Module "${PWD}\scripts\utils.psm1"               # imports: Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory,
+                                                        # Test-VariableDefined, Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor,
+                                                        # Get-VersionMajorMinorBuild, Get-WindowsInfo, Get-WindowsVersion, Get-Architecture,
+                                                        # Get-ArchitectureWidth, Set-ProcessorCount
 
 ###
 ### Variables

diff --git a/scripts/test_unrealasset.psm1 b/scripts/test_unrealasset.psm1
@@ -17,11 +17,11 @@ NOTES:
 ### Imports
 ###
 
-# Common utilities:
-#   Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory, Test-VariableDefined,
-#   Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor, Get-VersionMajorMinorBuild,
-#   Get-WindowsInfo, Get-WindowsVersion, Get-Architecture, Get-ArchitectureWidth, Set-ProcessorCount
-Import-Module "${PWD}\scripts\utils.psm1"
+# Common utilities
+Import-Module "${PWD}\scripts\utils.psm1"               # imports: Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory,
+                                                        # Test-VariableDefined, Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor,
+                                                        # Get-VersionMajorMinorBuild, Get-WindowsInfo, Get-WindowsVersion, Get-Architecture,
+                                                        # Get-ArchitectureWidth, Set-ProcessorCount
 
 ###
 ### Variables

diff --git a/scripts/test_visualstudio.psm1 b/scripts/test_visualstudio.psm1
@@ -17,11 +17,11 @@ NOTES:
 ### Imports
 ###
 
-# Common utilities:
-#   Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory, Test-VariableDefined,
-#   Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor, Get-VersionMajorMinorBuild,
-#   Get-WindowsInfo, Get-WindowsVersion, Get-Architecture, Get-ArchitectureWidth, Set-ProcessorCount
-Import-Module "${PWD}\scripts\utils.psm1"
+# Common utilities
+Import-Module "${PWD}\scripts\utils.psm1"               # imports: Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory,
+                                                        # Test-VariableDefined, Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor,
+                                                        # Get-VersionMajorMinorBuild, Get-WindowsInfo, Get-WindowsVersion, Get-Architecture,
+                                                        # Get-ArchitectureWidth, Set-ProcessorCount
 
 ###
 ### Variables