Browse Source

cleanup directory structure

merge-requests/384/head
Jørgen Lien Sellæg 8 years ago
parent
commit
f8ea072976
  1. 0
      .appveyor.sh
  2. 2
      .appveyor.yml
  3. 10
      .gitmodules
  4. 6
      CMakeLists.txt
  5. 0
      lib/libclangmm
  6. 0
      lib/tiny-process-library

0
appveyor.sh → .appveyor.sh

2
appveyor.yml → .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"

10
.gitmodules vendored

@ -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

6
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}")

0
libclangmm → lib/libclangmm

0
tiny-process-library → lib/tiny-process-library

Loading…
Cancel
Save