From 786b291d9c6b784c7ce6ceef0e38a4ec76ea14db Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 6 Apr 2022 16:32:52 +0200
Subject: Move CMake files to modernized cmake syntax, step 1. Change projects
 to cmake targetsto get rid of havig to hardcore include directories and link
 libraries in consumer projects.

---
 indra/cmake/LLAddBuildTest.cmake | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 4937c2a9d7..6860b1f316 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -36,30 +36,29 @@ INCLUDE(GoogleMock)
     )
   SET(alltest_DEP_TARGETS
     # needed by the test harness itself
-    ${APRUTIL_LIBRARIES}
-    ${APR_LIBRARIES}
     llcommon
     )
+
+  SET(alltest_INCLUDE_DIRS
+          ${LIBS_OPEN_DIR}/test
+          ${GOOGLEMOCK_INCLUDE_DIRS}
+          )
+  SET(alltest_LIBRARIES
+          llcommon
+          ${GOOGLEMOCK_LIBRARIES}
+          ${PTHREAD_LIBRARY}
+          ${WINDOWS_LIBRARIES}
+          )
   IF(NOT "${project}" STREQUAL "llmath")
     # add llmath as a dep unless the tested module *is* llmath!
     LIST(APPEND alltest_DEP_TARGETS
-      llmath
-      )
+            llmath
+            )
+    LIST(APPEND alltest_LIBRARIES
+            llmath
+            )
   ENDIF(NOT "${project}" STREQUAL "llmath")
-  SET(alltest_INCLUDE_DIRS
-    ${LLMATH_INCLUDE_DIRS}
-    ${LLCOMMON_INCLUDE_DIRS}
-    ${LIBS_OPEN_DIR}/test
-    ${GOOGLEMOCK_INCLUDE_DIRS}
-    )
-  SET(alltest_LIBRARIES
-    ${BOOST_FIBER_LIBRARY}
-    ${BOOST_CONTEXT_LIBRARY}
-    ${BOOST_SYSTEM_LIBRARY}
-    ${GOOGLEMOCK_LIBRARIES}
-    ${PTHREAD_LIBRARY}
-    ${WINDOWS_LIBRARIES}
-    )
+
   # Headers, for convenience in targets.
   SET(alltest_HEADER_FILES
     ${CMAKE_SOURCE_DIR}/test/test.h
@@ -126,7 +125,8 @@ INCLUDE(GoogleMock)
       MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_LIBRARIES ${${name}_test_additional_LIBRARIES}")
     ENDIF(LL_TEST_VERBOSE)
     # Add to project
-    TARGET_LINK_LIBRARIES(PROJECT_${project}_TEST_${name} ${alltest_LIBRARIES} ${alltest_DEP_TARGETS} ${${name}_test_additional_PROJECTS} ${${name}_test_additional_LIBRARIES} )
+    TARGET_LINK_LIBRARIES(PROJECT_${project}_TEST_${name} ${alltest_LIBRARIES} ${${name}_test_additional_PROJECTS} ${${name}_test_additional_LIBRARIES} )
+    add_dependencies( PROJECT_${project}_TEST_${name} ${alltest_DEP_TARGETS})
     # Compile-time Definitions
     GET_OPT_SOURCE_FILE_PROPERTY(${name}_test_additional_CFLAGS ${source} LL_TEST_ADDITIONAL_CFLAGS)
     SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name}
-- 
cgit v1.2.3


From d1b6a52fefb483ab75ec60e379d37bfd2e6aff90 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 6 Apr 2022 22:38:38 +0200
Subject: Googlemock target

---
 indra/cmake/LLAddBuildTest.cmake | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 6860b1f316..1a8003ea7f 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -45,7 +45,7 @@ INCLUDE(GoogleMock)
           )
   SET(alltest_LIBRARIES
           llcommon
-          ${GOOGLEMOCK_LIBRARIES}
+          googlemock::googlemock
           ${PTHREAD_LIBRARY}
           ${WINDOWS_LIBRARIES}
           )
@@ -206,14 +206,11 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     )
 
   SET(libraries
-    ${LEGACY_STDIO_LIBS}
-    ${library_dependencies}
-    ${BOOST_FIBER_LIBRARY}
-    ${BOOST_CONTEXT_LIBRARY}
-    ${BOOST_SYSTEM_LIBRARY}
-    ${GOOGLEMOCK_LIBRARIES}
-    ${PTHREAD_LIBRARY}
-    )
+          ${LEGACY_STDIO_LIBS}
+          ${library_dependencies}
+          googlemock::googlemock
+          ${PTHREAD_LIBRARY}
+          )
 
   # Add test executable build target
   if(TEST_DEBUG)
