Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use $CMAKE_SOURCE_DIR, let's use $FILAMENT instead

Browse Source 
See pull request #103
This commit is contained in:
Romain Guy
2018-08-16 09:08:49 -07:00
parent 2dc0d278ac
commit e439c779a2
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -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()

2
filament/CMakeLists.txt
View File

@@ -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()

2
libs/filagui/CMakeLists.txt
View File

@@ -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()

2
samples/CMakeLists.txt
View File

@@ -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()