From 603b723b7adc8b68be177bb6ca8365a41cf8aa5a Mon Sep 17 00:00:00 2001 From: Tannin Date: Fri, 9 Oct 2015 18:57:54 +0200 Subject: [PATCH] more work on build system --- .gitignore | 2 ++ CMakeLists.txt | 5 ++++- src/CMakeLists.txt | 4 ---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2be5b91..5477e9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ std*.log build +CMakeLists.txt.user +edit diff --git a/CMakeLists.txt b/CMakeLists.txt index e7d345e..f708eaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) +SET(PROJ_NAME diagnose_basic) +PROJECT(${PROJ_NAME}) + SET(DEPENDENCIES_DIR CACHE PATH "") # hint to find qt in dependencies path @@ -8,4 +11,4 @@ LIST(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake) FILE(GLOB_RECURSE BOOST_ROOT ${DEPENDENCIES_DIR}/boost*/project-config.jam) GET_FILENAME_COMPONENT(BOOST_ROOT ${BOOST_ROOT} DIRECTORY) -ADD_SUBDIRECTORY(src) \ No newline at end of file +ADD_SUBDIRECTORY(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 024a398..0f6afcb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,5 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.8) -SET(PROJ_NAME diagnose_basic) - -PROJECT(${PROJ_NAME}) - CMAKE_POLICY(SET CMP0020 NEW) CMAKE_POLICY(SET CMP0043 NEW)