From 720f36e145cf33a8daad0d12002f148def5adace Mon Sep 17 00:00:00 2001 From: xavi92 Date: Sun, 27 Oct 2024 07:47:32 +0000 Subject: [PATCH] 3rdParty-devel: Always set BUILD_SHARED_LIBS The Windows build of the project completely relies on shared libraries and makes no use of static libraries. git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9572 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 3dd03a4f89a09978179f9996c428e9917ee0b930 Former-commit-id: caad9de0102ec4e68692c80ce6e2ac8becb876e0 --- packaging/3rdParty-devel/CMakeLists.txt | 11 +++++------ .../3rdParty-devel/patches/enet-1.3.18.CMakeLists.txt | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packaging/3rdParty-devel/CMakeLists.txt b/packaging/3rdParty-devel/CMakeLists.txt index 94656084..f8623e88 100644 --- a/packaging/3rdParty-devel/CMakeLists.txt +++ b/packaging/3rdParty-devel/CMakeLists.txt @@ -79,6 +79,7 @@ endif() list(APPEND EXTERNALS_CMAKE_ARGS "-D CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}") list(APPEND EXTERNALS_CMAKE_ARGS "-D CMAKE_FIND_ROOT_PATH=${EXTERNALS_INSTALL_DIR}") +list(APPEND EXTERNALS_CMAKE_ARGS "-D BUILD_SHARED_LIBS=ON") if(WIN32) set(_max_ext_path "64") @@ -346,7 +347,7 @@ else() endif() if(OPTION_OGG) - set(OGG_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_SHARED_LIBS=on -DBUILD_TESTING=off -DINSTALL_DOCS=off) + set(OGG_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_TESTING=off -DINSTALL_DOCS=off) ExternalProject_Add(${OGG_PROJECT} URL ${OGG_URL} URL_HASH ${OGG_HASH} @@ -356,7 +357,7 @@ else() endif() if(OPTION_VORBIS) - set(VORBIS_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_SHARED_LIBS=on) + set(VORBIS_ARGS ${EXTERNALS_CMAKE_ARGS}) ExternalProject_Add(${VORBIS_PROJECT} URL ${VORBIS_URL} URL_HASH ${VORBIS_HASH} @@ -452,8 +453,7 @@ if(OPTION_FREETYPE) # Set FREETYPE_LEGACY_PROJECT to empty string, because we will use FREETYPE_PROJECT, # OpenScenegraph DEPENDS on freetype, so only one can be defined set(FREETYPE_LEGACY_PROJECT ) - set(FREETYPE_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_SHARED_LIBS:BOOL=false - -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=true + set(FREETYPE_ARGS ${EXTERNALS_CMAKE_ARGS} -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=true -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE @@ -472,8 +472,7 @@ if(OPTION_FREETYPE) if(CMAKE_GENERATOR MATCHES "Visual Studio") message(WARNING "freetype versions newer than 2.10.4 need Visual Studio 2013 or newer") endif() - set(FREETYPE_LEGACY_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_SHARED_LIBS:BOOL=false - -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=true + set(FREETYPE_LEGACY_ARGS ${EXTERNALS_CMAKE_ARGS} -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=true -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE diff --git a/packaging/3rdParty-devel/patches/enet-1.3.18.CMakeLists.txt b/packaging/3rdParty-devel/patches/enet-1.3.18.CMakeLists.txt index 4bdb1491..bd5851ad 100644 --- a/packaging/3rdParty-devel/patches/enet-1.3.18.CMakeLists.txt +++ b/packaging/3rdParty-devel/patches/enet-1.3.18.CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8.12...3.20) project(enet) +option(BUILD_SHARED_LIBS "Build shared libraries" ON) + # The "configure" step. include(CheckFunctionExists) include(CheckStructHasMember) @@ -84,7 +86,7 @@ set(SOURCE_FILES source_group(include FILES ${INCLUDE_FILES}) source_group(source FILES ${SOURCE_FILES}) -add_library(enet STATIC +add_library(enet ${INCLUDE_FILES} ${SOURCE_FILES} )