Build tests directly from library sources to avoid export/import conflict on windows when using object files

Fix inclusion of conda-prefixed directories in package search

Author: langmm

CMakeLists.txt

@@ -779,18 +779,27 @@ if(BUILD_TESTS AND BUILD_CXX)
             list(APPEND TEST_LIST ${TEST_PATH})
         endif()
     endforeach()
-    # Build executable directly from compiled object files so that
+    # Build executable directly from source files so that
     # non-exported symbols can still be tested by unit tests
-    add_executable(testRunner ${TEST_LIST} $<TARGET_OBJECTS:${CXX_LIBRARY_NAME}>)
-    target_compile_options(
-      testRunner PUBLIC ${ePhoto_COMPILE_OPTIONS}
-    )
-    # target_link_options(
-    #   testRunner PUBLIC $<TARGET_PROPERTY:${CXX_LIBRARY_NAME},LINK_OPTIONS>
-    # )
-    target_include_directories(
-      testRunner PUBLIC ${ePhoto_INCLUDE_DIRECTORIES}
-    )
+    add_executable(testRunner ${TEST_LIST} ${ePhoto_SOURCES})
+    if(ePhoto_DEPENDENCIES)
+      add_dependencies(testRunner ${ePhoto_DEPENDENCIES})
+    endif()
+    if(ePhoto_COMPILE_OPTIONS)
+      target_compile_options(
+        testRunner PUBLIC ${ePhoto_COMPILE_OPTIONS}
+      )
+    endif()
+    if(ePhoto_COMPILE_DEFINITIONS)
+      target_compile_definitions(
+        testRunner PUBLIC ${ePhoto_COMPILE_DEFINITIONS}
+      )
+    endif()
+    if(ePhoto_INCLUDE_DIRECTORIES)
+      target_include_directories(
+        testRunner PUBLIC ${ePhoto_INCLUDE_DIRECTORIES}
+      )
+    endif()
     target_link_libraries(
       testRunner ${ePhoto_PUBLIC_LIBRARIES} ${ePhoto_PRIVATE_LIBRARIES}
       ${ePhoto_PRIVATE_LIBRARIES_C}

cmake/SearchTools.cmake

@@ -213,24 +213,29 @@ function(find_package_pkgconfig name)
 
         if (CONDA_PREFIX)
 	    if (WIN32)
-                set(PC_${name}_INCLUDE_DIRS "${CONDA_PREFIX}/Library/include ${PC_${name}_INCLUDE_DIRS}")
-                set(PC_${name}_LIBRARY_DIRS "${CONDA_PREFIX}/Library/lib ${CONDA_PREFIX}/Library/bin ${PC_${name}_LIBRARY_DIRS}")
+                set(CONDA_INCLUDE_DIRS "${CONDA_PREFIX}/Library/include")
+                set(CONDA_LIBRARY_DIRS "${CONDA_PREFIX}/Library/lib"
+                    "${CONDA_PREFIX}/Library/bin")
             else()
-                set(PC_${name}_INCLUDE_DIRS "${CONDA_PREFIX}/include ${PC_${name}_INCLUDE_DIRS}")
-                set(PC_${name}_LIBRARY_DIRS "${CONDA_PREFIX}/lib ${PC_${name}_LIBRARY_DIRS}")
+                set(CONDA_INCLUDE_DIRS "${CONDA_PREFIX}/include")
+                set(CONDA_LIBRARY_DIRS "${CONDA_PREFIX}/lib")
             endif()
+            list(PREPEND PC_${name}_INCLUDE_DIRS ${CONDA_INCLUDE_DIRS})
+            list(PREPEND PC_${name}_LIBRARY_DIRS ${CONDA_LIBRARY_DIRS})
         endif()
 
         ## use the hint from above to find where '*.h' is located
         find_path(${name}_INCLUDE_DIR
             NAMES ${ARGS_HEADER}
-            PATHS ${PC_${name}_INCLUDE_DIRS})
+            PATHS ${PC_${name}_INCLUDE_DIRS}
+        )
 
         ## use the hint from above to find the location of lib*
         find_library(tmp_library
             NAMES ${ARGS_LIBNAMES}
             PATHS ${PC_${name}_LIBRARY_DIRS}
-	    NO_CACHE)
+	    NO_CACHE
+        )
 
         if(NOT tmp_library STREQUAL tmp_library-NOTFOUND)
             set(${name}_LIBRARY ${tmp_library})
@@ -239,7 +244,8 @@ function(find_package_pkgconfig name)
 	    foreach(dir IN LISTS PC_${name}_LIBRARY_DIRS)
 	      execute_process(
 	        COMMAND ls ${dir}
-	        COMMAND_ECHO STDOUT)
+	        COMMAND_ECHO STDOUT
+              )
 	    endforeach()
 	endif()
 	if ((NOT ${name}_INCLUDE_DIR STREQUAL ${name}_INCLUDE_DIR-NOTFOUND) AND