fixed BridgeDriver overwriting install directory of ATT

ju1ce · Jul 13, 2022 · e33d7db · e33d7db
1 parent 14a12d7
commit e33d7db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/BridgeDriver b/BridgeDriver
diff --git a/CMake/shared.cmake b/CMake/shared.cmake
@@ -5,10 +5,7 @@
 
 # Fix default install path on windows
 # Noone wants to provide admin access and install to C:/Program Files (x86)/
-if(WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    message(WARNING "On Windows the default install destination is ${CMAKE_INSTALL_PREFIX}, \
-which requires admin rights and usually results in errors. \
-Explicitly set with -DCMAKE_INSTALL_PREFIX= to install there.")
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/install" CACHE PATH "Install directory." FORCE)
     message(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}")
 endif()

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
 set(SUPERPROJECT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-include("${CMAKE_CURRENT_SOURCE_DIR}/CMake/shared.cmake")
 include("${CMAKE_CURRENT_SOURCE_DIR}/CMake/helpers.cmake")
 
 option(BUILD_SHARED_LIBS "" FALSE)
@@ -20,6 +19,9 @@ att_bootstrap_vcpkg()
 # vcpkg stuff must be done before project
 project("April-Tag-VR-FullBody-Tracker" CXX)
 
+#shared needs some variables that are only initialized after project
+include("${CMAKE_CURRENT_SOURCE_DIR}/CMake/shared.cmake")
+
 if (MSVC)
     if (BUILD_SHARED_LIBS)
         att_crt_linkage(SHARED)