take care about project version and make packages works again

JetBrains · Oct 19, 2015 · d1e8c48 · d1e8c48
1 parent 4a302f8
commit d1e8c48
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,22 @@
 cmake_minimum_required(VERSION 2.8)
 
-project(teamcity-cpp)
+if(CMAKE_VERSION VERSION_LESS 3.0)
+    project(teamcity-cpp)
+    # Old signature do not support VERSION, so set it manually
+    set(PROJECT_VERSION 1.5)
+else()
+    cmake_policy(SET CMP0048 NEW)
+    # C language needed for finding threads
+    # (will be fixed in cmake >= 3.4)
+    project(teamcity-cpp VERSION 1.5 LANGUAGES C CXX)
+endif()
+
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 find_package(Boost COMPONENTS unit_test_framework)
 find_package(GTest)
 find_package(CppUnit)
+find_package(Threads)
 
 include(RenderTestRunner)
 include(CTest)

diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(Threads)
-
 add_executable(
     gtest_test
     gtest_test.cpp