From e439c779a2cd1c94673d20afcd8ab8bdd9ee1844 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Thu, 16 Aug 2018 09:08:49 -0700 Subject: [PATCH] Don't use $CMAKE_SOURCE_DIR, let's use $FILAMENT instead See pull request #103 --- CMakeLists.txt | 2 +- filament/CMakeLists.txt | 2 +- libs/filagui/CMakeLists.txt | 2 +- samples/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d03a499544..e4c2bd3607 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -290,5 +290,5 @@ endif() # Generate exported executables for cross-compiled builds (Android) if (NOT CMAKE_CROSSCOMPILING) - export(TARGETS matc cmgen FILE ${CMAKE_SOURCE_DIR}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${CMAKE_BUILD_TYPE}.cmake) + export(TARGETS matc cmgen FILE ${FILAMENT}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${CMAKE_BUILD_TYPE}.cmake) endif() diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt index 6e6efd026c..38396c95d4 100644 --- a/filament/CMakeLists.txt +++ b/filament/CMakeLists.txt @@ -212,7 +212,7 @@ endif() # ================================================================================================== if (CMAKE_CROSSCOMPILING) - set(IMPORT_EXECUTABLES ${CMAKE_SOURCE_DIR}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${CMAKE_BUILD_TYPE}.cmake) + set(IMPORT_EXECUTABLES ${FILAMENT}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${CMAKE_BUILD_TYPE}.cmake) include(${IMPORT_EXECUTABLES}) endif() diff --git a/libs/filagui/CMakeLists.txt b/libs/filagui/CMakeLists.txt index 23fb21c377..3971d805de 100644 --- a/libs/filagui/CMakeLists.txt +++ b/libs/filagui/CMakeLists.txt @@ -18,7 +18,7 @@ set(SRCS # ================================================================================================== if (CMAKE_CROSSCOMPILING) - set(IMPORT_EXECUTABLES ${CMAKE_SOURCE_DIR}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${CMAKE_BUILD_TYPE}.cmake) + set(IMPORT_EXECUTABLES ${FILAMENT}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${CMAKE_BUILD_TYPE}.cmake) include(${IMPORT_EXECUTABLES}) endif() diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 4b32753059..949c57b5b2 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -21,7 +21,7 @@ set(MATERIAL_SRCS materials/transparentColor.mat) if (CMAKE_CROSSCOMPILING) - set(IMPORT_EXECUTABLES ${CMAKE_SOURCE_DIR}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${CMAKE_BUILD_TYPE}.cmake) + set(IMPORT_EXECUTABLES ${FILAMENT}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${CMAKE_BUILD_TYPE}.cmake) include(${IMPORT_EXECUTABLES}) endif()