From b600e54dc76254b7e431a1e50cff6707aa2d3d3e Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 10 Feb 2019 01:07:51 +0100
Subject: cmake: small cleanup
---
cmake/opentrack-boilerplate.cmake | 2 --
cmake/opentrack-platform.cmake | 7 ++-----
cmake/opentrack-qt.cmake | 2 ++
3 files changed, 4 insertions(+), 7 deletions(-)
(limited to 'cmake')
diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake
index 10ef96a3..d86dde11 100644
--- a/cmake/opentrack-boilerplate.cmake
+++ b/cmake/opentrack-boilerplate.cmake
@@ -26,8 +26,6 @@ set(new-hier-path "#pragma once
#define OPENTRACK_I18N_PATH \"${opentrack-i18n-path}\"
")
-include_directories("${CMAKE_BINARY_DIR}")
-
function(otr_write_library_paths)
set(hier-path-filename "${CMAKE_BINARY_DIR}/opentrack-library-path.hxx")
set(orig-hier-path "")
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index 0eb3c77f..99589a76 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -37,8 +37,8 @@ endif()
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # for clang
-string(TOUPPER "${CMAKE_BUILD_TYPE}" __build_type)
-set(CMAKE_BUILD_TYPE "${__build_type}" CACHE STRING "" FORCE)
+string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE)
+set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "" FORCE)
include_directories("${CMAKE_SOURCE_DIR}")
@@ -156,6 +156,3 @@ if(APPLE)
endforeach()
set(CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
endif()
-
-
-
diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake
index 8526acf7..5a8c27a0 100644
--- a/cmake/opentrack-qt.cmake
+++ b/cmake/opentrack-qt.cmake
@@ -80,3 +80,5 @@ function(otr_qt2 n)
-DQT_MESSAGELOGCONTEXT
)
endfunction()
+
+include_directories("${CMAKE_BINARY_DIR}")
--
cgit v1.2.3