diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-29 22:04:53 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-29 22:04:53 +0000 |
| commit | 7d9865150a2770161ea16f734f991d40696f8049 (patch) | |
| tree | 696c6175fc05eee588cee788ba2c98be7b4997a8 /src | |
| parent | 47fb48706c65ff72dfb1dcdda2bfa0301086e918 (diff) | |
Edits to CPack-related part of CMake to not include Autotools-built files from a dirty source tree.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1884 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/bin/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/tools/CMakeLists.txt | 10 |
3 files changed, 8 insertions, 18 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2d6518f5b..d8ed60083 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,10 +41,6 @@ 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 @@ -62,10 +58,8 @@ 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) +# Add the Anope executable to the list of files for CPack to ignore +add_to_cpack_ignored_files("${SERVICES_BINARY}$" TRUE) # Generate sysconf.h from the earlier configuration configure_file(${Anope_SOURCE_DIR}/include/sysconf.h.cmake ${Anope_BINARY_DIR}/include/sysconf.h) diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt index e6aea4ec4..9bdbb23dd 100644 --- a/src/bin/CMakeLists.txt +++ b/src/bin/CMakeLists.txt @@ -4,10 +4,8 @@ if(NOT WIN32) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/anoperc DESTINATION . ) - if(IN_SOURCE) - # Add anoperc to list of files for CPack to ignore - add_to_cpack_ignored_files("anoperc$") - endif(IN_SOURCE) + # Add anoperc to list of files for CPack to ignore + add_to_cpack_ignored_files("anoperc$") install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/mydbgen DESTINATION data ) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 05c535863..c281df5b5 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -23,12 +23,10 @@ foreach(SRC ${TOOLS_SRCS}) install(TARGETS ${EXE} DESTINATION tools ) - if(IN_SOURCE) - # Add the executable to the list of files for CPack to ignore - get_target_property(EXE_BINARY ${EXE} LOCATION) - get_filename_component(EXE_BINARY ${EXE_BINARY} NAME) - add_to_cpack_ignored_files("${EXE_BINARY}$" TRUE) - endif(IN_SOURCE) + # Add the executable to the list of files for CPack to ignore + get_target_property(EXE_BINARY ${EXE} LOCATION) + get_filename_component(EXE_BINARY ${EXE_BINARY} NAME) + add_to_cpack_ignored_files("${EXE_BINARY}$" TRUE) endforeach(SRC) # Only for Windows, set anopesmtp to require the wsock32 library |