projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uistyle: Add more type-safety to UiStyle, and clean up a bit
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
bece196
..
4d15ebc
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-14,8
+14,9
@@
set(QUASSEL_MINOR 13)
set(QUASSEL_PATCH 0)
set(QUASSEL_VERSION_STRING "0.13-pre")
set(QUASSEL_PATCH 0)
set(QUASSEL_VERSION_STRING "0.13-pre")
-#
We want to know CMake's version
for debug reasons
+#
Output CMake version and build type
for debug reasons
message(STATUS "Using CMake ${CMAKE_VERSION}")
message(STATUS "Using CMake ${CMAKE_VERSION}")
+message(STATUS "CMake build type: ${CMAKE_BUILD_TYPE}")
# Tell CMake about or own modules
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
# Tell CMake about or own modules
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@
-158,6
+159,11
@@
if (POLICY CMP0063)
cmake_policy(SET CMP0063 NEW)
endif()
cmake_policy(SET CMP0063 NEW)
endif()
+# Don't automoc generated files
+if (POLICY CMP0071)
+ cmake_policy(SET CMP0071 OLD)
+endif()
+
# Simplify later checks
#####################################################################
# Simplify later checks
#####################################################################
@@
-650,7
+656,7
@@
git_describe(GIT_DESCRIBE --long)
# If in a Git repo we can get the commit-date from a git command
if (GIT_HEAD)
execute_process(
# If in a Git repo we can get the commit-date from a git command
if (GIT_HEAD)
execute_process(
- COMMAND git show -s --format=%ct
+ COMMAND git
-c log.showsignature=false
show -s --format=%ct
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_COMMIT_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_COMMIT_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE