diff options
author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-23 07:38:22 +0000 |
---|---|---|
committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-23 07:38:22 +0000 |
commit | e802b6dfe8ef0105389b69e17e7faa2e4c92d756 (patch) | |
tree | 7556cf902a0f943cb4bbc3b47b89fb13797ad4e1 /src/CMakeLists.txt | |
parent | 40ec6f0854c2210e670199f701636d9d78ffa6c0 (diff) |
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
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eca0c782b..2a8c01d0e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,6 +37,10 @@ if(WIN32) else(MINGW) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/win32.rc COMPILE_FLAGS "/i\"${Anope_SOURCE_DIR}/include\"") endif(MINGW) + if(IN_SOURCE) + # Add the resource file to the list of files for CPack to ignore + add_to_cpack_ignored_files("win32.rc$" TRUE) + endif(IN_SOURCE) endif(WIN32) # Generate the Anope executable and set it's linker flags, also set it to export it's symbols even though it's not a module @@ -54,6 +58,10 @@ add_dependencies(${PROGRAM_NAME} language headers) get_target_property(SERVICES_BINARY ${PROGRAM_NAME} LOCATION) get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME) set(SERVICES_BIN "${SERVICES_BINARY}") +if(IN_SOURCE) + # Add the Anope executable to the list of files for CPack to ignore + add_to_cpack_ignored_files("${SERVICES_BINARY}$" TRUE) +endif(IN_SOURCE) # Generate sysconf.h from the earlier configuration configure_file(${Anope_SOURCE_DIR}/include/sysconf.h.cmake ${Anope_BINARY_DIR}/include/sysconf.h) @@ -67,5 +75,5 @@ add_subdirectory(tools) # Set Anope to be installed to the bin directory install(TARGETS ${PROGRAM_NAME} - DESTINATION "${INSTDIR}" + DESTINATION . ) |