fix EP assimp build

(still DLLs are in the wrong output dir) cc: #359
MRPT · Aug 11, 2017 · 78eb71e · 78eb71e
1 parent c9c872e
commit 78eb71e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cmakemodules/script_assimp.cmake b/cmakemodules/script_assimp.cmake
@@ -50,6 +50,8 @@ IF (NOT ASSIMP_FOUND)
 			-DRUNTIME_OUTPUT_DIRECTORY=${MRPT_BINARY_DIR}/bin
 		  INSTALL_COMMAND   ""
 		  TEST_COMMAND      ""
+#		  PATCH_COMMAND 
+#			${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/lua/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
 		)
 
 #		ExternalProject_Add_Step(
@@ -83,7 +85,10 @@ IF (ASSIMP_FOUND_VIA_CMAKE)
 	LIST(APPEND ASSIMP_LIBRARIES optimized "assimp-mrpt" debug "assimp-mrptd")
 
 	# override wrong include dirs:
-	SET(ASSIMP_INCLUDE_DIRS "${MRPT_SOURCE_DIR}/otherlibs/assimp/include/")
+	SET(ASSIMP_INCLUDE_DIRS 
+		"${MRPT_SOURCE_DIR}/otherlibs/assimp/include/"
+		"${MRPT_BINARY_DIR}/assimp-prefix/src/assimp-build/include/"
+	)
 
 ENDIF (ASSIMP_FOUND_VIA_CMAKE)
 

diff --git a/libs/opengl/CMakeLists.txt b/libs/opengl/CMakeLists.txt
@@ -34,10 +34,10 @@ IF (CMAKE_MRPT_HAS_ASSIMP)
 	IF (NOT ${ASSIMP_CXX_FLAGS} STREQUAL "")
 		ADD_DEFINITIONS("${ASSIMP_CXX_FLAGS}")
 	ENDIF()
-	IF (NOT ${ASSIMP_INCLUDE_DIRS} STREQUAL "")
+	IF (NOT "${ASSIMP_INCLUDE_DIRS}" STREQUAL "")
 		INCLUDE_DIRECTORIES("${ASSIMP_INCLUDE_DIRS}")
 	ENDIF()
-	IF(NOT ${ASSIMP_VERSION} STREQUAL "")
+	IF(NOT "${ASSIMP_VERSION}" STREQUAL "")
 		string(SUBSTRING "${ASSIMP_VERSION}" 0 1 MRPT_ASSIMP_VERSION_MAJOR)
 		ADD_DEFINITIONS(-DMRPT_ASSIMP_VERSION_MAJOR=${MRPT_ASSIMP_VERSION_MAJOR})
 	ENDIF()