Merge pull request #1018 from SaberUK/insp20+hidekills

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

diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
index f26b9a6c7cbfd9f90fc8f411a0599e139e2e0fb9..10653cf74a13692c75f618c444341c463096275a 100644 (file)
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -5,7 +5,7 @@ project(InspIRCd CXX)
 set(CONF_PATH "conf" CACHE PATH "Configuration file path")
 set(MODULE_PATH "modules" CACHE PATH "Module path")
 set(DATA_PATH "data" CACHE PATH "Data path")
-set(LOG_PATH "log" CACHE PATH "Log file path")
+set(LOG_PATH "logs" CACHE PATH "Log file path")
 
 set(EXTRA_INCLUDES "" CACHE PATH "Extra include paths")
 set(EXTRA_LIBS "" CACHE PATH "Extra library paths")
@@ -74,11 +74,15 @@ 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)
-install(DIRECTORY "data" DESTINATION .)
-file(MAKE_DIRECTORY logs)
-install(DIRECTORY "logs" DESTINATION .)
+file(MAKE_DIRECTORY ${DATA_PATH})
+install(DIRECTORY ${DATA_PATH} DESTINATION .)
+file(MAKE_DIRECTORY ${LOG_PATH})
+install(DIRECTORY ${LOG_PATH} DESTINATION .)
 
 if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
        include(InstallRequiredSystemLibraries)
@@ -99,7 +103,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
        set(CPACK_NSIS_MUI_UNIICON "${INSPIRCD_BASE}/win\\\\inspircd.ico")
        set(CPACK_NSIS_INSTALLED_ICON_NAME "inspircd.exe")
        set(CPACK_NSIS_URL_INFO_ABOUT "http://www.inspircd.org/")
-       set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
+       set(CPACK_NSIS_COMPRESSOR "/SOLID zlib")
 
        include(CPack)
 endif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")