Fixed out-of-source builds of assimp_cmd.
Removed sample comments from the assimp_cmd CMake script and adapted it to the style used in the other CMake files. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@580 67173fc5-114c-0410-ac8e-9d2fd5bffc1fpull/1/head
parent
9343c3b28f
commit
b2aeba2b10
|
@ -1,15 +1,11 @@
|
||||||
# Make sure the compiler can find include files from our Hello library.
|
INCLUDE_DIRECTORIES(
|
||||||
include_directories (
|
|
||||||
${Assimp_SOURCE_DIR}/include
|
${Assimp_SOURCE_DIR}/include
|
||||||
${Assimp_SOURCE_DIR}/code
|
${Assimp_SOURCE_DIR}/code
|
||||||
)
|
)
|
||||||
|
|
||||||
# Make sure the linker can find the Hello library once it is built.
|
LINK_DIRECTORIES( ${Assimp_BINARY_DIR} ${Assimp_BINARY_DIR}/lib )
|
||||||
link_directories (${Assimp_BINARY_DIR} ${AssetImporter_BINARY_DIR}/lib)
|
|
||||||
|
|
||||||
# Add executable called "helloDemo" that is built from the source files
|
ADD_EXECUTABLE( assimp_cmd
|
||||||
# "demo.cxx" and "demo_b.cxx". The extensions are automatically found.
|
|
||||||
add_executable( assimp_cmd
|
|
||||||
../../contrib/zlib/adler32.c
|
../../contrib/zlib/adler32.c
|
||||||
../../contrib/zlib/compress.c
|
../../contrib/zlib/compress.c
|
||||||
../../contrib/zlib/crc32.c
|
../../contrib/zlib/crc32.c
|
||||||
|
@ -39,11 +35,11 @@ add_executable( assimp_cmd
|
||||||
WriteDumb.cpp
|
WriteDumb.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
TARGET_LINK_LIBRARIES( assimp_cmd assimp )
|
||||||
|
SET_TARGET_PROPERTIES( assimp_cmd PROPERTIES
|
||||||
|
OUTPUT_NAME assimp
|
||||||
|
)
|
||||||
|
|
||||||
# Link the executable to the assimp library and rename it to assimp as well :-)
|
INSTALL( TARGETS assimp_cmd
|
||||||
target_link_libraries ( assimp_cmd assimp )
|
|
||||||
INSTALL(PROGRAMS ../../bin/assimp_cmd
|
|
||||||
DESTINATION "${BIN_INSTALL_DIR}"
|
DESTINATION "${BIN_INSTALL_DIR}"
|
||||||
RENAME assimp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue