Merge tag 'v2.0.25' into master.

[user/henk/code/inspircd.git] / win / CMakeLists.txt

diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
index 3cfe9f6b8b504cf753a576879f5537c9b232a80b..e53f6c6d3c45ebf0ab999113352fe77027e87e25 100644 (file)
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -12,9 +12,6 @@ set(EXTRA_LIBS "" CACHE PATH "Extra library paths")
 
 set(INSPIRCD_BASE "${CMAKE_CURRENT_SOURCE_DIR}/../")
 
-set(SYSTEM_NAME_VERSION ${CMAKE_SYSTEM})
-set(SOCKETENGINE "select")
-
 # Build with multiple processes
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 
@@ -78,6 +75,10 @@ install(FILES ${EXTRA_DLLS} DESTINATION .)
 file(GLOB_RECURSE EXAMPLE_CONFIGS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INSPIRCD_BASE}/docs/conf/*.example")
 install(FILES ${EXAMPLE_CONFIGS} DESTINATION conf)
 
+# Install nationalchars files
+file(GLOB_RECURSE EXAMPLE_LOCALES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INSPIRCD_BASE}/locales/*")
+install(FILES ${EXAMPLE_LOCALES} DESTINATION locales)
+
 # Create an empty data and logs directory and install them
 file(MAKE_DIRECTORY ${DATA_DIR})
 install(DIRECTORY ${DATA_DIR} DESTINATION .)
@@ -85,6 +86,7 @@ file(MAKE_DIRECTORY ${LOG_DIR})
 install(DIRECTORY ${LOG_DIR} DESTINATION .)
 
 if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+       set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ".") # place runtime libraries next to InspIRCd binary
        include(InstallRequiredSystemLibraries)
 
        set(CPACK_PACKAGE_NAME "InspIRCd IRC Daemon")