Skip to content
Snippets Groups Projects
Commit c7366f4c authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-17238 Fix coding policy build issues

parent c47b2ae7
No related branches found
No related tags found
No related merge requests found
...@@ -128,7 +128,7 @@ add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL) ...@@ -128,7 +128,7 @@ add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL)
set_property( set_property(
DIRECTORY ${VIEWER_PREFIX} DIRECTORY ${VIEWER_PREFIX}
PROPERTY VS_STARTUP_PROJECT ${VIEWER_BINARY_NAME} PROPERTY VS_STARTUP_PROJECT ${VIEWER_BINARY_NAME}
) )
if (LL_TESTS) if (LL_TESTS)
# Define after the custom targets are created so # Define after the custom targets are created so
......
...@@ -216,7 +216,7 @@ elseif(LINUX) ...@@ -216,7 +216,7 @@ elseif(LINUX)
list( APPEND release_files list( APPEND release_files
libapr-1.so.0 libapr-1.so.0
libaprutil-1.so.0 libaprutil-1.so.0
libatk-1.0.so libatk-1.0.so
libfreetype.so.6.6.2 libfreetype.so.6.6.2
libfreetype.so.6 libfreetype.so.6
libhunspell-1.3.so.0.0.0 libhunspell-1.3.so.0.0.0
...@@ -224,12 +224,11 @@ elseif(LINUX) ...@@ -224,12 +224,11 @@ elseif(LINUX)
libuuid.so.16.0.22 libuuid.so.16.0.22
libfontconfig.so.1.8.0 libfontconfig.so.1.8.0
libfontconfig.so.1 libfontconfig.so.1
libgmodule-2.0.so libgmodule-2.0.so
libgobject-2.0.so libgobject-2.0.so
) )
endif() endif()
if (TARGET ll::fmodstudio) if (TARGET ll::fmodstudio)
set(debug_files ${debug_files} "libfmodL.so") set(debug_files ${debug_files} "libfmodL.so")
set(release_files ${release_files} "libfmod.so") set(release_files ${release_files} "libfmod.so")
...@@ -298,4 +297,4 @@ if(DARWIN) ...@@ -298,4 +297,4 @@ if(DARWIN)
add_custom_command( TARGET stage_third_party_libs POST_BUILD add_custom_command( TARGET stage_third_party_libs POST_BUILD
COMMAND cmake -E create_symlink ${SHARED_LIB_STAGING_DIR} ${CMAKE_BINARY_DIR}/sharedlibs/Resources COMMAND cmake -E create_symlink ${SHARED_LIB_STAGING_DIR} ${CMAKE_BINARY_DIR}/sharedlibs/Resources
) )
endif() endif()
\ No newline at end of file
...@@ -7,4 +7,4 @@ include(Tracy) ...@@ -7,4 +7,4 @@ include(Tracy)
include(ZLIBNG) include(ZLIBNG)
include(JsonCpp) include(JsonCpp)
include(XmlRpcEpi) include(XmlRpcEpi)
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
include(CURL) include(CURL)
include(OpenSSL) include(OpenSSL)
include(NGHTTP2) include(NGHTTP2)
\ No newline at end of file
...@@ -14,8 +14,8 @@ add_library( ll::colladadom INTERFACE IMPORTED ) ...@@ -14,8 +14,8 @@ add_library( ll::colladadom INTERFACE IMPORTED )
# ND, needs fixup in collada conan pkg # ND, needs fixup in collada conan pkg
if( USE_CONAN ) if( USE_CONAN )
target_include_directories( ll::colladadom SYSTEM INTERFACE target_include_directories( ll::colladadom SYSTEM INTERFACE
"${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/" "${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/"
"${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/1.4/" ) "${CONAN_INCLUDE_DIRS_COLLADADOM}/collada-dom/1.4/" )
endif() endif()
use_system_binary( colladadom ) use_system_binary( colladadom )
......
...@@ -60,13 +60,13 @@ endmacro (use_prebuilt_binary _binary) ...@@ -60,13 +60,13 @@ endmacro (use_prebuilt_binary _binary)
#Sadly we need a macro here, otherwise the return() will not properly work #Sadly we need a macro here, otherwise the return() will not properly work
macro ( use_system_binary package ) macro ( use_system_binary package )
if( USE_CONAN ) if( USE_CONAN )
target_link_libraries( ll::${package} INTERFACE CONAN_PKG::${package} ) target_link_libraries( ll::${package} INTERFACE CONAN_PKG::${package} )
foreach( extra_pkg "${ARGN}" ) foreach( extra_pkg "${ARGN}" )
if( extra_pkg ) if( extra_pkg )
target_link_libraries( ll::${package} INTERFACE CONAN_PKG::${extra_pkg} ) target_link_libraries( ll::${package} INTERFACE CONAN_PKG::${extra_pkg} )
endif() endif()
endforeach() endforeach()
return() return()
endif() endif()
endmacro() endmacro()
...@@ -8,8 +8,8 @@ if (LINUX) ...@@ -8,8 +8,8 @@ if (LINUX)
target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 ) target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 )
if( USE_CONAN ) if( USE_CONAN )
target_link_libraries( ll::uilibraries INTERFACE CONAN_PKG::gtk ) target_link_libraries( ll::uilibraries INTERFACE CONAN_PKG::gtk )
return() return()
endif() endif()
use_prebuilt_binary(gtk-atk-pango-glib) use_prebuilt_binary(gtk-atk-pango-glib)
......
...@@ -68,4 +68,4 @@ if( TARGET ll::openal ) ...@@ -68,4 +68,4 @@ if( TARGET ll::openal )
endif() endif()
if( TARGET ll::fmodstudio ) if( TARGET ll::fmodstudio )
target_link_libraries( llaudio ll::fmodstudio ) target_link_libraries( llaudio ll::fmodstudio )
endif() endif()
\ No newline at end of file
...@@ -268,8 +268,7 @@ target_link_libraries( ...@@ -268,8 +268,7 @@ target_link_libraries(
ll::boost ll::boost
ll::uriparser ll::uriparser
ll::oslibraries ll::oslibraries
ll::tracy ll::tracy
) )
target_include_directories( llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories( llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
......
...@@ -63,7 +63,7 @@ target_link_libraries(llprimitive ...@@ -63,7 +63,7 @@ target_link_libraries(llprimitive
llphysicsextensions_impl llphysicsextensions_impl
ll::colladadom ll::colladadom
ll::pcre ll::pcre
ll::glh_linear ll::glh_linear
) )
#add unit tests #add unit tests
......
...@@ -54,8 +54,8 @@ set(llwindow_LINK_LIBRARIES ...@@ -54,8 +54,8 @@ set(llwindow_LINK_LIBRARIES
llrender llrender
llfilesystem llfilesystem
llxml llxml
ll::glh_linear ll::glh_linear
ll::glext ll::glext
ll::uilibraries ll::uilibraries
ll::SDL ll::SDL
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment