Não pode escolher mais do que 25 tópicos Os tópicos devem começar com uma letra ou um número, podem incluir traços ('-') e podem ter até 35 caracteres.

39 linhas
1.3 KiB

  1. diff -rupN libpng-1.5.9/CMakeLists.txt libpng-1.5.9.cotire/CMakeLists.txt
  2. --- libpng-1.5.9/CMakeLists.txt 2012-02-18 21:31:14.000000000 +0100
  3. +++ libpng-1.5.9.cotire/CMakeLists.txt 2012-03-24 18:08:54.000000000 +0100
  4. @@ -9,6 +9,8 @@
  5. cmake_minimum_required(VERSION 2.4.4)
  6. set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
  7. +include("${CMAKE_SOURCE_DIR}/cotire.cmake")
  8. +
  9. if(UNIX AND NOT DEFINED CMAKE_BUILD_TYPE)
  10. if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
  11. # workaround CMake 2.4.x bug
  12. @@ -146,6 +148,12 @@ if(PNG_SHARED)
  13. set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib")
  14. endif()
  15. target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
  16. + if (COMMAND cotire)
  17. + cotire(${PNG_LIB_NAME})
  18. + if (TARGET ${PNG_LIB_NAME}_unity)
  19. + target_link_libraries(${PNG_LIB_NAME}_unity ${ZLIB_LIBRARY} ${M_LIBRARY})
  20. + endif()
  21. + endif()
  22. endif()
  23. if(PNG_STATIC)
  24. @@ -157,6 +165,12 @@ if(PNG_STATIC)
  25. set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")
  26. endif()
  27. target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY})
  28. + if (COMMAND cotire)
  29. + cotire(${PNG_LIB_NAME_STATIC})
  30. + if (TARGET ${PNG_LIB_NAME_STATIC}_unity)
  31. + target_link_libraries(${PNG_LIB_NAME_STATIC}_unity ${ZLIB_LIBRARY} ${M_LIBRARY})
  32. + endif()
  33. + endif()
  34. endif()
  35. if(PNG_SHARED AND WIN32)