From f8ea072976d6f3cccfe32268ea34115a7887c2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lien=20Sell=C3=A6g?= Date: Thu, 14 Jun 2018 10:35:47 +0200 Subject: [PATCH] cleanup directory structure --- appveyor.sh => .appveyor.sh | 0 appveyor.yml => .appveyor.yml | 2 +- .gitmodules | 10 +++++----- CMakeLists.txt | 6 +++--- libclangmm => lib/libclangmm | 0 tiny-process-library => lib/tiny-process-library | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename appveyor.sh => .appveyor.sh (100%) rename appveyor.yml => .appveyor.yml (97%) rename libclangmm => lib/libclangmm (100%) rename tiny-process-library => lib/tiny-process-library (100%) diff --git a/appveyor.sh b/.appveyor.sh similarity index 100% rename from appveyor.sh rename to .appveyor.sh diff --git a/appveyor.yml b/.appveyor.yml similarity index 97% rename from appveyor.yml rename to .appveyor.yml index 8f4945c..b4d5ba9 100644 --- a/appveyor.yml +++ b/.appveyor.yml @@ -12,4 +12,4 @@ before_build: - C:\msys64\usr\bin\pacman --noconfirm --needed --sync mingw-w64-x86_64-cmake make mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-gtkmm3 mingw-w64-x86_64-gtksourceviewmm3 mingw-w64-x86_64-boost mingw-w64-x86_64-aspell mingw-w64-x86_64-aspell-en mingw-w64-x86_64-libgit2 build_script: - - C:\msys64\usr\bin\bash -lc "$(cygpath ${APPVEYOR_BUILD_FOLDER})/appveyor.sh" + - C:\msys64\usr\bin\bash -lc "$(cygpath ${APPVEYOR_BUILD_FOLDER})/.appveyor.sh" diff --git a/.gitmodules b/.gitmodules index 85c1b46..ec5fb62 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "tiny-process-library"] - path = tiny-process-library +[submodule "lib/tiny-process-library"] + path = lib/tiny-process-library url = ../../eidheim/tiny-process-library -[submodule "libclangmm"] - path = libclangmm - url = ../../cppit/libclangmm +[submodule "lib/libclangmm"] + path = lib/libclangmm + url = ../libclangmm diff --git a/CMakeLists.txt b/CMakeLists.txt index 35b2373..27bac4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,8 +43,8 @@ option(BUILD_TESTING OFF) set(BUILD_TESTING_SAVED ${BUILD_TESTING}) set(BUILD_TESTING OFF CACHE BOOL "Disable sub-project tests" FORCE) -add_subdirectory(libclangmm) -add_subdirectory(tiny-process-library) +add_subdirectory(lib/libclangmm) +add_subdirectory(lib/tiny-process-library) set(BUILD_TESTING ${BUILD_TESTING_SAVED} CACHE BOOL "Set to previous value" FORCE) find_package(Boost 1.54 COMPONENTS system filesystem serialization REQUIRED) @@ -53,7 +53,7 @@ include(FindPkgConfig) pkg_check_modules(GTKMM gtkmm-3.0 REQUIRED) pkg_check_modules(GTKSVMM gtksourceviewmm-3.0 REQUIRED) pkg_check_modules(LIBGIT2 libgit2 REQUIRED) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/libclangmm/cmake_modules/") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/lib/libclangmm/cmake_modules/") find_package(LibClang REQUIRED) #Find liblldb with the same version as the version of libclang found string(REPLACE libclang liblldb LIBLLDB_LIBRARIES "${LIBCLANG_LIBRARIES}") diff --git a/libclangmm b/lib/libclangmm similarity index 100% rename from libclangmm rename to lib/libclangmm diff --git a/tiny-process-library b/lib/tiny-process-library similarity index 100% rename from tiny-process-library rename to lib/tiny-process-library