From 33ed5c61d306a6c054f6963b19619242a3a13217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=A4rtl?= Date: Fri, 25 Oct 2024 13:00:59 +0200 Subject: [PATCH] Change KTX_FEATURE_STATIC_LIBRARY to BUILD_SHARED_LIBS --- BUILDING.md | 4 ++-- CMakeLists.txt | 25 +++++++++++++++++-------- tests/loadtests/glloadtests.cmake | 2 +- tests/loadtests/vkloadtests.cmake | 2 +- tests/transcodetests/CMakeLists.txt | 2 +- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 3018c0c34b..786ad4711a 100755 --- a/BUILDING.md +++ b/BUILDING.md @@ -43,7 +43,7 @@ This creates the `libktx` library and the command line tools. To create the comp cmake . -B build -D KTX_FEATURE_LOADTEST_APPS=ON -D KTX_FEATURE_DOC=ON ``` -If you need the library to be static, add `-D KTX_FEATURE_STATIC_LIBRARY=ON` to the CMake configure command (always enabled on iOS and Emscripten). +If you need the library to be static, add `-D BUILD_SHARED_LIBS=OFF` to the CMake configure command (always disabled on iOS and Emscripten). > **Note:** > @@ -522,7 +522,7 @@ cd KTX-Software/ git submodule update --init --recursive tests/cts # Configure mkdir build -cmake -B build . -DKTX_FEATURE_DOC=ON -DKTX_FEATURE_STATIC_LIBRARY=ON -DKTX_FEATURE_TOOLS_CTS=ON -DKTX_FEATURE_TESTS=ON -DKTX_FEATURE_TOOLS_CTS=ON +cmake -B build . -DKTX_FEATURE_DOC=ON -DBUILD_SHARED_LIBS=OFF -DKTX_FEATURE_TOOLS_CTS=ON -DKTX_FEATURE_TESTS=ON -DKTX_FEATURE_TOOLS_CTS=ON # Build everything (depending on workflow its better to build the specific target like 'ktxtools'): cmake --build build --target all # Run every test case: diff --git a/CMakeLists.txt b/CMakeLists.txt index 96dee7e63b..f21cec5bce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,12 +262,15 @@ endif() # EMSCRIPTEN is not set until project so all these must be after. if(APPLE_LOCKED_OS OR EMSCRIPTEN) - set( LIB_TYPE_DEFAULT ON ) -else() set( LIB_TYPE_DEFAULT OFF ) +else() + set( LIB_TYPE_DEFAULT ON ) endif() -option( KTX_FEATURE_STATIC_LIBRARY "Create static libraries (shared otherwise)." ${LIB_TYPE_DEFAULT} ) +option(BUILD_SHARED_LIBS "Create shared libraries (static otherwise)." ${LIB_TYPE_DEFAULT} ) + +# Used to reset BUILD_SHARED_LIBS after forcing static builds +set(BUILD_SHARED_LIBS_RESET ${BUILD_SHARED_LIBS}) CMAKE_DEPENDENT_OPTION( KTX_FEATURE_TOOLS "Create KTX tools" @@ -284,11 +287,11 @@ if(EMSCRIPTEN) set( KTX_FEATURE_VK_UPLOAD OFF ) endif() -if(KTX_FEATURE_STATIC_LIBRARY) +if(NOT BUILD_SHARED_LIBS) set(LIB_TYPE STATIC) else() if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR EMSCRIPTEN) - message(SEND_ERROR "Library type cannot be shared for the current platform. Set KTX_FEATURE_STATIC_LIBRARY to ON!") + message(SEND_ERROR "Library type cannot be shared for the current platform. Set BUILD_SHARED_LIBS to OFF!") endif() set(LIB_TYPE SHARED) endif() @@ -1116,7 +1119,7 @@ set (STATIC_APP_LIB_SYMBOL_VISIBILITY hidden) set_target_properties(objUtil PROPERTIES CXX_VISIBILITY_PRESET ${STATIC_APP_LIB_SYMBOL_VISIBILITY} ) -if(KTX_FEATURE_STATIC_LIBRARY AND +if(NOT BUILD_SHARED_LIBS AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")) set_source_files_properties( lib/astc_encode.cpp @@ -1211,7 +1214,10 @@ if(NOT ${universal_build}) endif() set(ASTCENC_CLI OFF) # Only build as library not the CLI astcencoder +# Force static build for astc-encoder +set(BUILD_SHARED_LIBS OFF) add_subdirectory(external/astc-encoder) +set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_RESET}) set_property(TARGET ${ASTCENC_LIB_TARGET} PROPERTY POSITION_INDEPENDENT_CODE ON) target_compile_definitions( ${ASTCENC_LIB_TARGET} @@ -1223,7 +1229,7 @@ PRIVATE $<$,17.0.3>>:_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR> ) -if(KTX_FEATURE_STATIC_LIBRARY AND APPLE) +if(NOT BUILD_SHARED_LIBS AND APPLE) # Make a single static library to simplify linking. add_dependencies(ktx ${ASTCENC_LIB_TARGET}) add_custom_command( TARGET ktx @@ -1244,9 +1250,12 @@ endif() # this CMakeLists is included in another project which is unlikely # except for building the ktx library. if((KTX_FEATURE_TOOLS OR KTX_FEATURE_TESTS) AND NOT TARGET fmt::fmt) + # Always build fmt static + set(BUILD_SHARED_LIBS OFF) set(FMT_INSTALL OFF) set(FMT_SYSTEM_HEADERS ON) add_subdirectory(external/fmt) + set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_RESET}) endif() if(KTX_FEATURE_TOOLS AND NOT TARGET cxxopts::cxxopts) add_subdirectory(external/cxxopts) @@ -1266,7 +1275,7 @@ if(KTX_FEATURE_DOC) endif() set(KTX_INSTALL_TARGETS ktx) -if(KTX_FEATURE_STATIC_LIBRARY AND NOT APPLE) +if(NOT BUILD_SHARED_LIBS AND NOT APPLE) list(APPEND KTX_INSTALL_TARGETS ${ASTCENC_LIB_TARGET}) endif() diff --git a/tests/loadtests/glloadtests.cmake b/tests/loadtests/glloadtests.cmake index 2a005aa414..984e3357a3 100644 --- a/tests/loadtests/glloadtests.cmake +++ b/tests/loadtests/glloadtests.cmake @@ -229,7 +229,7 @@ function( create_gl_target target version sources common_resources test_images INSTALL_RPATH "@executable_path/../Frameworks" ) - if(NOT KTX_FEATURE_STATIC_LIBRARY) + if(BUILD_SHARED_LIBS) add_custom_command( TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ "$/Frameworks/$" COMMAND ${CMAKE_COMMAND} -E create_symlink $ "$/Frameworks/$" diff --git a/tests/loadtests/vkloadtests.cmake b/tests/loadtests/vkloadtests.cmake index b36f756187..9f53b1223b 100644 --- a/tests/loadtests/vkloadtests.cmake +++ b/tests/loadtests/vkloadtests.cmake @@ -323,7 +323,7 @@ if(APPLE) # Set RPATH to find frameworks and dylibs INSTALL_RPATH "@executable_path/../Frameworks" ) - if(NOT KTX_FEATURE_STATIC_LIBRARY) + if(BUILD_SHARED_LIBS) # XCODE_EMBED_FRAMEWORKS does not appear to support generator # expressions hence this instead of a genex in the above. set_property( TARGET vkloadtests diff --git a/tests/transcodetests/CMakeLists.txt b/tests/transcodetests/CMakeLists.txt index c27eea7ea7..97c105e90a 100644 --- a/tests/transcodetests/CMakeLists.txt +++ b/tests/transcodetests/CMakeLists.txt @@ -60,7 +60,7 @@ if(WIN32) # The Windows ktx.dll does not export needed symbols. This is a workaround to get it linking. add_library(obj_tmp_basisu OBJECT - $<$>:${PROJECT_SOURCE_DIR}/external/basisu/transcoder/basisu_transcoder.cpp> + $<$:${PROJECT_SOURCE_DIR}/external/basisu/transcoder/basisu_transcoder.cpp> "${PROJECT_SOURCE_DIR}/external/basisu/zstd/zstd.c" ) target_compile_definitions(