-- 
cgit v1.2.3


From d3521b4462195cfe882b2cc8eb4e7c5e948c0fb6 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 13 Apr 2022 10:28:46 +0200
Subject: Remove obsolete and unmaintained USE_SYSTEMLIBS

---
 indra/cmake/LLAddBuildTest.cmake | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 1a8003ea7f..2fa9a7cd96 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -223,10 +223,6 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     COMPILE_DEFINITIONS "LL_TEST=${testname};LL_TEST_${testname}"
     )
 
-  if(USESYSTEMLIBS)
-    SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}")
-  endif(USESYSTEMLIBS)
-
   if (USE_BUGSPLAT)
       SET_PROPERTY(SOURCE ${source_files}
           APPEND PROPERTY COMPILE_DEFINITIONS "${BUGSPLAT_DEFINE}")
@@ -304,10 +300,6 @@ MACRO(SET_TEST_PATH LISTVAR)
     set(${LISTVAR} ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources ${SHARED_LIB_STAGING_DIR}/Release/Resources /usr/lib)
   ELSE(WINDOWS)
     # Linux uses a single staging directory anyway.
-    IF (USESYSTEMLIBS)
-      set(${LISTVAR} ${CMAKE_BINARY_DIR}/llcommon /usr/lib /usr/local/lib)
-    ELSE (USESYSTEMLIBS)
-      set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib)
-    ENDIF (USESYSTEMLIBS)
+    set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib)
   ENDIF(WINDOWS)
 ENDMACRO(SET_TEST_PATH)
-- 
cgit v1.2.3


From 241919e7f7986c11586a49bff53cf19c2c0e0ea6 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 13 Apr 2022 19:21:55 +0200
Subject: Rework cmake, the original plan was to maybe be able to use conan
 targets with the same name (that's why 3ps had names like apr::apr), but it's
 safer and saner to put the LL 3ps under the ll:: prefix. This also allows
 means it is possible to get rid of that bad "if( TRAGET ...) return()
 endif()" pattern and rather use include_guard().

---
 indra/cmake/LLAddBuildTest.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 2fa9a7cd96..a3c873b389 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -45,7 +45,7 @@ INCLUDE(GoogleMock)
           )
   SET(alltest_LIBRARIES
           llcommon
-          googlemock::googlemock
+          ll::googlemock
           ${PTHREAD_LIBRARY}
           ${WINDOWS_LIBRARIES}
           )
@@ -208,7 +208,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
   SET(libraries
           ${LEGACY_STDIO_LIBS}
           ${library_dependencies}
-          googlemock::googlemock
+          ll::googlemock
           ${PTHREAD_LIBRARY}
           )
 
-- 
cgit v1.2.3


From bb85651d987a6cb969de7dd7c2b130411de6203c Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sat, 16 Apr 2022 15:29:02 +0200
Subject: Create a new target ll::oslibrary to link against libs specific to
 the OS compiled on. This gets rid of the a few OS specific set and uses
 variables (which some even seemed mostly duplicate like WINDOWS_LIBRARIES ans
 UI_LIBRARIES) and it also solves the problem of having them to tack on every
 target, as of no they come as a transitive dependency from llcommon

---
 indra/cmake/LLAddBuildTest.cmake | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index a3c873b389..9412475640 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -46,8 +46,6 @@ INCLUDE(GoogleMock)
   SET(alltest_LIBRARIES
           llcommon
           ll::googlemock
-          ${PTHREAD_LIBRARY}
-          ${WINDOWS_LIBRARIES}
           )
   IF(NOT "${project}" STREQUAL "llmath")
     # add llmath as a dep unless the tested module *is* llmath!
-- 
cgit v1.2.3


From b9f94c08977ff76f41a32a2bb9f25883e578eea3 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sat, 16 Apr 2022 15:33:32 +0200
Subject: Now there is a oslibrary target get rid of some more obsolete vars:
 LEGACY_STDIO_LIBS (was only used for Windows) PTHREAD_LIBRARY (only Linux)
 LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed
 anyway)

---
 indra/cmake/LLAddBuildTest.cmake | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 9412475640..1f63fed613 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -204,10 +204,8 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     )
 
   SET(libraries
-          ${LEGACY_STDIO_LIBS}
           ${library_dependencies}
           ll::googlemock
-          ${PTHREAD_LIBRARY}
           )
 
   # Add test executable build target
-- 
cgit v1.2.3


