diff options
| author | Anton Adamansky <adamansky@gmail.com> | 2015-03-19 21:05:02 +0600 |
|---|---|---|
| committer | Anton Adamansky <adamansky@gmail.com> | 2015-03-19 21:05:02 +0600 |
| commit | 70bee22d6f6d642f8720c7d8807970edfe18a20a (patch) | |
| tree | 2bb02a96256a5eb68cd6ceeb28b15bd9ad33bd2c | |
| parent | d7d4a36c1a1e7d4c82760362711b3291a94ab007 (diff) | |
| download | ejdb-70bee22d6f6d642f8720c7d8807970edfe18a20a.tar.gz ejdb-70bee22d6f6d642f8720c7d8807970edfe18a20a.tar.bz2 ejdb-70bee22d6f6d642f8720c7d8807970edfe18a20a.zip | |
build fixes
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | cmake/Modules/UploadPPA.cmake | 6 |
2 files changed, 11 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c4955e4..b18128a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 2.8) set(PROJECT_NAME "ejdb") set(PROJECT_VENDOR "Softmotions") set(PROJECT_WEBSITE "http://ejdb.org") @@ -26,7 +26,6 @@ option(PACKAGE_DEB "Build .deb instalation packages" OFF) option(PACKAGE_TGZ "Build .tgz package archive" ON) option(ENABLE_PPA "Enable PPA package build" OFF) option(UPLOAD_PPA "Upload debian packages to the launchpad ppa repository" OFF) -#option(MXE_HOME "Home of MXE (mxe.cc) windows cross build environment") if (CMAKE_SIZEOF_VOID_P MATCHES 8) set(PROJECT_ARCH "x86_64") @@ -69,13 +68,13 @@ endif() if (CPACK_GENERATORS) set(CPACK_GENERATOR "${CPACK_GENERATORS}") set(CPACK_SOURCE_IGNORE_FILES - "ejdb\\.mk$" - "\\.project$" - "\\.workspace$" - "\\.iml$" - "\\.cmake_dirty$" - "ctest\\.cmake" - "compile_commands\\.json$" + "ejdb\\\\.mk$" + "\\\\.project$" + "\\\\.workspace$" + "\\\\.iml$" + "\\\\.cmake_dirty$" + "ctest\\\\.cmake" + "compile_commands\\\\.json$" "/Makefile$" ) add_subdirectory(installer) diff --git a/cmake/Modules/UploadPPA.cmake b/cmake/Modules/UploadPPA.cmake index 17055db..8d51d36 100644 --- a/cmake/Modules/UploadPPA.cmake +++ b/cmake/Modules/UploadPPA.cmake @@ -285,9 +285,9 @@ set(CPACK_SOURCE_IGNORE_FILES "/test/" "/packaging/" "/debian/" - "/\\.git.*" - "/\\.idea/" - "/\\.codelite/" + "/\\\\.git.*" + "/\\\\.idea/" + "/\\\\.codelite/" "*~$") #set(package_file_name "${CPACK_DEBIAN_PACKAGE_NAME}_${DEBIAN_PACKAGE_VERSION}") |