summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2019-02-10 01:07:51 +0100
committerStanislaw Halik <sthalik@misaki.pl>2019-02-10 01:50:50 +0100
commitb600e54dc76254b7e431a1e50cff6707aa2d3d3e (patch)
tree76cfeb9d76e67241d9d048ad7b59b65a474060a4
parentf348546bd9fee8a82ad14f5583430fe65f960458 (diff)
cmake: small cleanup
-rw-r--r--CMakeLists.txt2
-rw-r--r--cmake/opentrack-boilerplate.cmake2
-rw-r--r--cmake/opentrack-platform.cmake7
-rw-r--r--cmake/opentrack-qt.cmake2
4 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 645c0a9b..c00735a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
set(CMAKE_C_LINKER_PREFERENCE_PROPAGATES OFF)
set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES ON)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
include(opentrack-policy NO_POLICY_SCOPE)
project(opentrack)
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}")