diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index ff6a68ff9703a139df19278acd532d12a96c755a..205ce402a0be785dafe16ce1982d3c7866976c65 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -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 diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 5bb988d639aa0f9ba7ea3c012edbce4c32ed90f4..7495de00d5c642b7b79313246ef9fe6f66607b38 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 e56625d051f61dedfbed5ac5c4aae990f49a9948..92045f7b5814a445795ea2e4e10b631a088abd59 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 a166c960437a7bdd8dfe5f7258d53a238eb34b2c..22ed5fef9cbda11aea6f71ee031554595ba2c521 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 04afe5e4054288d66791c2ab639bbf929b042db8..3d8499cbc3a17c11acd2b8dc31b51061322bdc44 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 f0239711aa4100ab8e32999108e9912ba227c7a6..634cc15c21c64bc6947066037038bccfbb6c7024 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 c02ad3e1612cadeaeb8dfa0b0465242e395357db..8b70192efc802c7ab5dcb18480deb21cba4241ff 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) diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index d6846ddf990f34761d51fe3dbec52fcfce4ef19f..4f469b9bb5145ab61be98c71e703655b0fe8e709 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -68,4 +68,4 @@ if( TARGET ll::openal ) endif() if( TARGET ll::fmodstudio ) target_link_libraries( llaudio ll::fmodstudio ) -endif() \ No newline at end of file +endif() diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 8625060720fffae90a06d4cb1f08d5a4175c67fc..b576cdc1e1856ab216466bef134a657d10dc67b0 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -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}) diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 7d83dc77c1fd5932a4ce297229bc7ea2e591d6f6..d69cd958a01dd1cad7bda5302227c52b207cbeb4 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -63,7 +63,7 @@ target_link_libraries(llprimitive llphysicsextensions_impl ll::colladadom ll::pcre - ll::glh_linear + ll::glh_linear ) #add unit tests diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index cc60625683bb82ef7fc0e84ea62e9e339628c7e3..dbab58c5de51bc094a886b3789675fdb51f7c16b 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -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 )