From 7d6bb21c9cfc6d46cae4f8c4fcffabd23325629e Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sat, 16 Apr 2022 17:13:52 +0200
Subject: Remove unset GOOGLEMOCK_INCLUDE_DIRS variable.

---
 indra/cmake/LLAddBuildTest.cmake | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 1f63fed613..9bdcb7d6a2 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -41,7 +41,6 @@ INCLUDE(GoogleMock)
 
   SET(alltest_INCLUDE_DIRS
           ${LIBS_OPEN_DIR}/test
-          ${GOOGLEMOCK_INCLUDE_DIRS}
           )
   SET(alltest_LIBRARIES
           llcommon
-- 
cgit v1.2.3


From 5994ca8531e51534c83f737a0962471e55f14167 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sat, 16 Apr 2022 22:58:06 +0200
Subject: Remove another place where there was some hand crafted logic to deal
 with bugsplat defines

---
 indra/cmake/LLAddBuildTest.cmake | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 9bdcb7d6a2..a97d2584ae 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -84,11 +84,6 @@ INCLUDE(GoogleMock)
       MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_SOURCE_FILES ${${name}_test_SOURCE_FILES}")
     ENDIF(LL_TEST_VERBOSE)
 
-    if (USE_BUGSPLAT)
-      SET_PROPERTY(SOURCE ${${name}_test_SOURCE_FILES}
-          APPEND PROPERTY COMPILE_DEFINITIONS "${BUGSPLAT_DEFINE}")
-    endif (USE_BUGSPLAT)
-
     # Headers
     GET_OPT_SOURCE_FILE_PROPERTY(${name}_test_additional_HEADER_FILES ${source} LL_TEST_ADDITIONAL_HEADER_FILES)
     SET(${name}_test_HEADER_FILES ${name}.h ${${name}_test_additional_HEADER_FILES})
@@ -218,11 +213,6 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     COMPILE_DEFINITIONS "LL_TEST=${testname};LL_TEST_${testname}"
     )
 
-  if (USE_BUGSPLAT)
-      SET_PROPERTY(SOURCE ${source_files}
-          APPEND PROPERTY COMPILE_DEFINITIONS "${BUGSPLAT_DEFINE}")
-  endif (USE_BUGSPLAT)
-
   # The following was copied to llcorehttp/CMakeLists.txt's texture_load target. 
   # Any changes made here should be replicated there.
   if (WINDOWS)
-- 
cgit v1.2.3


From 283c2a20cc4ef856076d287303c7143332b201fe Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sun, 1 May 2022 00:38:40 +0200
Subject: Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
 sets the property on those.

---
 indra/cmake/LLAddBuildTest.cmake | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index a97d2584ae..d3047ddc82 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -87,7 +87,6 @@ INCLUDE(GoogleMock)
     # Headers
     GET_OPT_SOURCE_FILE_PROPERTY(${name}_test_additional_HEADER_FILES ${source} LL_TEST_ADDITIONAL_HEADER_FILES)
     SET(${name}_test_HEADER_FILES ${name}.h ${${name}_test_additional_HEADER_FILES})
-    set_source_files_properties(${${name}_test_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE)
     LIST(APPEND ${name}_test_SOURCE_FILES ${${name}_test_HEADER_FILES})
     IF(LL_TEST_VERBOSE)
       MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_HEADER_FILES ${${name}_test_HEADER_FILES}")
-- 
cgit v1.2.3


From 767464a2627036e8a16ac323c886e0a1712e0a5f Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sat, 7 May 2022 02:19:51 +0200
Subject: Adapt gnerator expression usage to work on OSX.

---
 indra/cmake/LLAddBuildTest.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake/LLAddBuildTest.cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index d3047ddc82..fa95e08dcd 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -276,12 +276,12 @@ MACRO(SET_TEST_PATH LISTVAR)
     # We typically build/package only Release variants of third-party
     # libraries, so append the Release staging dir in case the library being
     # sought doesn't have a debug variant.
-    set(${LISTVAR} ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR} ${SHARED_LIB_STAGING_DIR}/Release)
+    set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} ${SHARED_LIB_STAGING_DIR}/Release)
   ELSEIF(DARWIN)
     # We typically build/package only Release variants of third-party
     # libraries, so append the Release staging dir in case the library being
     # sought doesn't have a debug variant.
-    set(${LISTVAR} ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources ${SHARED_LIB_STAGING_DIR}/Release/Resources /usr/lib)
+    set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} ${SHARED_LIB_STAGING_DIR}/Release/Resources /usr/lib)
   ELSE(WINDOWS)
     # Linux uses a single staging directory anyway.
     set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib)
-- 
cgit v1.2.3