From 68c38318c2728e4e73f2aef66c5aac8c6442dc30 Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Tue, 2 Jan 2024 10:56:50 -0500 Subject: [PATCH 1/2] Include msvc.cmake in all subprojects and git-versioning.cmake in acquire-driver-common. --- acquire-core-libs/CMakeLists.txt | 2 ++ acquire-driver-common/CMakeLists.txt | 3 +++ acquire-video-runtime/CMakeLists.txt | 2 ++ 3 files changed, 7 insertions(+) diff --git a/acquire-core-libs/CMakeLists.txt b/acquire-core-libs/CMakeLists.txt index 0500740..406087d 100644 --- a/acquire-core-libs/CMakeLists.txt +++ b/acquire-core-libs/CMakeLists.txt @@ -1,4 +1,6 @@ project(acquire-core-libs) +include(../cmake/msvc.cmake) + add_subdirectory(src) add_subdirectory(tests) diff --git a/acquire-driver-common/CMakeLists.txt b/acquire-driver-common/CMakeLists.txt index e6fa193..56a7e81 100644 --- a/acquire-driver-common/CMakeLists.txt +++ b/acquire-driver-common/CMakeLists.txt @@ -1,4 +1,7 @@ project(acquire-driver-common) +include(../cmake/msvc.cmake) +include(../cmake/git-versioning.cmake) + add_subdirectory(src) add_subdirectory(tests) diff --git a/acquire-video-runtime/CMakeLists.txt b/acquire-video-runtime/CMakeLists.txt index 1fd7ede..13eeee1 100644 --- a/acquire-video-runtime/CMakeLists.txt +++ b/acquire-video-runtime/CMakeLists.txt @@ -1,4 +1,6 @@ project(acquire-video-runtime) +include(../cmake/msvc.cmake) + add_subdirectory(src) add_subdirectory(tests) From 0089bb00a376b3a6be77475245c1e8e51b78408d Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Tue, 2 Jan 2024 13:31:28 -0500 Subject: [PATCH 2/2] Set fPIC individually on subprojects. --- acquire-core-libs/CMakeLists.txt | 2 ++ acquire-driver-common/CMakeLists.txt | 2 ++ acquire-video-runtime/CMakeLists.txt | 2 ++ 3 files changed, 6 insertions(+) diff --git a/acquire-core-libs/CMakeLists.txt b/acquire-core-libs/CMakeLists.txt index 406087d..983e6c4 100644 --- a/acquire-core-libs/CMakeLists.txt +++ b/acquire-core-libs/CMakeLists.txt @@ -2,5 +2,7 @@ project(acquire-core-libs) include(../cmake/msvc.cmake) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + add_subdirectory(src) add_subdirectory(tests) diff --git a/acquire-driver-common/CMakeLists.txt b/acquire-driver-common/CMakeLists.txt index 56a7e81..fe0879d 100644 --- a/acquire-driver-common/CMakeLists.txt +++ b/acquire-driver-common/CMakeLists.txt @@ -3,5 +3,7 @@ project(acquire-driver-common) include(../cmake/msvc.cmake) include(../cmake/git-versioning.cmake) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + add_subdirectory(src) add_subdirectory(tests) diff --git a/acquire-video-runtime/CMakeLists.txt b/acquire-video-runtime/CMakeLists.txt index 13eeee1..eb610fc 100644 --- a/acquire-video-runtime/CMakeLists.txt +++ b/acquire-video-runtime/CMakeLists.txt @@ -2,5 +2,7 @@ project(acquire-video-runtime) include(../cmake/msvc.cmake) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + add_subdirectory(src) add_subdirectory(tests)