SL-17238 Fix coding policy build issues
parent
8c1427c39f
commit
0da3dd27fc
|
|
@ -128,7 +128,7 @@ add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL)
|
|||
set_property(
|
||||
DIRECTORY ${VIEWER_PREFIX}
|
||||
PROPERTY VS_STARTUP_PROJECT ${VIEWER_BINARY_NAME}
|
||||
)
|
||||
)
|
||||
|
||||
if (LL_TESTS)
|
||||
# Define after the custom targets are created so
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ elseif(LINUX)
|
|||
list( APPEND release_files
|
||||
libapr-1.so.0
|
||||
libaprutil-1.so.0
|
||||
libatk-1.0.so
|
||||
libatk-1.0.so
|
||||
libfreetype.so.6.6.2
|
||||
libfreetype.so.6
|
||||
libhunspell-1.3.so.0.0.0
|
||||
|
|
@ -233,12 +233,11 @@ elseif(LINUX)
|
|||
libuuid.so.16.0.22
|
||||
libfontconfig.so.1.8.0
|
||||
libfontconfig.so.1
|
||||
libgmodule-2.0.so
|
||||
libgobject-2.0.so
|
||||
libgmodule-2.0.so
|
||||
libgobject-2.0.so
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
endif()
|
||||
|
||||
if (TARGET ll::fmodstudio)
|
||||
set(debug_files ${debug_files} "libfmodL.so")
|
||||
set(release_files ${release_files} "libfmod.so")
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ include(Tracy)
|
|||
include(ZLIBNG)
|
||||
include(JsonCpp)
|
||||
|
||||
include(XmlRpcEpi)
|
||||
include(XmlRpcEpi)
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
include(CURL)
|
||||
include(OpenSSL)
|
||||
include(NGHTTP2)
|
||||
include(NGHTTP2)
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ add_library( ll::colladadom INTERFACE IMPORTED )
|
|||
# ND, needs fixup in collada conan pkg
|
||||
if( USE_CONAN )
|
||||
target_include_directories( ll::colladadom SYSTEM INTERFACE
|
||||
"${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/"
|
||||
"${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/1.4/" )
|
||||
"${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/"
|
||||
"${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/1.4/" )
|
||||
endif()
|
||||
|
||||
use_system_binary( colladadom )
|
||||
|
|
|
|||
|
|
@ -60,13 +60,13 @@ endmacro (use_prebuilt_binary _binary)
|
|||
#Sadly we need a macro here, otherwise the return() will not properly work
|
||||
macro ( use_system_binary package )
|
||||
if( USE_CONAN )
|
||||
target_link_libraries( ll::${package} INTERFACE CONAN_PKG::${package} )
|
||||
foreach( extra_pkg "${ARGN}" )
|
||||
if( extra_pkg )
|
||||
target_link_libraries( ll::${package} INTERFACE CONAN_PKG::${extra_pkg} )
|
||||
endif()
|
||||
endforeach()
|
||||
target_link_libraries( ll::${package} INTERFACE CONAN_PKG::${package} )
|
||||
foreach( extra_pkg "${ARGN}" )
|
||||
if( extra_pkg )
|
||||
target_link_libraries( ll::${package} INTERFACE CONAN_PKG::${extra_pkg} )
|
||||
endif()
|
||||
endforeach()
|
||||
return()
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ if (LINUX)
|
|||
target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 )
|
||||
|
||||
if( USE_CONAN )
|
||||
target_link_libraries( ll::uilibraries INTERFACE CONAN_PKG::gtk )
|
||||
return()
|
||||
target_link_libraries( ll::uilibraries INTERFACE CONAN_PKG::gtk )
|
||||
return()
|
||||
endif()
|
||||
use_prebuilt_binary(gtk-atk-pango-glib)
|
||||
|
||||
|
|
|
|||
|
|
@ -68,4 +68,4 @@ if( TARGET ll::openal )
|
|||
endif()
|
||||
if( TARGET ll::fmodstudio )
|
||||
target_link_libraries( llaudio ll::fmodstudio )
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -268,8 +268,7 @@ target_link_libraries(
|
|||
ll::boost
|
||||
ll::uriparser
|
||||
ll::oslibraries
|
||||
ll::tracy
|
||||
|
||||
ll::tracy
|
||||
)
|
||||
|
||||
target_include_directories( llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ target_link_libraries(llprimitive
|
|||
llphysicsextensions_impl
|
||||
ll::colladadom
|
||||
ll::pcre
|
||||
ll::glh_linear
|
||||
ll::glh_linear
|
||||
)
|
||||
|
||||
#add unit tests
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ set(llwindow_LINK_LIBRARIES
|
|||
llrender
|
||||
llfilesystem
|
||||
llxml
|
||||
ll::glh_linear
|
||||
ll::glext
|
||||
ll::glh_linear
|
||||
ll::glext
|
||||
ll::uilibraries
|
||||
ll::SDL
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue