Continue

Author: guitargeek

cmake/modules/RootMacros.cmake

@@ -3128,7 +3128,6 @@ function(ROOTTEST_ADD_TEST testname)
   else()
     string(REPLACE ";" ":" _path "${ROOTTEST_ENV_PATH}")
     string(REPLACE ";" ":" _pythonpath "${ROOTTEST_ENV_PYTHONPATH}")
-    string(REPLACE ";" ":" _librarypath "${ROOTTEST_ENV_LIBRARYPATH}")
 
 
     set(environment ENVIRONMENT
@@ -3380,7 +3379,6 @@ function(ROOTTEST_ADD_UNITTEST_DIR)
   else()
     string(REPLACE ";" ":" _path "${ROOTTEST_ENV_PATH}")
     string(REPLACE ";" ":" _pythonpath "${ROOTTEST_ENV_PYTHONPATH}")
-    string(REPLACE ";" ":" _librarypath "${ROOTTEST_ENV_LIBRARYPATH}")
 
 
     set(environment ENVIRONMENT

roottest/CMakeLists.txt

@@ -230,25 +230,8 @@ if(MSVC)
 else()
   set(ROOTTEST_ENV_PYTHONPATH ${ROOT_LIBRARY_DIR})
 endif()
-set(ROOTTEST_ENV_LIBRARYPATH ${ROOT_LIBRARY_DIR})
 set(ROOTTEST_ENV_EXTRA)
 
-# Optionally, add Fortran link directories. This is needed in particular for
-# macOS, where the path of the Fortran library might not be in the default
-# DYLD_LIBRARY_PATH, but it gets picked up with enable_language(Fortran).
-if(APPLE AND fortran)
-  # Convert Fortran link dirs to colon-separated string
-  string(REPLACE ";" ":" FORTRAN_LINK_PATH "${CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES}")
-
-  # Append to ROOTTEST_ENV_LIBRARYPATH
-  set(ROOTTEST_ENV_LIBRARYPATH "${ROOTTEST_ENV_LIBRARYPATH}:${FORTRAN_LINK_PATH}")
-
-  # Deduplicate ROOTTEST_ENV_LIBRARYPATH
-  string(REPLACE ":" ";" _tmp "${ROOTTEST_ENV_LIBRARYPATH}")
-  list(REMOVE_DUPLICATES _tmp)
-  string(REPLACE ";" ":" ROOTTEST_ENV_LIBRARYPATH "${_tmp}")
-endif()
-
 if(MSVC)
   set(ROOTTEST_ENVIRONMENT
       PYTHONPATH=${ROOTTEST_ENV_PYTHONPATH})
@@ -257,8 +240,7 @@ else()
   string(REGEX REPLACE ":$" "" TESTPYTHONPATH "${ROOTTEST_ENV_PYTHONPATH}:$ENV{PYTHONPATH}")
   set(ROOTTEST_ENVIRONMENT
       PATH=${ROOTTEST_ENV_PATH}:$ENV{PATH}
-      PYTHONPATH=${TESTPYTHONPATH}
-      ${ld_library_path}=${ROOTTEST_ENV_LIBRARYPATH}:$ENV{${ld_library_path}})
+      PYTHONPATH=${TESTPYTHONPATH})
   if (gnuinstall)
     set(ROOTTEST_ENVIRONMENT ${ROOTTEST_ENVIRONMENT} ROOTIGNOREPREFIX=1)
   endif()

roottest/root/ntuple/makeproject/rntuple/CMakeLists.txt

@@ -53,17 +53,8 @@ target_link_directories(read_rntuple PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/librntu
 
 # Need to also explicitly set the LD_LIBRARY_PATH (at least on MacOS), so that
 # the generated library with the custom class can be loaded by the read test.
-# Setting the value of ${ld_library_path} in the ENVIRONMENT argument of the
-# ROOTTEST_ADD_TEST function will not work, because that function sets the same
-# variable internally, thus overriding our choice. The simplest thing to do is
-# to append our directory to the ${ROOTTEST_ENV_LIBRARYPATH} contents, which
-# are automatically used by ROOTTEST_ADD_TEST
-set(_roottest_env_librarypath ${ROOTTEST_ENV_LIBRARYPATH})
-set(ROOTTEST_ENV_LIBRARYPATH "${ROOTTEST_ENV_LIBRARYPATH}:${CMAKE_CURRENT_BINARY_DIR}/librntuplestltest")
 ROOTTEST_ADD_TEST(read_rntuple
                   EXEC ./read_rntuple
                   FIXTURES_REQUIRED read_rntuple_executable
                   # PATH is used on Windows to find libraries for loading
-                  ENVIRONMENT PATH=${CMAKE_CURRENT_BINARY_DIR}/librntuplestltest)
-set(ROOTTEST_ENV_LIBRARYPATH ${_roottest_env_librarypath})
-
+                  ENVIRONMENT ${ld_library_path}=${CMAKE_CURRENT_BINARY_DIR}/librntuplestltest)

roottest/root/ntuple/makeproject/ttree/CMakeLists.txt

@@ -54,16 +54,8 @@ target_link_directories(read_ttree PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/libttrees
 
 # Need to also explicitly set the LD_LIBRARY_PATH (at least on MacOS), so that
 # the generated library with the custom class can be loaded by the read test.
-# Setting the value of ${ld_library_path} in the ENVIRONMENT argument of the
-# ROOTTEST_ADD_TEST function will not work, because that function sets the same
-# variable internally, thus overriding our choice. The simplest thing to do is
-# to append our directory to the ${ROOTTEST_ENV_LIBRARYPATH} contents, which
-# are automatically used by ROOTTEST_ADD_TEST
-set(_roottest_env_librarypath ${ROOTTEST_ENV_LIBRARYPATH})
-set(ROOTTEST_ENV_LIBRARYPATH "${ROOTTEST_ENV_LIBRARYPATH}:${CMAKE_CURRENT_BINARY_DIR}/libttreestltest")
 ROOTTEST_ADD_TEST(read_ttree
                   EXEC ./read_ttree
-		              FIXTURES_REQUIRED makeproject_read_ttree_executable
+                  FIXTURES_REQUIRED makeproject_read_ttree_executable
                   # PATH is used on Windows to find libraries for loading
-                  ENVIRONMENT PATH=${CMAKE_CURRENT_BINARY_DIR}/libttreestltest)
-set(ROOTTEST_ENV_LIBRARYPATH ${_roottest_env_librarypath})
+                  ENVIRONMENT ${ld_library_path}=${CMAKE_CURRENT_BINARY_DIR}/libttreestltest)