]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
Fix building modules which depend on vendor libs on Windows.
authorPeter Powell <petpow@saberuk.com>
Thu, 3 Jan 2019 13:19:07 +0000 (13:19 +0000)
committerPeter Powell <petpow@saberuk.com>
Thu, 3 Jan 2019 13:19:07 +0000 (13:19 +0000)
win/modules/CMakeLists.txt

index 2c2617e2b44e194b1913a93169303cc473ce6737..094078aabd88c936acf87163d5373553205655e8 100644 (file)
@@ -7,6 +7,13 @@ list(SORT INSPIRCD_MODULES)
 \r
 add_definitions("-DDLL_BUILD")\r
 \r
+file(GLOB INSPIRCD_VENDORS "${INSPIRCD_BASE}/vendor/**")\r
+foreach(INSPIRCD_VENDOR ${INSPIRCD_VENDORS})\r
+       if(NOT IS_DIRECTORY ${INSPIRCD_VENDOR})\r
+               list(REMOVE_ITEM INSPIRCD_VENDORS ${INSPIRCD_VENDOR})\r
+       endif()\r
+endforeach()\r
+\r
 foreach(MODULE_NAME ${INSPIRCD_MODULES})\r
        if(IS_DIRECTORY "${MODULE_NAME}")\r
                string(REGEX REPLACE "^.*[/\\](.*)$" "\\1" BASE_NAME ${MODULE_NAME})\r
@@ -26,6 +33,7 @@ foreach(MODULE_NAME ${INSPIRCD_MODULES})
        # Generate the module and set its linker flags, also set it to depend on the main executable to be built beforehand\r
        target_link_libraries(${SO_NAME} inspircd)\r
        add_dependencies(${SO_NAME} inspircd)\r
+       target_include_directories(${SO_NAME} PRIVATE ${INSPIRCD_VENDORS})\r
        if(MSVC)\r
                target_link_libraries(${SO_NAME} win32_memory)\r
                add_dependencies(${SO_NAME} win32_memory)\r