From 66fade07444d24f5caf999b710ef08f2153e798f Mon Sep 17 00:00:00 2001 From: Stephane Charette Date: Mon, 27 Apr 2015 18:55:16 -0700 Subject: [PATCH] changes needed to build out-of-source and create the .deb and .rpm packages --- .gitignore | 4 ++++ CMakeLists.txt | 5 +++++ src/CMakeLists.txt | 1 + 3 files changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index 6c2921e..e4f720f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +build +build32 +build64 + bin/ *.a diff --git a/CMakeLists.txt b/CMakeLists.txt index a039789..788086c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,6 +147,11 @@ else() set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux") set(CPACK_GENERATOR TGZ) set(CPACK_SOURCE_GENERATOR TGZ) + SET ( CPACK_DEBIAN_PACKAGE_SECTION "other" ) + SET ( CPACK_DEBIAN_PACKAGE_PRIORITY "optional" ) + SET ( CPACK_DEBIAN_PACKAGE_MAINTAINER "Stéphane Charette " ) + SET ( CPACK_GENERATOR "DEB;RPM" ) + endif() include(CPack) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 037d1fd..edfc34c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -268,6 +268,7 @@ set(voxelandsserver_SRCS ) include_directories( + ${CMAKE_BINARY_DIR}/src/jthread ${PROJECT_BINARY_DIR} ${IRRLICHT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}