Nie możesz wybrać więcej, niż 25 tematów Tematy muszą się zaczynać od litery lub cyfry, mogą zawierać myślniki ('-') i mogą mieć do 35 znaków.

219 wiersze
8.6 KiB

  1. diff -rupN cmake-2.8.7/CMakeLists.txt cmake-2.8.7.cotire/CMakeLists.txt
  2. --- cmake-2.8.7/CMakeLists.txt 2011-12-30 17:49:56.000000000 +0100
  3. +++ cmake-2.8.7.cotire/CMakeLists.txt 2012-03-24 14:41:40.000000000 +0100
  4. @@ -13,6 +13,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FAT
  5. SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
  6. PROJECT(CMake)
  7. +include(Modules/cotire.cmake)
  8. +
  9. IF(CMAKE_BOOTSTRAP)
  10. # Running from bootstrap script. Set local variable and remove from cache.
  11. SET(CMAKE_BOOTSTRAP 1)
  12. diff -rupN cmake-2.8.7/Source/CMakeLists.txt cmake-2.8.7.cotire/Source/CMakeLists.txt
  13. --- cmake-2.8.7/Source/CMakeLists.txt 2011-12-30 17:49:56.000000000 +0100
  14. +++ cmake-2.8.7.cotire/Source/CMakeLists.txt 2012-02-24 22:35:58.000000000 +0100
  15. @@ -364,6 +364,9 @@ TARGET_LINK_LIBRARIES(CMakeLib cmsys
  16. IF(APPLE)
  17. TARGET_LINK_LIBRARIES(CMakeLib "-framework CoreFoundation")
  18. ENDIF(APPLE)
  19. +if (COMMAND cotire)
  20. +cotire(CMakeLib)
  21. +endif()
  22. # On some platforms we need the rpcrt4 library for the VS 7 generators.
  23. IF(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
  24. @@ -433,6 +436,9 @@ SET(CTEST_SRCS cmCTest.cxx
  25. # Build CTestLib
  26. ADD_LIBRARY(CTestLib ${CTEST_SRCS})
  27. TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_LIBRARIES})
  28. +if (COMMAND cotire)
  29. +cotire(CTestLib)
  30. +endif()
  31. #
  32. # Sources for CPack
  33. @@ -477,6 +483,9 @@ ENDIF(APPLE)
  34. # Build CPackLib
  35. ADD_LIBRARY(CPackLib ${CPACK_SRCS})
  36. TARGET_LINK_LIBRARIES(CPackLib CMakeLib)
  37. +if (COMMAND cotire)
  38. +cotire(CPackLib)
  39. +endif()
  40. IF(APPLE)
  41. ADD_EXECUTABLE(cmakexbuild cmakexbuild.cxx)
  42. @@ -485,11 +494,17 @@ IF(APPLE)
  43. CPack/OSXScriptLauncher.cxx)
  44. TARGET_LINK_LIBRARIES(OSXScriptLauncher cmsys)
  45. TARGET_LINK_LIBRARIES(OSXScriptLauncher "-framework CoreFoundation")
  46. +if (COMMAND cotire)
  47. +cotire(cmakexbuild)
  48. +endif()
  49. ENDIF(APPLE)
  50. # Build CMake executable
  51. ADD_EXECUTABLE(cmake cmakemain.cxx)
  52. TARGET_LINK_LIBRARIES(cmake CMakeLib)
  53. +if (COMMAND cotire)
  54. +cotire(cmake)
  55. +endif()
  56. # Build special executable for running programs on Windows 98
  57. IF(WIN32)
  58. @@ -503,10 +518,16 @@ ENDIF(WIN32)
  59. # Build CTest executable
  60. ADD_EXECUTABLE(ctest ctest.cxx)
  61. TARGET_LINK_LIBRARIES(ctest CTestLib)
  62. +if (COMMAND cotire)
  63. +cotire(ctest)
  64. +endif()
  65. # Build CPack executable
  66. ADD_EXECUTABLE(cpack CPack/cpack.cxx)
  67. TARGET_LINK_LIBRARIES(cpack CPackLib)
  68. +if (COMMAND cotire)
  69. +cotire(cpack)
  70. +endif()
  71. # Curses GUI
  72. IF(BUILD_CursesDialog)
  73. diff -rupN cmake-2.8.7/Source/CursesDialog/CMakeLists.txt cmake-2.8.7.cotire/Source/CursesDialog/CMakeLists.txt
  74. --- cmake-2.8.7/Source/CursesDialog/CMakeLists.txt 2011-12-30 17:49:57.000000000 +0100
  75. +++ cmake-2.8.7.cotire/Source/CursesDialog/CMakeLists.txt 2012-02-22 20:41:03.000000000 +0100
  76. @@ -33,5 +33,7 @@ INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PAT
  77. ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
  78. TARGET_LINK_LIBRARIES(ccmake CMakeLib)
  79. TARGET_LINK_LIBRARIES(ccmake cmForm)
  80. -
  81. +if (COMMAND cotire)
  82. +cotire(ccmake)
  83. +endif()
  84. INSTALL_TARGETS(/bin ccmake)
  85. diff -rupN cmake-2.8.7/Source/CursesDialog/form/CMakeLists.txt cmake-2.8.7.cotire/Source/CursesDialog/form/CMakeLists.txt
  86. --- cmake-2.8.7/Source/CursesDialog/form/CMakeLists.txt 2011-12-30 17:49:57.000000000 +0100
  87. +++ cmake-2.8.7.cotire/Source/CursesDialog/form/CMakeLists.txt 2012-02-24 21:30:47.000000000 +0100
  88. @@ -64,3 +64,6 @@ TARGET_LINK_LIBRARIES(cmForm ${CURSES_LI
  89. IF(CURSES_EXTRA_LIBRARY)
  90. TARGET_LINK_LIBRARIES(cmForm ${CURSES_EXTRA_LIBRARY})
  91. ENDIF(CURSES_EXTRA_LIBRARY)
  92. +if (COMMAND cotire)
  93. +cotire(cmForm)
  94. +endif()
  95. diff -rupN cmake-2.8.7/Source/kwsys/CMakeLists.txt cmake-2.8.7.cotire/Source/kwsys/CMakeLists.txt
  96. --- cmake-2.8.7/Source/kwsys/CMakeLists.txt 2011-12-30 17:49:57.000000000 +0100
  97. +++ cmake-2.8.7.cotire/Source/kwsys/CMakeLists.txt 2012-03-24 15:03:17.000000000 +0100
  98. @@ -926,6 +926,9 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
  99. ADD_LIBRARY(${KWSYS_NAMESPACE}TestDynload MODULE testDynload.c)
  100. SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestDynload PROPERTY LABELS ${KWSYS_LABELS_LIB})
  101. ADD_DEPENDENCIES(${KWSYS_NAMESPACE}TestDynload ${KWSYS_NAMESPACE})
  102. +if (COMMAND cotire)
  103. +cotire(${KWSYS_NAMESPACE}TestDynload)
  104. +endif()
  105. ENDIF(KWSYS_USE_DynamicLoader)
  106. CREATE_TEST_SOURCELIST(
  107. KWSYS_CXX_TEST_SRCS ${KWSYS_NAMESPACE}TestsCxx.cxx
  108. @@ -934,6 +937,9 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
  109. ADD_EXECUTABLE(${KWSYS_NAMESPACE}TestsCxx ${KWSYS_CXX_TEST_SRCS})
  110. SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestsCxx PROPERTY LABELS ${KWSYS_LABELS_EXE})
  111. TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE}TestsCxx ${KWSYS_NAMESPACE})
  112. +if (COMMAND cotire)
  113. +cotire(${KWSYS_NAMESPACE}TestsCxx)
  114. +endif()
  115. SET(TEST_SYSTEMTOOLS_BIN_FILE
  116. "${CMAKE_CURRENT_SOURCE_DIR}/testSystemTools.bin")
  117. SET(TEST_SYSTEMTOOLS_SRC_FILE
  118. diff -rupN cmake-2.8.7/Utilities/cmbzip2/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmbzip2/CMakeLists.txt
  119. --- cmake-2.8.7/Utilities/cmbzip2/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
  120. +++ cmake-2.8.7.cotire/Utilities/cmbzip2/CMakeLists.txt 2012-02-22 20:45:26.000000000 +0100
  121. @@ -2,3 +2,6 @@ project(bzip2)
  122. add_definitions(-D_FILE_OFFSET_BITS=64)
  123. add_library(cmbzip2
  124. blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c)
  125. +if (COMMAND cotire)
  126. +cotire(cmbzip2)
  127. +endif()
  128. \ No newline at end of file
  129. diff -rupN cmake-2.8.7/Utilities/cmcompress/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmcompress/CMakeLists.txt
  130. --- cmake-2.8.7/Utilities/cmcompress/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
  131. +++ cmake-2.8.7.cotire/Utilities/cmcompress/CMakeLists.txt 2012-02-22 20:45:29.000000000 +0100
  132. @@ -3,3 +3,6 @@ PROJECT(CMCompress)
  133. ADD_LIBRARY(cmcompress cmcompress.c)
  134. INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST}/cmcompress)
  135. +if (COMMAND cotire)
  136. +cotire(cmcompress)
  137. +endif()
  138. \ No newline at end of file
  139. diff -rupN cmake-2.8.7/Utilities/cmcurl/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmcurl/CMakeLists.txt
  140. --- cmake-2.8.7/Utilities/cmcurl/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
  141. +++ cmake-2.8.7.cotire/Utilities/cmcurl/CMakeLists.txt 2012-02-22 20:43:57.000000000 +0100
  142. @@ -706,6 +706,9 @@ IF(CMAKE_BUILD_CURL_SHARED)
  143. RUNTIME_OUTPUT_DIRECTORY ${CMake_BIN_DIR})
  144. INSTALL_TARGETS(/bin cmcurl)
  145. ENDIF(CMAKE_BUILD_CURL_SHARED)
  146. +if (COMMAND cotire)
  147. +cotire(cmcurl)
  148. +endif()
  149. OPTION(CURL_TESTING "Do libCurl testing" OFF)
  150. IF(CURL_TESTING)
  151. diff -rupN cmake-2.8.7/Utilities/cmexpat/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmexpat/CMakeLists.txt
  152. --- cmake-2.8.7/Utilities/cmexpat/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
  153. +++ cmake-2.8.7.cotire/Utilities/cmexpat/CMakeLists.txt 2012-02-22 20:45:40.000000000 +0100
  154. @@ -32,3 +32,6 @@ CONFIGURE_FILE(${CMEXPAT_SOURCE_DIR}/exp
  155. ADD_LIBRARY(cmexpat ${expat_SRCS})
  156. INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmexpat)
  157. +if (COMMAND cotire)
  158. +cotire(cmexpat)
  159. +endif()
  160. \ No newline at end of file
  161. diff -rupN cmake-2.8.7/Utilities/cmlibarchive/libarchive/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmlibarchive/libarchive/CMakeLists.txt
  162. --- cmake-2.8.7/Utilities/cmlibarchive/libarchive/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
  163. +++ cmake-2.8.7.cotire/Utilities/cmlibarchive/libarchive/CMakeLists.txt 2012-02-22 20:45:55.000000000 +0100
  164. @@ -116,6 +116,9 @@ IF(BUILD_ARCHIVE_WITHIN_CMAKE)
  165. # and call the library cmlibarchive
  166. ADD_LIBRARY(cmlibarchive STATIC ${libarchive_SOURCES} ${include_HEADERS})
  167. TARGET_LINK_LIBRARIES(cmlibarchive ${ADDITIONAL_LIBS})
  168. +if (COMMAND cotire)
  169. +cotire(cmlibarchive)
  170. +endif()
  171. ELSE()
  172. # Libarchive is a shared library
  173. ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
  174. @@ -123,7 +126,10 @@ ELSE()
  175. SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
  176. SET_TARGET_PROPERTIES(archive PROPERTIES
  177. RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
  178. -
  179. +if (COMMAND cotire)
  180. +cotire(archive)
  181. +endif()
  182. +
  183. # archive_static is a static library
  184. ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
  185. SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
  186. @@ -134,6 +140,9 @@ ELSE()
  187. IF(NOT WIN32 OR CYGWIN)
  188. SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
  189. ENDIF(NOT WIN32 OR CYGWIN)
  190. +if (COMMAND cotire)
  191. +cotire(archive_static)
  192. +endif()
  193. # How to install the libraries
  194. INSTALL(TARGETS archive archive_static
  195. diff -rupN cmake-2.8.7/Utilities/cmzlib/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmzlib/CMakeLists.txt
  196. --- cmake-2.8.7/Utilities/cmzlib/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
  197. +++ cmake-2.8.7.cotire/Utilities/cmzlib/CMakeLists.txt 2012-02-22 20:42:30.000000000 +0100
  198. @@ -39,5 +39,7 @@ ENDFOREACH(name)
  199. ADD_LIBRARY(cmzlib ${ZLIB_SRCS})
  200. -
  201. +if (COMMAND cmzlib)
  202. +cotire(cmzlib)
  203. +endif()
  204. INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST}/cmzlib)