diff options
| author | Sadie Powell <sadie@witchery.services> | 2023-06-03 21:42:06 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2023-06-03 21:51:07 +0100 |
| commit | 9d0a6ddc67b1e7bd0c32603b6fa90b702c13447d (patch) | |
| tree | 1e4d019535c89f67e7cf54a76afabe188947c668 /CMakeLists.txt | |
| parent | 29db25dac7aff36b4f7239a9fabd57230534cf35 (diff) | |
| parent | fbf3b344740f6bd4f9337e485e35e9e8103428bc (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e0aab3e92..868880669 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,6 +126,12 @@ if(EXTRA_LIBS) link_directories(${EXTRA_LIBS}) endif() +# setup conan +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake") + include("${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake") + conan_basic_setup() +endif() + # Find gettext find_package(Gettext) find_package(Intl) @@ -371,10 +377,6 @@ if(WIN32) install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat DESTINATION ${BIN_DIR} ) - - # Package any DLLs in src/win/ - file(GLOB EXTRA_DLLS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${Anope_SOURCE_DIR}/src/win32/*.dll") - install(FILES ${EXTRA_DLLS} DESTINATION ${BIN_DIR}) endif() install(CODE "file(REMOVE_RECURSE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/modules\")") |