No VC flags on GCC & deps only if building Collada

2 files changed, 94 insertions, 92 deletions

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index d51ae77662..576562724e 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -58,7 +58,7 @@ set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release" CACHE STRING "Supported b
 
 # Platform-specific compilation flags.
 
-if (WINDOWS)
+if (NOT CMAKE_CXX_COMPILER_ID MATCHES GNU AND WINDOWS)
   # Don't build DLLs.
   set(BUILD_SHARED_LIBS OFF)
 
@@ -114,7 +114,7 @@ if (WINDOWS)
 
   # Allow use of sprintf etc
   add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
-endif (WINDOWS)
+endif (NOT CMAKE_CXX_COMPILER_ID MATCHES GNU AND WINDOWS)
 
 if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   set( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 0a6e55efeb..39c07e3377 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -19,12 +19,6 @@ if( USE_CONAN )
 endif()
 
 if( USESYSTEMLIBS )
-  include(FindPkgConfig)
-  pkg_check_modules(Minizip REQUIRED minizip)
-  pkg_check_modules(Libxml2 REQUIRED libxml-2.0)
-  pkg_check_modules(Libpcrecpp libpcrecpp)
-  target_link_libraries( ll::minizip-ng INTERFACE ${Minizip_LIBRARIES} )
-  target_link_libraries( ll::libxml INTERFACE ${Libxml2_LIBRARIES} )
   if( WINDOWS )
     include(FindPkgConfig)
     pkg_check_modules(Colladadom REQUIRED collada-dom-141)
@@ -37,96 +31,104 @@ if( USESYSTEMLIBS )
     # Build of the collada-dom for Linux and FreeBSD is done in
     # indra/llprimitive/CMakeLists.txt
     return ()
-  elseif( ${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/colladadom_installed OR NOT ${colladadom_installed} EQUAL 0 )
-    if( NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz )
-      file(DOWNLOAD
-        https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r4.tar.gz
-        ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz
-        )
-    endif( NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz )
-    file(ARCHIVE_EXTRACT
-      INPUT ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz
-      DESTINATION ${CMAKE_BINARY_DIR}
-      )
-    file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/collada/1.4)
-    if( DARWIN )
-      try_compile(COLLADADOM_RESULT
-        PROJECT colladadom
-        SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
-        BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
-        TARGET collada14dom
-        CMAKE_FLAGS
-          -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
-          "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} -L${Minizip_LIBRARY_DIRS}exec/boost/1.81/lib"
-          -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp
-          -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
-          -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem-mt
-          -DBoost_SYSTEM_LIBRARY:STRING=boost_system-mt
-          -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}
-          -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
-          -DBoost_CFLAGS:STRING=-I${Libpcrecpp_LIBRARY_DIRS}exec/boost/1.81/include
-          -DOPT_COLLADA14:BOOL=ON
-          -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
-          -DCOLLADA_DOM_SOVERSION:STRING=0
-          -DCOLLADA_DOM_VERSION:STRING=2.3-r4
-        OUTPUT_VARIABLE colladadom_installed
-        )
-      if( ${COLLADADOM_RESULT} )
-        file(
-          COPY
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.2.3-r4.dylib
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.0.dylib
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.dylib
-          DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
-          FOLLOW_SYMLINK_CHAIN
+  else( WINDOWS )
+    include(FindPkgConfig)
+    pkg_check_modules(Minizip REQUIRED minizip)
+    pkg_check_modules(Libxml2 REQUIRED libxml-2.0)
+    pkg_check_modules(Libpcrecpp libpcrecpp)
+    target_link_libraries( ll::minizip-ng INTERFACE ${Minizip_LIBRARIES} )
+    target_link_libraries( ll::libxml INTERFACE ${Libxml2_LIBRARIES} )
+    if( ${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/colladadom_installed OR NOT ${colladadom_installed} EQUAL 0 )
+      if( NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz )
+        file(DOWNLOAD
+          https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r4.tar.gz
+          ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz
           )
-      endif( ${COLLADADOM_RESULT} )
-    else( DARWIN )
-      execute_process(
-        COMMAND sed -i "" -e "s/SHARED/STATIC/g" 1.4/CMakeLists.txt
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src
-        )
-      try_compile(COLLADADOM_RESULT
-        PROJECT colladadom
-        SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
-        BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
-        TARGET collada14dom
-        CMAKE_FLAGS
-          -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
-          -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS}
-          -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp
-          -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
-          -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem
-          -DBoost_SYSTEM_LIBRARY:STRING=boost_system
-          -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}
-          -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
-          -DOPT_COLLADA14:BOOL=ON
-          -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
-          -DCOLLADA_DOM_SOVERSION:STRING=0
-          -DCOLLADA_DOM_VERSION:STRING=2.3-r4
-        OUTPUT_VARIABLE colladadom_installed
+      endif( NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz )
+      file(ARCHIVE_EXTRACT
+        INPUT ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz
+        DESTINATION ${CMAKE_BINARY_DIR}
         )
+      file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/collada/1.4)
+      if( DARWIN )
+        try_compile(COLLADADOM_RESULT
+          PROJECT colladadom
+          SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
+          BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
+          TARGET collada14dom
+          CMAKE_FLAGS
+            -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
+            "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} -L${Minizip_LIBRARY_DIRS}exec/boost/1.81/lib"
+            -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp
+            -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
+            -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem-mt
+            -DBoost_SYSTEM_LIBRARY:STRING=boost_system-mt
+            -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}
+            -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
+            -DBoost_CFLAGS:STRING=-I${Libpcrecpp_LIBRARY_DIRS}exec/boost/1.81/include
+            -DOPT_COLLADA14:BOOL=ON
+            -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
+            -DCOLLADA_DOM_SOVERSION:STRING=0
+            -DCOLLADA_DOM_VERSION:STRING=2.3-r4
+          OUTPUT_VARIABLE colladadom_installed
+          )
+        if( ${COLLADADOM_RESULT} )
+          file(
+            COPY
+              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.2.3-r4.dylib
+              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.0.dylib
+              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.dylib
+            DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+            FOLLOW_SYMLINK_CHAIN
+            )
+        endif( ${COLLADADOM_RESULT} )
+      else( DARWIN )
+        execute_process(
+          COMMAND sed -i "" -e "s/SHARED/STATIC/g" 1.4/CMakeLists.txt
+          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src
+          )
+        try_compile(COLLADADOM_RESULT
+          PROJECT colladadom
+          SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
+          BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
+          TARGET collada14dom
+          CMAKE_FLAGS
+            -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
+            -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS}
+            -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp
+            -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
+            -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem
+            -DBoost_SYSTEM_LIBRARY:STRING=boost_system
+            -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}
+            -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
+            -DOPT_COLLADA14:BOOL=ON
+            -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
+            -DCOLLADA_DOM_SOVERSION:STRING=0
+            -DCOLLADA_DOM_VERSION:STRING=2.3-r4
+          OUTPUT_VARIABLE colladadom_installed
+          )
+        if( ${COLLADADOM_RESULT} )
+          file(
+            COPY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.a
+            DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+            )
+        endif( ${COLLADADOM_RESULT} )
+      endif( DARWIN )
       if( ${COLLADADOM_RESULT} )
+        file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/include/collada/1.4)
         file(
-          COPY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.a
-          DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
+          COPY
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/1.4
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/1.5
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/dae
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/dae.h
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/dom.h
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/modules
+          DESTINATION ${LIBS_PREBUILT_DIR}/include/collada
           )
+        file(WRITE ${PREBUILD_TRACKING_DIR}/colladadom_installed "${colladadom_installed}")
       endif( ${COLLADADOM_RESULT} )
-    endif( DARWIN )
-    if( ${COLLADADOM_RESULT} )
-      file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/include/collada/1.4)
-      file(
-        COPY
-          ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/1.4
-          ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/1.5
-          ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/dae
-          ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/dae.h
-          ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/dom.h
-          ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/modules
-        DESTINATION ${LIBS_PREBUILT_DIR}/include/collada
-        )
-      file(WRITE ${PREBUILD_TRACKING_DIR}/colladadom_installed "${colladadom_installed}")
-    endif( ${COLLADADOM_RESULT} )
+    endif( ${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/colladadom_installed OR NOT ${colladadom_installed} EQUAL 0 )
   endif( WINDOWS )
 else( USESYSTEMLIBS )
 use_system_binary( colladadom )