Skip to content

Commit e819891

Browse files
committed
Try using <SOURCE_DIR> - if this works we should update other build logic needing this info...
1 parent 174ddc4 commit e819891

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

assetimport/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ if (ENABLE_ASSETIMPORT)
1616
set(Z_PREFIX_STR "brl_")
1717
endif (TARGET ZLIB_BLD)
1818

19-
set(ASSETIMPORT_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/ASSETIMPORT_BLD-prefix/src/ASSETIMPORT_BLD")
20-
2119
ExternalProject_Add(ASSETIMPORT_BLD
2220
URL "${CMAKE_CURRENT_SOURCE_DIR}/assimp"
2321
BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
2422
PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/assetimport_CMake.patch
25-
COMMAND ${CMAKE_COMMAND};-E;remove;${ASSETIMPORT_SRC_DIR}/cmake-modules/FindZLIB.cmake
26-
COMMAND ${CMAKE_COMMAND};-E;copy;${CMAKE_CURRENT_SOURCE_DIR}/FindZLIB.cmake;${ASSETIMPORT_SRC_DIR}/cmake-modules/FindZLIB.cmake
23+
COMMAND ${CMAKE_COMMAND};-E;remove;<SOURCE_DIR>/cmake-modules/FindZLIB.cmake
24+
COMMAND ${CMAKE_COMMAND};-E;copy;${CMAKE_CURRENT_SOURCE_DIR}/FindZLIB.cmake;<SOURCE_DIR>/cmake-modules/FindZLIB.cmake
2725
COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/assetimport_MDLFileData.patch
2826
COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/assetimport_ParsingUtils.patch
2927
CMAKE_ARGS

0 commit comments

Comments
 (0)