API tools faq
paste
Sim

ja2smplibs_renamed_variables.patch

Sim
Sep 6th, 2011
291
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 14.08 KB | None | 0 0
raw download clone embed print report
  1. diff -r 1d6e3c9b64d0 .hgignore
  2. --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
  3. +++ b/.hgignore Tue Sep 06 22:21:30 2011 +0200
  4. @@ -0,0 +1,1 @@
  5. +CMakeLists.txt.user
  6. \ No newline at end of file
  7. diff -r 1d6e3c9b64d0 bfVFS/BFVFSConfig.cmake.in
  8. --- a/bfVFS/BFVFSConfig.cmake.in    Sun Mar 13 01:59:22 2011 +0100
  9. +++ b/bfVFS/BFVFSConfig.cmake.in    Tue Sep 06 22:21:30 2011 +0200
  10. @@ -17,10 +17,10 @@
  11.  set(BFVFS_DEFINITIONS "@BFVFS_DEFINITIONS@")
  12.  
  13.  ## include directories
  14. -set(BFVFS_INCLUDE_DIRS "@BFVFS_INCLUDE_DIRS@")
  15. +set(BFVFS_INCLUDE_DIR "@BFVFS_INCLUDE_DIR@")
  16.  
  17.  ## library directories to include via LINK_DIRECTORIES(...)
  18. -set(BFVFS_LIBRARY_DIRS "@BFVFS_LIBRARY_DIRS@")
  19. +set(BFVFS_LIBRARY_DIR "@BFVFS_LIBRARY_DIR@")
  20.  
  21.  ## libraries to include via  TARGET_LINK_LIBRARIES(...)
  22.  set(BFVFS_LIBRARIES "@BFVFS_LIBRARIES@")
  23. diff -r 1d6e3c9b64d0 bfVFS/CMakeLists.txt
  24. --- a/bfVFS/CMakeLists.txt  Sun Mar 13 01:59:22 2011 +0100
  25. +++ b/bfVFS/CMakeLists.txt  Tue Sep 06 22:21:30 2011 +0200
  26. @@ -39,8 +39,8 @@
  27.  ##
  28.  ## set bfVFS "output" variables
  29.  ##
  30. -set(BFVFS_INCLUDE_DIRS ${BFVFS_INCLUDE_DIR})
  31. -set(BFVFS_LIBRARY_DIRS ${BFVFS_LIBRARY_DIR})
  32. +set(BFVFS_INCLUDE_DIR ${BFVFS_INCLUDE_DIR})
  33. +set(BFVFS_LIBRARY_DIR ${BFVFS_LIBRARY_DIR})
  34.  set(BFVFS_RUNTIME_DIRS ${BFVFS_RUNTIME_DIR})
  35.  
  36.  ##
  37. @@ -61,7 +61,7 @@
  38.  ##
  39.  ## set include directories for projects
  40.  ##
  41. -include_directories(${BFVFS_INCLUDE_DIRS}
  42. +include_directories(${BFVFS_INCLUDE_DIR}
  43.    ${BFVFS_SOURCE_DIR}/ext/utfcpp/source
  44.  )
  45.  
  46. @@ -111,13 +111,13 @@
  47.      message("  " ${def})
  48.    endforeach()
  49.    
  50. -  message("BFVFS_INCLUDE_DIRS :")
  51. -  foreach(dir ${BFVFS_INCLUDE_DIRS})
  52. +  message("BFVFS_INCLUDE_DIR :")
  53. +  foreach(dir ${BFVFS_INCLUDE_DIR})
  54.      message("  " ${dir})
  55.    endforeach()
  56.  
  57. -  message("BFVFS_LIBRARY_DIRS :")
  58. -  foreach(dir ${BFVFS_LIBRARY_DIRS})
  59. +  message("BFVFS_LIBRARY_DIR :")
  60. +  foreach(dir ${BFVFS_LIBRARY_DIR})
  61.      message("  " ${dir})
  62.    endforeach()
  63.  
  64. diff -r 1d6e3c9b64d0 bfVFS/UseBFVFS.cmake.in
  65. --- a/bfVFS/UseBFVFS.cmake.in   Sun Mar 13 01:59:22 2011 +0100
  66. +++ b/bfVFS/UseBFVFS.cmake.in   Tue Sep 06 22:21:30 2011 +0200
  67. @@ -3,6 +3,6 @@
  68.  
  69.  ADD_DEFINITIONS(${BFVFS_DEFINITIONS})
  70.  
  71. -INCLUDE_DIRECTORIES(${BFVFS_INCLUDE_DIRS})
  72. +INCLUDE_DIRECTORIES(${BFVFS_INCLUDE_DIR})
  73.  
  74. -LINK_DIRECTORIES(${BFVFS_LIBRARY_DIRS})
  75. +LINK_DIRECTORIES(${BFVFS_LIBRARY_DIR})
  76. diff -r 1d6e3c9b64d0 bfVFS/ext/7z/CMakeLists.txt
  77. --- a/bfVFS/ext/7z/CMakeLists.txt   Sun Mar 13 01:59:22 2011 +0100
  78. +++ b/bfVFS/ext/7z/CMakeLists.txt   Tue Sep 06 22:21:30 2011 +0200
  79. @@ -100,11 +100,11 @@
  80.  
  81.  set_property(
  82.    TARGET ${BFVFS_7ZIP_TARGET}
  83. -  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${BFVFS_LIBRARY_DIRS}
  84. +  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${BFVFS_LIBRARY_DIR}
  85.  )
  86.  set_property(
  87.    TARGET ${BFVFS_7ZIP_TARGET}
  88. -  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${BFVFS_LIBRARY_DIRS}
  89. +  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${BFVFS_LIBRARY_DIR}
  90.  )
  91.  set_property(
  92.    TARGET ${BFVFS_7ZIP_TARGET}
  93. diff -r 1d6e3c9b64d0 bfVFS/src/CMakeLists.txt
  94. --- a/bfVFS/src/CMakeLists.txt  Sun Mar 13 01:59:22 2011 +0100
  95. +++ b/bfVFS/src/CMakeLists.txt  Tue Sep 06 22:21:30 2011 +0200
  96. @@ -53,11 +53,11 @@
  97.  
  98.  set_property(
  99.    TARGET ${BFVFS_TARGET}
  100. -  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${BFVFS_LIBRARY_DIRS}
  101. +  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${BFVFS_LIBRARY_DIR}
  102.  )
  103.  set_property(
  104.    TARGET ${BFVFS_TARGET}
  105. -  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${BFVFS_LIBRARY_DIRS}
  106. +  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${BFVFS_LIBRARY_DIR}
  107.  )
  108.  set_property(
  109.    TARGET ${BFVFS_TARGET}
  110. diff -r 1d6e3c9b64d0 expat/CMakeLists.txt
  111. --- a/expat/CMakeLists.txt  Sun Mar 13 01:59:22 2011 +0100
  112. +++ b/expat/CMakeLists.txt  Tue Sep 06 22:21:30 2011 +0200
  113. @@ -32,8 +32,8 @@
  114.  ##
  115.  ## set expat "output" variables
  116.  ##
  117. -set(EXPAT_INCLUDE_DIRS ${EXPAT_SOURCE_DIR}/src)
  118. -set(EXPAT_LIBRARY_DIRS ${EXPAT_LIBRARY_DIR})
  119. +set(EXPAT_INCLUDE_DIR ${EXPAT_SOURCE_DIR}/src)
  120. +set(EXPAT_LIBRARY_DIR ${EXPAT_LIBRARY_DIR})
  121.  set(EXPAT_RUNTIME_DIRS ${EXPAT_RUNTIME_DIR})
  122.  
  123.  ##################################
  124. @@ -54,7 +54,7 @@
  125.    )
  126.  endif()
  127.  
  128. -include_directories(${EXPAT_INCLUDE_DIRS})
  129. +include_directories(${EXPAT_INCLUDE_DIR})
  130.  
  131.  add_subdirectory(src)
  132.  
  133. diff -r 1d6e3c9b64d0 expat/ExpatConfig.cmake.in
  134. --- a/expat/ExpatConfig.cmake.in    Sun Mar 13 01:59:22 2011 +0100
  135. +++ b/expat/ExpatConfig.cmake.in    Tue Sep 06 22:21:30 2011 +0200
  136. @@ -6,10 +6,10 @@
  137.  set(EXPAT_DEFINITIONS "@EXPAT_DEFINITIONS@")
  138.  
  139.  ## include directories
  140. -set(EXPAT_INCLUDE_DIRS "@EXPAT_INCLUDE_DIRS@")
  141. +set(EXPAT_INCLUDE_DIR "@EXPAT_INCLUDE_DIR@")
  142.  
  143.  ## library directories to include via LINK_DIRECTORIES(...)
  144. -set(EXPAT_LIBRARY_DIRS "@EXPAT_LIBRARY_DIRS@")
  145. +set(EXPAT_LIBRARY_DIR "@EXPAT_LIBRARY_DIR@")
  146.  
  147.  ## libraries to include via  TARGET_LINK_LIBRARIES(...)
  148.  set(EXPAT_LIBRARIES "@EXPAT_LIBRARIES@")
  149. diff -r 1d6e3c9b64d0 expat/UseExpat.cmake.in
  150. --- a/expat/UseExpat.cmake.in   Sun Mar 13 01:59:22 2011 +0100
  151. +++ b/expat/UseExpat.cmake.in   Tue Sep 06 22:21:30 2011 +0200
  152. @@ -3,6 +3,6 @@
  153.  
  154.  ADD_DEFINITIONS(${EXPAT_DEFINITIONS})
  155.  
  156. -INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS})
  157. +INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
  158.  
  159. -LINK_DIRECTORIES(${EXPAT_LIBRARY_DIRS})
  160. +LINK_DIRECTORIES(${EXPAT_LIBRARY_DIR})
  161. diff -r 1d6e3c9b64d0 expat/src/CMakeLists.txt
  162. --- a/expat/src/CMakeLists.txt  Sun Mar 13 01:59:22 2011 +0100
  163. +++ b/expat/src/CMakeLists.txt  Tue Sep 06 22:21:30 2011 +0200
  164. @@ -25,11 +25,11 @@
  165.  
  166.  set_property(
  167.    TARGET ${EXPAT_TARGET}
  168. -  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${EXPAT_LIBRARY_DIRS}
  169. +  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${EXPAT_LIBRARY_DIR}
  170.  )
  171.  set_property(
  172.    TARGET ${EXPAT_TARGET}
  173. -  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${EXPAT_LIBRARY_DIRS}
  174. +  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${EXPAT_LIBRARY_DIR}
  175.  )
  176.  set_property(
  177.    TARGET ${EXPAT_TARGET}
  178. diff -r 1d6e3c9b64d0 libpng/CMakeLists.txt
  179. --- a/libpng/CMakeLists.txt Sun Mar 13 01:59:22 2011 +0100
  180. +++ b/libpng/CMakeLists.txt Tue Sep 06 22:21:30 2011 +0200
  181. @@ -37,7 +37,7 @@
  182.  ##
  183.  ## setup output directories
  184.  ##
  185. -set(LIBPNG_LIBRARY_DIRS ${LIBPNG_LIBRARY_DIR})
  186. +set(LIBPNG_LIBRARY_DIR ${LIBPNG_LIBRARY_DIR})
  187.  set(LIBPNG_RUNTIME_DIRS ${LIBPNG_RUNTIME_DIR})
  188.  
  189.  ##################################
  190. @@ -78,7 +78,7 @@
  191.  ## collect libpng variables
  192.  set(LIBPNG_LIBRARIES     ${LIBPNG_LIBRARIES}   ${LIBPNG_LPNG_TARGET})
  193.  set(LIBPNG_DEFINITIONS   ${LIBPNG_DEFINITIONS} ${LIBPNG_LPNG_DEFINITIONS})
  194. -set(LIBPNG_INCLUDE_DIRS  ${LIBPNG_OUTPUT_DIR} ${LIBPNG_ZLIB_INCLUDE_DIRS} ${LIBPNG_LPNG_INCLUDE_DIRS})
  195. +set(LIBPNG_INCLUDE_DIR  ${LIBPNG_OUTPUT_DIR} ${LIBPNG_ZLIB_INCLUDE_DIRS} ${LIBPNG_LPNG_INCLUDE_DIRS})
  196.  
  197.  ##
  198.  ## make Lua easier to use for other applications
  199. diff -r 1d6e3c9b64d0 libpng/LibpngConfig.cmake.in
  200. --- a/libpng/LibpngConfig.cmake.in  Sun Mar 13 01:59:22 2011 +0100
  201. +++ b/libpng/LibpngConfig.cmake.in  Tue Sep 06 22:21:30 2011 +0200
  202. @@ -6,16 +6,16 @@
  203.  set(LIBPNG_DEFINITIONS "@LIBPNG_DEFINITIONS@")
  204.  
  205.  ## include directories
  206. -set(LIBPNG_INCLUDE_DIRS "@LIBPNG_INCLUDE_DIRS@")
  207. +set(LIBPNG_INCLUDE_DIR "@LIBPNG_INCLUDE_DIR@")
  208.  
  209.  ## library directories to include via LINK_DIRECTORIES(...)
  210. -set(LIBPNG_LIBRARY_DIRS "@LIBPNG_LIBRARY_DIRS@")
  211. +set(LIBPNG_LIBRARY_DIR "@LIBPNG_LIBRARY_DIR@")
  212.  
  213.  ## libraries to include via TARGET_LINK_LIBRARIES(...)
  214.  set(LIBPNG_LIBRARIES "@LIBPNG_LIBRARIES@")
  215.  
  216.  set(LIBPNG_RUNTIME_DIRS "@LIBPNG_RUNTIME_DIRS@")
  217.  
  218. -INCLUDE(@LIBPNG_OUTPUT_DIR@/ImportLibpng.cmake)
  219. +INCLUDE("@LIBPNG_OUTPUT_DIR@/ImportLibpng.cmake")
  220.  
  221.  set(LIBPNG_FOUND ON)
  222. diff -r 1d6e3c9b64d0 libpng/UseLibpng.cmake.in
  223. --- a/libpng/UseLibpng.cmake.in Sun Mar 13 01:59:22 2011 +0100
  224. +++ b/libpng/UseLibpng.cmake.in Tue Sep 06 22:21:30 2011 +0200
  225. @@ -3,6 +3,6 @@
  226.  
  227.  ADD_DEFINITIONS(${LIBPNG_DEFINITIONS})
  228.  
  229. -INCLUDE_DIRECTORIES(${LIBPNG_INCLUDE_DIRS})
  230. +INCLUDE_DIRECTORIES(${LIBPNG_INCLUDE_DIR})
  231.  
  232. -LINK_DIRECTORIES(${LIBPNG_LIBRARY_DIRS})
  233. +LINK_DIRECTORIES(${LIBPNG_LIBRARY_DIR})
  234. diff -r 1d6e3c9b64d0 libpng/libpng/CMakeLists.txt
  235. --- a/libpng/libpng/CMakeLists.txt  Sun Mar 13 01:59:22 2011 +0100
  236. +++ b/libpng/libpng/CMakeLists.txt  Tue Sep 06 22:21:30 2011 +0200
  237. @@ -296,8 +296,8 @@
  238.    set(LIBPNG_LPNG_TARGET ${PNG_LIB_NAME_STATIC} CACHE INTERNAL "")
  239.  endif()
  240.  
  241. -set_target_properties(${LIBPNG_LPNG_TARGET} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${LIBPNG_LIBRARY_DIRS})
  242. -set_target_properties(${LIBPNG_LPNG_TARGET} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBPNG_LIBRARY_DIRS})
  243. +set_target_properties(${LIBPNG_LPNG_TARGET} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${LIBPNG_LIBRARY_DIR})
  244. +set_target_properties(${LIBPNG_LPNG_TARGET} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBPNG_LIBRARY_DIR})
  245.  set_target_properties(${LIBPNG_LPNG_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${LIBPNG_RUNTIME_DIRS})
  246.  
  247.  
  248. diff -r 1d6e3c9b64d0 libpng/zlib/CMakeLists.txt
  249. --- a/libpng/zlib/CMakeLists.txt    Sun Mar 13 01:59:22 2011 +0100
  250. +++ b/libpng/zlib/CMakeLists.txt    Tue Sep 06 22:21:30 2011 +0200
  251. @@ -160,8 +160,8 @@
  252.     set_target_properties(${ZLIB_TARGET} PROPERTIES VERSION ${ZLIB_FULL_VERSION})
  253.  endif()
  254.  
  255. -set_target_properties(${ZLIB_TARGET} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${LIBPNG_LIBRARY_DIRS})
  256. -set_target_properties(${ZLIB_TARGET} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBPNG_LIBRARY_DIRS})
  257. +set_target_properties(${ZLIB_TARGET} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${LIBPNG_LIBRARY_DIR})
  258. +set_target_properties(${ZLIB_TARGET} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBPNG_LIBRARY_DIR})
  259.  set_target_properties(${ZLIB_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${LIBPNG_RUNTIME_DIRS})
  260.  
  261.  if(UNIX)
  262. diff -r 1d6e3c9b64d0 lua/CMakeLists.txt
  263. --- a/lua/CMakeLists.txt    Sun Mar 13 01:59:22 2011 +0100
  264. +++ b/lua/CMakeLists.txt    Tue Sep 06 22:21:30 2011 +0200
  265. @@ -32,8 +32,8 @@
  266.  ##
  267.  ##
  268.  ##
  269. -set(LUA_INCLUDE_DIRS ${LUA_SOURCE_DIR}/src)
  270. -set(LUA_LIBRARY_DIRS ${LUA_LIBRARY_DIR})
  271. +set(LUA_INCLUDE_DIR ${LUA_SOURCE_DIR}/src)
  272. +set(LUA_LIBRARY_DIR ${LUA_LIBRARY_DIR})
  273.  set(LUA_RUNTIME_DIRS ${LUA_RUNTIME_DIR})
  274.  
  275.  ##################################
  276. @@ -53,7 +53,7 @@
  277.    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
  278.  endif()
  279.  
  280. -include_directories(${LUA_INCLUDE_DIRS})
  281. +include_directories(${LUA_INCLUDE_DIR})
  282.  
  283.  add_subdirectory(src)
  284.  
  285. diff -r 1d6e3c9b64d0 lua/LuaConfig.cmake.in
  286. --- a/lua/LuaConfig.cmake.in    Sun Mar 13 01:59:22 2011 +0100
  287. +++ b/lua/LuaConfig.cmake.in    Tue Sep 06 22:21:30 2011 +0200
  288. @@ -6,14 +6,14 @@
  289.  set(LUA_DEFINITIONS "@LUA_DEFINITIONS@")
  290.  
  291.  ## include directories
  292. -set(LUA_INCLUDE_DIRS "@LUA_INCLUDE_DIRS@")
  293. +set(LUA_INCLUDE_DIR "@LUA_INCLUDE_DIR@")
  294.  
  295.  ## library directories to include via LINK_DIRECTORIES(...)
  296. -set(LUA_LIBRARY_DIRS "@LUA_LIBRARY_DIRS@")
  297. +set(LUA_LIBRARY_DIR "@LUA_LIBRARY_DIR@")
  298.  
  299.  ## libraries to include via  TARGET_LINK_LIBRARIES(...)
  300.  set(LUA_LIBRARIES "@LUA_LIBRARIES@")
  301.  
  302.  set(LUA_RUNTIME_DIRS "@LUA_RUNTIME_DIRS@")
  303.  
  304. -set(LUA_FOUND ON)
  305. +set(LUA51_FOUND ON)
  306. diff -r 1d6e3c9b64d0 lua/UseLua.cmake.in
  307. --- a/lua/UseLua.cmake.in   Sun Mar 13 01:59:22 2011 +0100
  308. +++ b/lua/UseLua.cmake.in   Tue Sep 06 22:21:30 2011 +0200
  309. @@ -3,6 +3,6 @@
  310.  
  311.  ADD_DEFINITIONS(${LUA_DEFINITIONS})
  312.  
  313. -INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIRS})
  314. +INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
  315.  
  316. -LINK_DIRECTORIES(${LUA_LIBRARY_DIRS})
  317. +LINK_DIRECTORIES(${LUA_LIBRARY_DIR})
  318. diff -r 1d6e3c9b64d0 lua/src/CMakeLists.txt
  319. --- a/lua/src/CMakeLists.txt    Sun Mar 13 01:59:22 2011 +0100
  320. +++ b/lua/src/CMakeLists.txt    Tue Sep 06 22:21:30 2011 +0200
  321. @@ -71,11 +71,11 @@
  322.  
  323.  set_property(
  324.    TARGET ${LUA_TARGET}
  325. -  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${LUA_LIBRARY_DIRS}
  326. +  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${LUA_LIBRARY_DIR}
  327.  )
  328.  set_property(
  329.    TARGET ${LUA_TARGET}
  330. -  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${LUA_LIBRARY_DIRS}
  331. +  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${LUA_LIBRARY_DIR}
  332.  )
  333.  set_property(
  334.    TARGET ${LUA_TARGET}
  335. diff -r 1d6e3c9b64d0 sqlite/CMakeLists.txt
  336. --- a/sqlite/CMakeLists.txt Sun Mar 13 01:59:22 2011 +0100
  337. +++ b/sqlite/CMakeLists.txt Tue Sep 06 22:21:30 2011 +0200
  338. @@ -32,9 +32,9 @@
  339.  ##
  340.  ## set SQLite "output" variables
  341.  ##
  342. -set(SQLITE_INCLUDE_DIRS ${SQLITE_SOURCE_DIR}/src)
  343. -set(SQLITE_LIBRARY_DIRS ${SQLITE_LIBRARY_DIR})
  344. -set(SQLITE_RUNTIME_DIRS ${SQLITE_RUNTIME_DIR})
  345. +set(SQLITE_INCLUDE_DIR ${SQLITE_SOURCE_DIR}/src)
  346. +set(SQLITE_LIBRARY_DIR ${SQLITE_LIBRARY_DIR})
  347. +set(SQLITE_RUNTIME_DIR ${SQLITE_RUNTIME_DIR})
  348.  
  349.  ##################################
  350.  
  351. @@ -49,7 +49,7 @@
  352.    set(SQLITE_DEFINITIONS ${SQLITE_DEFINITIONS} -DSQLITE_STATIC_LIB)
  353.  endif()
  354.  
  355. -include_directories(${SQLITE_INCLUDE_DIRS})
  356. +include_directories(${SQLITE_INCLUDE_DIR})
  357.  
  358.  add_subdirectory(src)
  359.  
  360. diff -r 1d6e3c9b64d0 sqlite/SQLiteConfig.cmake.in
  361. --- a/sqlite/SQLiteConfig.cmake.in  Sun Mar 13 01:59:22 2011 +0100
  362. +++ b/sqlite/SQLiteConfig.cmake.in  Tue Sep 06 22:21:30 2011 +0200
  363. @@ -6,14 +6,14 @@
  364.  set(SQLITE_DEFINITIONS "@SQLITE_DEFINITIONS@")
  365.  
  366.  ## include directories
  367. -set(SQLITE_INCLUDE_DIRS "@SQLITE_INCLUDE_DIRS@")
  368. +set(SQLITE_INCLUDE_DIR "@SQLITE_INCLUDE_DIR@")
  369.  
  370.  ## library directories to include via LINK_DIRECTORIES(...)
  371. -set(SQLITE_LIBRARY_DIRS "@SQLITE_LIBRARY_DIRS@")
  372. +set(SQLITE_LIBRARY_DIR "@SQLITE_LIBRARY_DIR@")
  373.  
  374.  ## libraries to include via  TARGET_LINK_LIBRARIES(...)
  375.  set(SQLITE_LIBRARIES "@SQLITE_LIBRARIES@")
  376.  
  377. -set(SQLITE_RUNTIME_DIRS "@SQLITE_RUNTIME_DIRS@")
  378. +set(SQLITE_RUNTIME_DIR "@SQLITE_RUNTIME_DIR@")
  379.  
  380.  set(SQLITE_FOUND ON)
  381. diff -r 1d6e3c9b64d0 sqlite/UseSQLite.cmake.in
  382. --- a/sqlite/UseSQLite.cmake.in Sun Mar 13 01:59:22 2011 +0100
  383. +++ b/sqlite/UseSQLite.cmake.in Tue Sep 06 22:21:30 2011 +0200
  384. @@ -3,6 +3,6 @@
  385.  
  386.  ADD_DEFINITIONS(${SQLITE_DEFINITIONS})
  387.  
  388. -INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIRS})
  389. +INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
  390.  
  391. -LINK_DIRECTORIES(${SQLITE_LIBRARY_DIRS})
  392. +LINK_DIRECTORIES(${SQLITE_LIBRARY_DIR})
  393. diff -r 1d6e3c9b64d0 sqlite/src/CMakeLists.txt
  394. --- a/sqlite/src/CMakeLists.txt Sun Mar 13 01:59:22 2011 +0100
  395. +++ b/sqlite/src/CMakeLists.txt Tue Sep 06 22:21:30 2011 +0200
  396. @@ -18,11 +18,11 @@
  397.  
  398.  set_property(
  399.    TARGET ${SQLITE_TARGET}
  400. -  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${SQLITE_LIBRARY_DIRS}
  401. +  PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${SQLITE_LIBRARY_DIR}
  402.  )
  403.  set_property(
  404.    TARGET ${SQLITE_TARGET}
  405. -  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${SQLITE_LIBRARY_DIRS}
  406. +  PROPERTY LIBRARY_OUTPUT_DIRECTORY ${SQLITE_LIBRARY_DIR}
  407.  )
  408.  set_property(
  409.    TARGET ${SQLITE_TARGET}
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!