1.0.1-gl2ps.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. diff --git a/avogadro/src/CMakeLists.txt b/avogadro/src/CMakeLists.txt
  2. index 75b6dfb..d87ac2c 100644
  3. --- a/avogadro/src/CMakeLists.txt
  4. +++ b/avogadro/src/CMakeLists.txt
  5. @@ -45,7 +45,7 @@ endif(ENABLE_UPDATE_CHECKER)
  6. FILE(GLOB projectDelegates_SRCS "projectdelegates/*.cpp")
  7. set(avogadro_SRCS ${avogadro_SRCS} ${projectDelegates_SRCS})
  8. # Add GL2PS to the executable
  9. -set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
  10. +#set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
  11. if( WIN32 )
  12. set(avogadro_SRCS ${avogadro_SRCS} windows/avogadro.rc)
  13. diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp
  14. index 66785fd..2933953 100644
  15. --- a/avogadro/src/mainwindow.cpp
  16. +++ b/avogadro/src/mainwindow.cpp
  17. @@ -51,7 +51,7 @@
  18. //#endif
  19. // Include the GL2PS header
  20. -#include "../gl2ps/gl2ps.h"
  21. +#include <gl2ps.h>
  22. #include <avogadro/pluginmanager.h>
  23. diff --git a/libavogadro/src/CMakeLists.txt b/libavogadro/src/CMakeLists.txt
  24. index cce8ece..cc084fb 100644
  25. --- a/libavogadro/src/CMakeLists.txt
  26. +++ b/libavogadro/src/CMakeLists.txt
  27. @@ -152,7 +152,7 @@ endforeach(headerFile ${libavogadro_HDRS})
  28. add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
  29. set_target_properties(avogadro
  30. PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
  31. -target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
  32. +target_link_libraries(avogadro ${AVO_LINK_LIBRARIES} gl2ps)
  33. install(TARGETS avogadro DESTINATION ${LIB_INSTALL_DIR})
  34. install(FILES ${libavogadro_HDRS}