Skip to content

Commit

Permalink
adjust the output path
Browse files Browse the repository at this point in the history
  • Loading branch information
alexchicn committed Oct 14, 2020
1 parent cd17ec3 commit f75cb09
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ if(LIBGLTF_USE_GOOGLE_DRACO)
set_target_properties(dracoenc PROPERTIES FOLDER externals/draco)
set(GOOGLE_DRACO_PATH_INCLUDE ${EXTERNAL_PATH}/draco/src)
set(GOOGLE_DRACO_PATH_BUILD ${CMAKE_BINARY_DIR})
set_target_properties(dracodec PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${OUT_BIN_PATH})
set_target_properties(dracodec PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${OUT_LIB_PATH})
else()
find_package(GoogleDraco)
if(GOOGLEDRACO_FOUND)
Expand Down
8 changes: 4 additions & 4 deletions source/libgltf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ set(LIBRARY_OUTPUT_PATH ${OUT_LIB_PATH})

add_library(libgltf STATIC ${CODE_FILE_LIST})

set_target_properties(libgltf PROPERTIES FOLDER main)
set_target_properties(libgltf PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${OUT_BIN_PATH})
set_target_properties(libgltf PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${OUT_LIB_PATH})

set(INCLUDE_PATH_LIST
${HEADER_PATH}/libgltf
${SOURCE_FILE_PATH}
Expand Down Expand Up @@ -99,7 +103,3 @@ else()
COMMENT "sync the head file"
)
endif()

set_target_properties(libgltf PROPERTIES FOLDER main)
set_target_properties(libgltf PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${OUT_BIN_PATH})
set_target_properties(libgltf PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${OUT_LIB_PATH})
9 changes: 5 additions & 4 deletions source/runtest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ add_executable(runtest
${SOURCE_FILE_LIST}
)

set_target_properties(runtest PROPERTIES FOLDER main)
set_target_properties(runtest PROPERTIES EXECUTABLE_OUTPUT_PATH ${OUT_BIN_PATH})
set_target_properties(runtest PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${OUT_BIN_PATH})
set_target_properties(runtest PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${OUT_LIB_PATH})

if(${LIBGLTF_PLATFORM_WINDOWS})
set(LIBRARY_PATH_LIST
debug libgltf${CMAKE_DEBUG_POSTFIX}${STATIC_LIBRARY_EXTENSION}
Expand Down Expand Up @@ -57,11 +62,7 @@ if(LIBGLTF_USE_GOOGLE_DRACO)
target_link_libraries(runtest ${LIBRARY_PATH_LIST_GOOGLE_DRACO})
endif()

set(EXECUTABLE_OUTPUT_PATH ${OUT_BIN_PATH})

set(DEPENDANCY_LIST
libgltf
)
add_dependencies(runtest ${DEPENDANCY_LIST})

set_target_properties(runtest PROPERTIES FOLDER main)

0 comments on commit f75cb09

Please sign in to comment.