diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-07 15:49:28 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-12 13:58:15 +0200 |
| commit | 44b9421071cc068d22363bea6087d385ef9f4ea4 (patch) | |
| tree | 72a8056b7b9021b9ecf4115dbb2b8f083bf30fdd | |
| parent | 34c22522f35070cc216e8bfc4da854530b7bb4cc (diff) | |
| download | meson-44b9421071cc068d22363bea6087d385ef9f4ea4.zip meson-44b9421071cc068d22363bea6087d385ef9f4ea4.tar.gz meson-44b9421071cc068d22363bea6087d385ef9f4ea4.tar.bz2 | |
cmake: Fix missing include_directories in some CMakeLists.txt
3 files changed, 4 insertions, 2 deletions
diff --git a/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt index 7a9538b..8b2f7e9 100644 --- a/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt +++ b/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt @@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.5) project(cmMod) set (CMAKE_CXX_STANDARD 14) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + add_definitions("-DDO_NOTHING_JUST_A_FLAG=1") add_library(cmModLib SHARED cmMod.cpp) diff --git a/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt index 14908a3..f9e7578 100644 --- a/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt +++ b/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 14) find_package(ZLIB REQUIRED) -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib) set(CONFIG_OPT 42) configure_file("config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY) diff --git a/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt index 57f0a64..2fdd5a8 100644 --- a/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt +++ b/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) project(cmMod) set(CMAKE_CXX_STANDARD 14) -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib) set(CONFIG_OPT 42) configure_file("config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY) |