speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
6
2
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

3rdParty-devel: Always set BUILD_SHARED_LIBS

Browse source 
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
This commit is contained in:
xavi92 2024-10-27 07:47:32 +00:00
parent e6be91940d
commit 720f36e145
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packaging/3rdParty-devel/CMakeLists.txt
View file

@ -79,6 +79,7 @@ endif()
list(APPEND EXTERNALS_CMAKE_ARGS "-D CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}") 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 CMAKE_FIND_ROOT_PATH=${EXTERNALS_INSTALL_DIR}")
list(APPEND EXTERNALS_CMAKE_ARGS "-D BUILD_SHARED_LIBS=ON")
if(WIN32) if(WIN32)
set(_max_ext_path "64") set(_max_ext_path "64")
@ -346,7 +347,7 @@ else()
endif() endif()
if(OPTION_OGG) 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} ExternalProject_Add(${OGG_PROJECT}
URL ${OGG_URL} URL ${OGG_URL}
URL_HASH ${OGG_HASH} URL_HASH ${OGG_HASH}
@ -356,7 +357,7 @@ else()
endif() endif()
if(OPTION_VORBIS) if(OPTION_VORBIS)
set(VORBIS_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_SHARED_LIBS=on) set(VORBIS_ARGS ${EXTERNALS_CMAKE_ARGS})
ExternalProject_Add(${VORBIS_PROJECT} ExternalProject_Add(${VORBIS_PROJECT}
URL ${VORBIS_URL} URL ${VORBIS_URL}
URL_HASH ${VORBIS_HASH} URL_HASH ${VORBIS_HASH}
@ -452,8 +453,7 @@ if(OPTION_FREETYPE)
# Set FREETYPE_LEGACY_PROJECT to empty string, because we will use FREETYPE_PROJECT, # Set FREETYPE_LEGACY_PROJECT to empty string, because we will use FREETYPE_PROJECT,
# OpenScenegraph DEPENDS on freetype, so only one can be defined # OpenScenegraph DEPENDS on freetype, so only one can be defined
set(FREETYPE_LEGACY_PROJECT ) set(FREETYPE_LEGACY_PROJECT )
set(FREETYPE_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_SHARED_LIBS:BOOL=false set(FREETYPE_ARGS ${EXTERNALS_CMAKE_ARGS} -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=true
-DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=true
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE
@ -472,8 +472,7 @@ if(OPTION_FREETYPE)
if(CMAKE_GENERATOR MATCHES "Visual Studio") if(CMAKE_GENERATOR MATCHES "Visual Studio")
message(WARNING "freetype versions newer than 2.10.4 need Visual Studio 2013 or newer") message(WARNING "freetype versions newer than 2.10.4 need Visual Studio 2013 or newer")
endif() endif()
set(FREETYPE_LEGACY_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_SHARED_LIBS:BOOL=false set(FREETYPE_LEGACY_ARGS ${EXTERNALS_CMAKE_ARGS} -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=true
-DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=true
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE

4
packaging/3rdParty-devel/patches/enet-1.3.18.CMakeLists.txt
View file

@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8.12...3.20)
project(enet) project(enet)
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
# The "configure" step. # The "configure" step.
include(CheckFunctionExists) include(CheckFunctionExists)
include(CheckStructHasMember) include(CheckStructHasMember)
@ -84,7 +86,7 @@ set(SOURCE_FILES
source_group(include FILES ${INCLUDE_FILES}) source_group(include FILES ${INCLUDE_FILES})
source_group(source FILES ${SOURCE_FILES}) source_group(source FILES ${SOURCE_FILES})
add_library(enet STATIC add_library(enet
${INCLUDE_FILES} ${INCLUDE_FILES}
${SOURCE_FILES} ${SOURCE_FILES}
) )