From e802b6dfe8ef0105389b69e17e7faa2e4c92d756 Mon Sep 17 00:00:00 2001 From: cyberbotx Date: Tue, 23 Dec 2008 07:38:22 +0000 Subject: Some more Windows fixes, both in CMake and in the code itself. (I don't like the const casting for the latter, but it's only until we get rid of use of strchr) Added CPack setup to automate generation of source package for *nix and NSIS installer for Windows. Some other minor CMake fixes. Converted docs/README and docs/WIN32.txt from Unix linefeeds to DOS linefeeds so they show up right in Notepad under Windows. Added small fix for Visual Studio 2008, CMake doesn't detect the Express version correctly and it must be explicitly defined. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1861 5417fbe8-f217-4b02-8779-1006273d7864 --- include/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include') diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 121bc852a..6401d2fdc 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -10,6 +10,12 @@ if(MSVC OR NOT SH) COMMAND version_sh ${Anope_SOURCE_DIR}/version.log ${CMAKE_CURRENT_SOURCE_DIR}/version.sh ${CMAKE_CURRENT_BINARY_DIR}/version.h MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/version.sh DEPENDS version_sh ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${CMAKE_CURRENT_SOURCE_DIR}/pseudo.h ${CMAKE_CURRENT_SOURCE_DIR}/messages.h ${SRC_SRCS} ) + if(IN_SOURCE) + # Add version_sh to list of files for CPack to ignore + get_target_property(version_sh_BINARY version_sh LOCATION) + get_filename_component(version_sh_BINARY ${version_sh_BINARY} NAME) + add_to_cpack_ignored_files("${version_sh_BINARY}$" TRUE) + endif(IN_SOURCE) # For any non-Visual Studio platforms that do have sh, we will run version.h through the version.h shell script else(MSVC OR NOT SH) # Generate version.h from version.sh and the version.log file from the main source directory, with dependencies to the given headers and all source files in the main Anope build @@ -19,5 +25,10 @@ else(MSVC OR NOT SH) ) endif(MSVC OR NOT SH) +if(IN_SOURCE) + # Add version.h to the list of files for CPack to ignore + add_to_cpack_ignored_files("version.h$" TRUE) +endif(IN_SOURCE) + # Add a custom target to the above file add_custom_target(headers DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version.h) -- cgit