Skip to content

Commit

Permalink
Merge pull request #5 from Yellow-Dog-Man/feat/better-shared
Browse files Browse the repository at this point in the history
Restructure Resultant shared object files to contain their detendies.
  • Loading branch information
ProbablePrime authored Feb 6, 2025
2 parents 15c5033 + 539963a commit c31e356
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion applications/_libs/gpu_decode/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(GPU_DECODE_SRC
gpu_decode.h
)

add_library(CMP_GpuDecode SHARED ${GPU_DECODE_H} ${GPU_DECODE_SRC})
add_library(CMP_GpuDecode STATIC ${GPU_DECODE_H} ${GPU_DECODE_SRC})

target_include_directories(CMP_GpuDecode PRIVATE
${PROJECT_SOURCE_DIR}/applications/_plugins/common
Expand Down
2 changes: 1 addition & 1 deletion applications/_plugins/cimage/dds/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10)

add_library(Image_DDS SHARED "")
add_library(Image_DDS STATIC "")

target_sources(Image_DDS
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion applications/_plugins/cimage/exr/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10)

add_library(Image_EXR SHARED "")
add_library(Image_EXR STATIC "")

target_sources(Image_EXR
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion applications/_plugins/cimage/ktx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10)

add_library(Image_KTX SHARED "")
add_library(Image_KTX STATIC "")

# Enabled KTX1 Only
file(GLOB_RECURSE KTX_Lib
Expand Down
2 changes: 1 addition & 1 deletion applications/_plugins/cimage/ktx2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10)

add_library(Image_KTX2 SHARED "")
add_library(Image_KTX2 STATIC "")

target_sources(Image_KTX2
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion applications/_plugins/cimage/tga/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10)

add_library(Image_TGA SHARED "")
add_library(Image_TGA STATIC "")

target_sources(Image_TGA
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion applications/_plugins/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if (OPTION_BUILD_EXR)
list(APPEND PLUGIN_COMMON_H cexr.h)
endif()

add_library(CMP_Common SHARED
add_library(CMP_Common STATIC
${PLUGIN_COMMON_SRC}
${PLUGIN_COMMON_SRC_QT}
${PLUGIN_COMMON_H}
Expand Down
8 changes: 4 additions & 4 deletions cmp_core/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10)

add_library(CMP_Core SHARED)
add_library(CMP_Core STATIC)

target_sources(CMP_Core
PRIVATE
Expand Down Expand Up @@ -67,7 +67,7 @@ set_target_properties(CMP_Core PROPERTIES FOLDER ${PROJECT_FOLDER_SDK_LIBS})
# Core SIMD options

# SSE
add_library(CMP_Core_SSE SHARED)
add_library(CMP_Core_SSE STATIC)
target_sources(CMP_Core_SSE PRIVATE source/core_simd_sse.cpp)
target_include_directories(CMP_Core_SSE PRIVATE source shaders)

Expand All @@ -78,7 +78,7 @@ endif()
set_target_properties(CMP_Core_SSE PROPERTIES FOLDER ${PROJECT_FOLDER_SDK_LIBS})

# AVX
add_library(CMP_Core_AVX SHARED)
add_library(CMP_Core_AVX STATIC)
target_sources(CMP_Core_AVX PRIVATE source/core_simd_avx.cpp)
target_include_directories(CMP_Core_AVX PRIVATE source shaders)

Expand All @@ -91,7 +91,7 @@ endif()
set_target_properties(CMP_Core_AVX PROPERTIES FOLDER ${PROJECT_FOLDER_SDK_LIBS})

# AVX-512
add_library(CMP_Core_AVX512 SHARED)
add_library(CMP_Core_AVX512 STATIC)
target_sources(CMP_Core_AVX512 PRIVATE source/core_simd_avx512.cpp)
target_include_directories(CMP_Core_AVX512 PRIVATE source shaders)

Expand Down

0 comments on commit c31e356

Please sign in to comment.