diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-19 00:23:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-19 00:23:47 +0300 |
| commit | 7d8bd4ffaba30e603f256ec6605f826a7ea75a7e (patch) | |
| tree | 00d2a151705bdcbb5397be8e891612367fb57469 /test cases | |
| parent | a1ea5fd16b5b5cb4d406b1185bb4b9653d85f1eb (diff) | |
| parent | b1cf0fd3806d9b159a3c6cc6b1bd2ef4d14a6021 (diff) | |
| download | meson-7d8bd4ffaba30e603f256ec6605f826a7ea75a7e.zip meson-7d8bd4ffaba30e603f256ec6605f826a7ea75a7e.tar.gz meson-7d8bd4ffaba30e603f256ec6605f826a7ea75a7e.tar.bz2 | |
Merge pull request #5457 from mensinda/cmakeRefactor
CMake code refactor
Diffstat (limited to 'test cases')
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) |