fix-install.diff 3.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293
  1. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  2. index ac3ff73..27f9a35 100644
  3. --- a/src/CMakeLists.txt
  4. +++ b/src/CMakeLists.txt
  5. @@ -25,13 +25,20 @@ SET(floatfann_LIB_SRCS
  6. ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS})
  7. ADD_LIBRARY(floatfann_static STATIC ${floatfann_LIB_SRCS})
  8. +if (BUILD_SHARED_LIBS)
  9. +SET_TARGET_PROPERTIES(floatfann_static PROPERTIES EXCLUDE_FROM_ALL 1)
  10. +SET(floatfann_target floatfann)
  11. +else ()
  12. +SET_TARGET_PROPERTIES(floatfann PROPERTIES EXCLUDE_FROM_ALL 1)
  13. +SET(floatfann_target floatfann_static)
  14. +endif ()
  15. SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
  16. SET_TARGET_PROPERTIES(floatfann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
  17. if (UNIX)
  18. SET_TARGET_PROPERTIES(floatfann_static PROPERTIES OUTPUT_NAME floatfann)
  19. endif(UNIX)
  20. -INSTALL(TARGETS floatfann floatfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR}
  21. +INSTALL(TARGETS ${floatfann_target} LIBRARY DESTINATION ${LIB_INSTALL_DIR}
  22. ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
  23. RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
  24. @@ -44,13 +51,20 @@ SET(doublefann_LIB_SRCS
  25. ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS})
  26. ADD_LIBRARY(doublefann_static STATIC ${doublefann_LIB_SRCS})
  27. +if (BUILD_SHARED_LIBS)
  28. +SET_TARGET_PROPERTIES(doublefann_static PROPERTIES EXCLUDE_FROM_ALL 1)
  29. +SET(doublefann_target doublefann)
  30. +else ()
  31. +SET_TARGET_PROPERTIES(doublefann PROPERTIES EXCLUDE_FROM_ALL 1)
  32. +SET(doublefann_target doublefann_static)
  33. +endif ()
  34. SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
  35. SET_TARGET_PROPERTIES(doublefann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
  36. if (UNIX)
  37. SET_TARGET_PROPERTIES(doublefann_static PROPERTIES OUTPUT_NAME doublefann)
  38. endif(UNIX)
  39. -INSTALL(TARGETS doublefann doublefann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR}
  40. +INSTALL(TARGETS ${doublefann_target} LIBRARY DESTINATION ${LIB_INSTALL_DIR}
  41. ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
  42. RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
  43. @@ -63,6 +77,13 @@ SET(fixedfann_LIB_SRCS
  44. ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS})
  45. ADD_LIBRARY(fixedfann_static STATIC ${fixedfann_LIB_SRCS})
  46. +if (BUILD_SHARED_LIBS)
  47. +SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES EXCLUDE_FROM_ALL 1)
  48. +SET(fixedfann_target fixedfann)
  49. +else ()
  50. +SET_TARGET_PROPERTIES(fixedfann PROPERTIES EXCLUDE_FROM_ALL 1)
  51. +SET(fixedfann_target fixedfann_static)
  52. +endif ()
  53. if(NOT MSVC)
  54. TARGET_LINK_LIBRARIES(fixedfann m)
  55. @@ -74,7 +95,7 @@ SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES VERSION ${FANN_VERSION_STRING}
  56. if (UNIX)
  57. SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES OUTPUT_NAME fixedfann)
  58. endif(UNIX)
  59. -INSTALL(TARGETS fixedfann fixedfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR}
  60. +INSTALL(TARGETS ${fixedfann_target} LIBRARY DESTINATION ${LIB_INSTALL_DIR}
  61. ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
  62. RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
  63. @@ -87,6 +108,13 @@ SET(fann_LIB_SRCS
  64. ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS})
  65. ADD_LIBRARY(fann_static STATIC ${fann_LIB_SRCS})
  66. +if (BUILD_SHARED_LIBS)
  67. +SET_TARGET_PROPERTIES(fann_static PROPERTIES EXCLUDE_FROM_ALL 1)
  68. +SET(fann_target fann)
  69. +else ()
  70. +SET_TARGET_PROPERTIES(fann PROPERTIES EXCLUDE_FROM_ALL 1)
  71. +SET(fann_target fann_static)
  72. +endif ()
  73. if(NOT MSVC)
  74. TARGET_LINK_LIBRARIES(fann m)
  75. @@ -98,6 +126,6 @@ SET_TARGET_PROPERTIES(fann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVE
  76. if (UNIX)
  77. SET_TARGET_PROPERTIES(fann_static PROPERTIES OUTPUT_NAME fann)
  78. endif(UNIX)
  79. -INSTALL(TARGETS fann fann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR}
  80. +INSTALL(TARGETS ${fann_target} LIBRARY DESTINATION ${LIB_INSTALL_DIR}
  81. ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
  82. RUNTIME DESTINATION ${BIN_INSTALL_DIR} )