summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-09-17 02:09:04 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-09-17 19:30:31 +0300
commitc7366f4c55c6442414eb6c5a6736baf90f1a4700 (patch)
treec1410c80c26bc6abaf22bcf43d277af6597920f7 /indra/cmake
parentc47b2ae7458f88941e4a129b0bc9aa96ab4ae003 (diff)
SL-17238 Fix coding policy build issues
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake13
-rw-r--r--indra/cmake/LLCommon.cmake2
-rw-r--r--indra/cmake/LLCoreHttp.cmake2
-rw-r--r--indra/cmake/LLPrimitive.cmake4
-rw-r--r--indra/cmake/Prebuilt.cmake14
-rw-r--r--indra/cmake/UI.cmake4
6 files changed, 19 insertions, 20 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 5bb988d639..7495de00d5 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -216,7 +216,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
@@ -224,12 +224,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")
@@ -298,4 +297,4 @@ if(DARWIN)
add_custom_command( TARGET stage_third_party_libs POST_BUILD
COMMAND cmake -E create_symlink ${SHARED_LIB_STAGING_DIR} ${CMAKE_BINARY_DIR}/sharedlibs/Resources
)
-endif() \ No newline at end of file
+endif()
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index e56625d051..92045f7b58 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -7,4 +7,4 @@ include(Tracy)
include(ZLIBNG)
include(JsonCpp)
-include(XmlRpcEpi) \ No newline at end of file
+include(XmlRpcEpi)
diff --git a/indra/cmake/LLCoreHttp.cmake b/indra/cmake/LLCoreHttp.cmake
index a166c96043..22ed5fef9c 100644
--- a/indra/cmake/LLCoreHttp.cmake
+++ b/indra/cmake/LLCoreHttp.cmake
@@ -2,4 +2,4 @@
include(CURL)
include(OpenSSL)
-include(NGHTTP2) \ No newline at end of file
+include(NGHTTP2)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 04afe5e405..3d8499cbc3 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -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 )
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index f0239711aa..634cc15c21 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -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()
-
+
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index c02ad3e161..8b70192efc 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -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)