You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

74 lines
3.1 KiB

  1. Index: Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/CMakeLists.txt
  2. ===================================================================
  3. --- /dev/null
  4. +++ Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/CMakeLists.txt
  5. @@ -0,0 +1,5 @@
  6. +cmake_minimum_required(VERSION 2.6)
  7. +
  8. +add_subdirectory(server)
  9. +add_subdirectory(cli)
  10. +add_subdirectory(keystored)
  11. Index: Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/cli/CMakeLists.txt
  12. ===================================================================
  13. --- Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d.orig/cli/CMakeLists.txt
  14. +++ Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/cli/CMakeLists.txt
  15. @@ -1,7 +1,7 @@
  16. cmake_minimum_required(VERSION 2.6)
  17. # include custom Modules
  18. -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../CMakeModules/")
  19. +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
  20. project(netopeer2-cli C)
  21. include(GNUInstallDirs)
  22. @@ -83,7 +83,7 @@ endif()
  23. install(FILES ${PROJECT_SOURCE_DIR}/doc/${PROJECT_NAME}.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
  24. # clean cmake cache
  25. -add_custom_target(cleancache
  26. +add_custom_target(cleancache_cli
  27. COMMAND make clean
  28. COMMAND find . -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} +
  29. COMMAND rm -rf Makefile Doxyfile
  30. Index: Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/keystored/CMakeLists.txt
  31. ===================================================================
  32. --- Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d.orig/keystored/CMakeLists.txt
  33. +++ Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/keystored/CMakeLists.txt
  34. @@ -1,7 +1,7 @@
  35. cmake_minimum_required(VERSION 2.6)
  36. # include custom Modules
  37. -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../CMakeModules/")
  38. +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
  39. project(keystored C)
  40. include(GNUInstallDirs)
  41. @@ -140,7 +140,7 @@ if (SSH_KEY_INSTALL)
  42. execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ssh-key-import.sh)")
  43. endif()
  44. -add_custom_target(install-scripts-ide
  45. +add_custom_target(install-scripts-ide-keystored
  46. scripts/model-install.sh
  47. scripts/ssh-key-import.sh
  48. )
  49. Index: Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/server/CMakeLists.txt
  50. ===================================================================
  51. --- Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d.orig/server/CMakeLists.txt
  52. +++ Netopeer2-0.4.13-ae560bef2e70d274f6d028b59e3cb398ea2a621d/server/CMakeLists.txt
  53. @@ -1,7 +1,7 @@
  54. cmake_minimum_required(VERSION 2.8.9)
  55. # include custom Modules
  56. -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../CMakeModules/")
  57. +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
  58. project(netopeer2-server C)
  59. include(GNUInstallDirs)
  60. @@ -176,7 +176,7 @@ if (ENABLE_CONFIGURATION)
  61. execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/model-install.sh)")
  62. endif()
  63. -add_custom_target(install-scripts-ide
  64. +add_custom_target(install-scripts-ide-server
  65. scripts/model-install.sh