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.

68 lines
2.1 KiB

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