build fixes
authorAnton Adamansky <adamansky@gmail.com>
Thu, 19 Mar 2015 15:05:02 +0000 (21:05 +0600)
committerAnton Adamansky <adamansky@gmail.com>
Thu, 19 Mar 2015 15:05:02 +0000 (21:05 +0600)
CMakeLists.txt
cmake/Modules/UploadPPA.cmake

index c4955e4..b18128a 100644 (file)
@@ -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)
index 17055db..8d51d36 100644 (file)
@@ -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}")