Skip to content

Commit cfba474

Browse files
committed
correct install targets - we need import library when installing shared builds and we don't need any of dependencies libs when installing static build
1 parent 1ffbc21 commit cfba474

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

src/nbl/CMakeLists.txt

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -674,50 +674,50 @@ macro(nbl_install_lib _TRGT)
674674
install(TARGETS ${_TRGT} ARCHIVE DESTINATION relwithdebinfo/lib CONFIGURATIONS RelWithDebInfo)
675675
endmacro()
676676

677-
# Install main lib
678677
set_target_properties(Nabla PROPERTIES DEBUG_POSTFIX _debug)
679678
set_target_properties(Nabla PROPERTIES RELWITHDEBINFO_POSTFIX _relwithdebinfo)
679+
680+
nbl_install_lib(Nabla)
681+
680682
if(NBL_STATIC_BUILD)
681-
nbl_install_lib(Nabla)
683+
# install dependencies, they are required only for static Nabla builds
684+
nbl_install_lib(egl)
685+
nbl_install_lib(glslang)
686+
nbl_install_lib(GenericCodeGen)
687+
nbl_install_lib(MachineIndependent)
688+
nbl_install_lib(HLSL)
689+
nbl_install_lib(jpeg-static)
690+
if (_NBL_COMPILE_WITH_OPEN_EXR_)
691+
nbl_install_lib(Half)
692+
nbl_install_lib(Iex)
693+
nbl_install_lib(IexMath)
694+
nbl_install_lib(IlmImf)
695+
nbl_install_lib(IlmThread)
696+
nbl_install_lib(Imath)
697+
endif()
698+
nbl_install_lib(png_static)
699+
700+
if(ANDROID AND NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") # OpenSSL can't be built for Android platform using windows OS host
701+
install(FILES
702+
"$<TARGET_PROPERTY:OpenSSL,INTERFACE_LINK_LIBRARIES>"
703+
DESTINATION lib
704+
)
705+
endif()
706+
nbl_install_lib(shaderc)
707+
nbl_install_lib(shaderc_util)
708+
nbl_install_lib(SPIRV)
709+
nbl_install_lib(SPIRV-Tools-static) # TODO: make this function/macro work with alias target
710+
nbl_install_lib(SPIRV-Tools-opt)
711+
nbl_install_lib(OGLCompiler)
712+
nbl_install_lib(OSDependent)
713+
nbl_install_lib(zlibstatic)
714+
nbl_install_lib(simdjson)
715+
nbl_install_lib(volk)
716+
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
717+
nbl_install_program(tbb)
718+
nbl_install_program(tbbmalloc)
719+
nbl_install_program(tbbmalloc_proxy)
720+
endif()
682721
else()
683722
nbl_install_program(Nabla)
684723
endif()
685-
686-
#install dependencies
687-
nbl_install_lib(egl)
688-
nbl_install_lib(glslang)
689-
nbl_install_lib(GenericCodeGen)
690-
nbl_install_lib(MachineIndependent)
691-
nbl_install_lib(HLSL)
692-
nbl_install_lib(jpeg-static)
693-
if (_NBL_COMPILE_WITH_OPEN_EXR_)
694-
nbl_install_lib(Half)
695-
nbl_install_lib(Iex)
696-
nbl_install_lib(IexMath)
697-
nbl_install_lib(IlmImf)
698-
nbl_install_lib(IlmThread)
699-
nbl_install_lib(Imath)
700-
endif()
701-
nbl_install_lib(png_static)
702-
703-
if(ANDROID AND NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") # OpenSSL can't be built for Android platform using windows OS host
704-
install(FILES
705-
"$<TARGET_PROPERTY:OpenSSL,INTERFACE_LINK_LIBRARIES>"
706-
DESTINATION lib
707-
)
708-
endif()
709-
nbl_install_lib(shaderc)
710-
nbl_install_lib(shaderc_util)
711-
nbl_install_lib(SPIRV)
712-
nbl_install_lib(SPIRV-Tools-static) # TODO: make this function/macro work with alias target
713-
nbl_install_lib(SPIRV-Tools-opt)
714-
nbl_install_lib(OGLCompiler)
715-
nbl_install_lib(OSDependent)
716-
nbl_install_lib(zlibstatic)
717-
nbl_install_lib(simdjson)
718-
nbl_install_lib(volk)
719-
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
720-
nbl_install_program(tbb)
721-
nbl_install_program(tbbmalloc)
722-
nbl_install_program(tbbmalloc_proxy)
723-
endif()

0 commit comments

Comments
 (0)