Skip to content
Permalink
Browse files

scripts: rename cmake

  • Loading branch information...
markus2330 authored and sanssecours committed Aug 17, 2019
1 parent 8e1d1a6 commit ca0e7bfa5ed0eb2db6ae91920759f075aec144a5
Showing with 9 additions and 9 deletions.
  1. +9 −9 CMakeLists.txt
  2. 0 { → scripts}/cmake/CMakeLists.txt
  3. 0 { → scripts}/cmake/ElektraCache.cmake
  4. 0 { → scripts}/cmake/ElektraClasspath.cmake
  5. 0 { → scripts}/cmake/ElektraCompiling.cmake
  6. 0 { → scripts}/cmake/ElektraConfig.cmake.in
  7. 0 { → scripts}/cmake/ElektraCoverage.cmake
  8. 0 { → scripts}/cmake/ElektraDocSet.cmake
  9. 0 { → scripts}/cmake/ElektraPackaging.cmake
  10. 0 { → scripts}/cmake/ElektraUninstall.cmake
  11. 0 { → scripts}/cmake/Modules/COPYING-CMAKE-SCRIPTS
  12. 0 { → scripts}/cmake/Modules/Copyright.txt
  13. 0 { → scripts}/cmake/Modules/DownloadProject.CMakeLists.cmake.in
  14. 0 { → scripts}/cmake/Modules/DownloadProject.cmake
  15. 0 { → scripts}/cmake/Modules/DownloadProjectLicense.txt
  16. 0 { → scripts}/cmake/Modules/ExportPluginSymbols.cmake
  17. 0 { → scripts}/cmake/Modules/FindANTLR4CPP.cmake
  18. 0 { → scripts}/cmake/Modules/FindAugeas.cmake
  19. 0 { → scripts}/cmake/Modules/FindCppCMS.cmake
  20. 0 { → scripts}/cmake/Modules/FindDBus.cmake
  21. 0 { → scripts}/cmake/Modules/FindDiscount.cmake
  22. 0 { → scripts}/cmake/Modules/FindGLib.cmake
  23. 0 { → scripts}/cmake/Modules/FindGObjectIntrospection.cmake
  24. 0 { → scripts}/cmake/Modules/FindGTest.cmake
  25. 0 { → scripts}/cmake/Modules/FindHaskell.cmake
  26. 0 { → scripts}/cmake/Modules/FindIconv.cmake
  27. 0 { → scripts}/cmake/Modules/FindLibBotan.cmake
  28. 0 { → scripts}/cmake/Modules/FindLibEv.cmake
  29. 0 { → scripts}/cmake/Modules/FindLibFA.cmake
  30. 0 { → scripts}/cmake/Modules/FindLibGit2.cmake
  31. 0 { → scripts}/cmake/Modules/FindLibGpgme.cmake
  32. 0 { → scripts}/cmake/Modules/FindLibJWT.cmake
  33. 0 { → scripts}/cmake/Modules/FindLibOpenSSL.cmake
  34. 0 { → scripts}/cmake/Modules/FindLibRt.cmake
  35. 0 { → scripts}/cmake/Modules/FindLibgcrypt.cmake
  36. 0 { → scripts}/cmake/Modules/FindLua.cmake
  37. 0 { → scripts}/cmake/Modules/FindMySqlCppConn.cmake
  38. 0 { → scripts}/cmake/Modules/FindPluginprocess.cmake
  39. 0 { → scripts}/cmake/Modules/FindPython2Interp.cmake
  40. 0 { → scripts}/cmake/Modules/FindPython2Libs.cmake
  41. 0 { → scripts}/cmake/Modules/FindSystemdJournal.cmake
  42. 0 { → scripts}/cmake/Modules/FindXercesC.cmake
  43. 0 { → scripts}/cmake/Modules/FindYAEP.cmake
  44. 0 { → scripts}/cmake/Modules/FindYajl.cmake
  45. 0 { → scripts}/cmake/Modules/FindZeroMQ.cmake
  46. 0 { → scripts}/cmake/Modules/Findlibuv.cmake
  47. 0 { → scripts}/cmake/Modules/Findyaml-cpp.cmake
  48. 0 { → scripts}/cmake/Modules/LibAddBinding.cmake
  49. 0 { → scripts}/cmake/Modules/LibAddHaskellPlugin.cmake
  50. 0 { → scripts}/cmake/Modules/LibAddLib.cmake
  51. 0 { → scripts}/cmake/Modules/LibAddMacros.cmake
  52. 0 { → scripts}/cmake/Modules/LibAddPlugin.cmake
  53. 0 { → scripts}/cmake/Modules/LibAddTest.cmake
  54. 0 { → scripts}/cmake/Modules/LibFindMacros.cmake
  55. 0 { → scripts}/cmake/Modules/SafeCheckSymbolExists.cmake
  56. 0 { → scripts}/cmake/Platform.cmake
  57. 0 { → scripts}/cmake/PrintDependencies.cmake
  58. 0 { → scripts}/cmake/Toolchain/Toolchain-mingw-w64-x86_64.cmake
  59. 0 { → scripts}/cmake/Toolchain/Toolchain-mingw32.cmake
  60. 0 { → scripts}/cmake/elektra.pc.in
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.0)

# allows us to override platform specific variables
set (CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_SOURCE_DIR}/cmake/Platform.cmake")
set (CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_SOURCE_DIR}/scripts/cmake/Platform.cmake")

set (KDB_VERSION_MAJOR 0)
set (KDB_VERSION_MINOR 9)
@@ -25,13 +25,13 @@ set (CMAKE_MACOSX_RPATH 1)
set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")

# additional modules for loading libraries
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/scripts/cmake/Modules/")

# needed by ifs below
include (cmake/ElektraCache.cmake)
include (cmake/ElektraCompiling.cmake)
include (scripts/cmake/ElektraCache.cmake)
include (scripts/cmake/ElektraCompiling.cmake)
if (ENABLE_COVERAGE)
include (cmake/ElektraCoverage.cmake)
include (scripts/cmake/ElektraCoverage.cmake)
endif (ENABLE_COVERAGE)

if (ENABLE_TESTING)
@@ -73,7 +73,7 @@ set (SO_VERSION_TOOLS 2)
set (SO_VERSION_GETENV 0)

# needs version above
include (cmake/ElektraPackaging.cmake)
include (scripts/cmake/ElektraPackaging.cmake)

# ensure KDB_DB_SYSTEM is an absolute path
if (NOT IS_ABSOLUTE "${KDB_DB_SYSTEM}")
@@ -85,14 +85,14 @@ if (NOT IS_ABSOLUTE "${KDB_DB_SPEC}")
set (KDB_DB_SPEC "${CMAKE_INSTALL_PREFIX}/${KDB_DB_SPEC}")
endif ()

# now add all directories
add_subdirectory (cmake)
# let cmake folder be included before doc
add_subdirectory (scripts/cmake)

if (BUILD_DOCUMENTATION)
add_subdirectory (doc)
endif (BUILD_DOCUMENTATION)

# add scripts after doc
# add scripts after doc (without scripts/cmake)
add_subdirectory (scripts)

# is there anything to build except documentation?
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit ca0e7bf

Please sign in to comment.
You can’t perform that action at this time.