Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2014-01-15 15:20:03 +0400
committerOlivier Goffart <ogoffart@woboq.com>2014-01-15 15:20:03 +0400
commitc7227297af206700be49e12297b9aa524de8f987 (patch)
tree7fe4c2263b9af1ef02fa6539e5fee5476d1e721a /csync/CMakeLists.txt
parent924e0e32424a504d3a71bd549a95e68378b392bb (diff)
Make it compile with the merge of csync mirall
Diffstat (limited to 'csync/CMakeLists.txt')
-rw-r--r--csync/CMakeLists.txt16
1 files changed, 2 insertions, 14 deletions
diff --git a/csync/CMakeLists.txt b/csync/CMakeLists.txt
index 4e87dfb8d..d43a9dc9c 100644
--- a/csync/CMakeLists.txt
+++ b/csync/CMakeLists.txt
@@ -1,10 +1,7 @@
-project(ocsync C)
-# Required cmake version
-cmake_minimum_required(VERSION 2.6.0)
# global needed variables
-set(APPLICATION_NAME ${PROJECT_NAME})
+set(APPLICATION_NAME "ocsync")
set(APPLICATION_VERSION_MAJOR "0")
set(APPLICATION_VERSION_MINOR "91")
@@ -15,11 +12,6 @@ set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINO
set(LIBRARY_VERSION "0.2.1")
set(LIBRARY_SOVERSION "0")
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH
- ${CMAKE_SOURCE_DIR}/cmake/Modules
-)
-
# add definitions
include(DefineCMakeDefaults)
include(DefinePlatformDefaults)
@@ -28,10 +20,6 @@ include(DefineOptions.cmake)
include(DefineInstallationPaths)
-# disallow in-source build
-include(MacroEnsureOutOfSourceBuild)
-macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there.")
-
# add macros
include(MacroAddPlugin)
include(MacroCopyFile)
@@ -65,7 +53,7 @@ if (CMOCKA_FOUND AND UNIT_TESTING)
add_subdirectory(tests)
endif (CMOCKA_FOUND AND UNIT_TESTING)
-configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h)
configure_file(config_test.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_test.h)