Commit 810798e8 authored by jan.koester's avatar jan.koester
Browse files

windows bugfiex

parent 53d6f2eb

backends/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ if(${POSTGRESQL_FOUND}) 
    )

   

   if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")

	message(INFO "$<TARGET_FILE_DIR:PostgreSQL::pq>")

	install(

            RUNTIME_DEPENDENCY_SET pgsqldep

            PRE_EXCLUDE_REGEXES "((api|ext)-ms-.*|.*azureattest.*|vcruntime.*|ucrtbase.*|msvcrt.*|wpaxholder.*)\\.dll"   

            POST_EXCLUDE_REGEXES [[.*(\\|/)system32(\\|/).*\.dll]]

            DIRECTORIES

                "$<TARGET_FILE_DIR:PostgreSQL::pq>"

                "${POSTGRESQL_BIN_DIR}"

            DESTINATION bin

        )

   endif()

cmake/FindPostgreSQL.cmake

+10 −1
Original line number Diff line number Diff line
@@ -49,7 +49,16 @@ if (NOT TARGET PostgreSQL::pq AND POSTGRESQL_FOUND) 
    if (WIN32)

        # --- Windows Implementierung (.dll/.lib) ---

        get_filename_component(_POSTGRESQL_LIB_DIR "${POSTGRESQL_LIBRARIES}" DIRECTORY)

        set(_POSTGRESQL_DLL_PATH "${_POSTGRESQL_LIB_DIR}/libpq.dll")



	find_path(_POSTGRESQL_BIN_DIR

        	NAMES libpq.dll

        	HINTS 

			"${POSTGRESQL_LIBRARIES}/.."

			"${_POSTGRESQL_LIB_DIR}/bin"

        	PATH_SUFFIXES ""

    	)



        set(_POSTGRESQL_DLL_PATH "${_POSTGRESQL_BIN_DIR}/libpq.dll")



        set_target_properties(PostgreSQL::pq PROPERTIES

            IMPORTED_IMPLIB_RELEASE "${POSTGRESQL_LIBRARIES}"