benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #118 from jamiesnape/cleanup

Browse Source 
Fix some formatting inconsistencies, fix typo, update minimum CMake
This commit is contained in:
Syoyo Fujita
2016-12-21 01:00:16 +09:00
committed by GitHub
parent d7f83f29f0 bbcfe59c0f
commit 4bd75baaae
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
CMakeLists.txt
View File

@@ -2,7 +2,7 @@
#This configures the Cmake system with multiple properties, depending #This configures the Cmake system with multiple properties, depending
#on the platform and configuration it is set to build in. #on the platform and configuration it is set to build in.
project(tinyobjloader) project(tinyobjloader)
cmake_minimum_required(VERSION 2.8.6) cmake_minimum_required(VERSION 2.8.11)
set(TINYOBJLOADER_SOVERSION 1) set(TINYOBJLOADER_SOVERSION 1)
set(TINYOBJLOADER_VERSION 1.0.4) set(TINYOBJLOADER_VERSION 1.0.4)
@@ -10,19 +10,19 @@ set(TINYOBJLOADER_VERSION 1.0.4)
set(TINYOBJLOADEREXAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples) set(TINYOBJLOADEREXAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples)
set(tinyobjloader-Source set(tinyobjloader-Source
${CMAKE_CURRENT_SOURCE_DIR}/tiny_obj_loader.h ${CMAKE_CURRENT_SOURCE_DIR}/tiny_obj_loader.h
${CMAKE_CURRENT_SOURCE_DIR}/tiny_obj_loader.cc ${CMAKE_CURRENT_SOURCE_DIR}/tiny_obj_loader.cc
) )
set(tinyobjloader-Example-Source set(tinyobjloader-Example-Source
${CMAKE_CURRENT_SOURCE_DIR}/loader_example.cc ${CMAKE_CURRENT_SOURCE_DIR}/loader_example.cc
) )
set(tinyobjloader-examples-objsticher set(tinyobjloader-examples-objsticher
${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_writer.h ${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_writer.h
${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_writer.cc ${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_writer.cc
${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_sticher.cc ${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_sticher.cc
) )
#Install destinations #Install destinations
set(TINYOBJLOADER_CMAKE_DIR lib/cmake) set(TINYOBJLOADER_CMAKE_DIR lib/cmake)
@@ -33,21 +33,21 @@ set(TINYOBJLOADER_PKGCONFIG_DIR lib/pkgconfig)
option(TINYOBJLOADER_BUILD_TEST_LOADER "Build Example Loader Application" OFF) option(TINYOBJLOADER_BUILD_TEST_LOADER "Build Example Loader Application" OFF)
option(TINYOBJLOADER_COMPILATION_SHARED "Build as shared library" OFF) option(TINYOBJLOADER_COMPILATION_SHARED "Build as shared library" OFF)
if (TINYOBJLOADER_COMPILATION_SHARED) if(TINYOBJLOADER_COMPILATION_SHARED)
add_library(tinyobjloader SHARED ${tinyobjloader-Source}) add_library(tinyobjloader SHARED ${tinyobjloader-Source})
set_target_properties(tinyobjloader PROPERTIES set_target_properties(tinyobjloader PROPERTIES
SOVERSION ${TINYOBJLOADER_SOVERSION} SOVERSION ${TINYOBJLOADER_SOVERSION}
) )
else() else()
add_library(tinyobjloader STATIC ${tinyobjloader-Source}) add_library(tinyobjloader STATIC ${tinyobjloader-Source})
endif() endif()
set_target_properties(tinyobjloader PROPERTIES VERSION ${TINYOBJLOADER_VERSION}) set_target_properties(tinyobjloader PROPERTIES VERSION ${TINYOBJLOADER_VERSION})
target_include_directories(tinyobjloader INTERFACE target_include_directories(tinyobjloader INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${TINYOBJLOADER_INCLUDE_DIR}> $<INSTALL_INTERFACE:${TINYOBJLOADER_INCLUDE_DIR}>
) )
export(TARGETS tinyobjloader FILE ${PROJECT_NAME}-targets.cmake) export(TARGETS tinyobjloader FILE ${PROJECT_NAME}-targets.cmake)
@@ -57,11 +57,11 @@ if(TINYOBJLOADER_BUILD_TEST_LOADER)
endif() endif()
option(TINYOBJLOADER_BUILD_OBJ_STICHER "Build OBJ Sticher Application" OFF) option(TINYOBJLOADER_BUILD_OBJ_STICHER "Build OBJ Sticher Application" OFF)
if (TINYOBJLOADER_BUILD_OBJ_STICHER) if(TINYOBJLOADER_BUILD_OBJ_STICHER)
add_executable(obj_sticher ${tinyobjloader-examples-objsticher}) add_executable(obj_sticher ${tinyobjloader-examples-objsticher})
target_link_libraries(obj_sticher tinyobjloader) target_link_libraries(obj_sticher tinyobjloader)
install ( TARGETS install(TARGETS
obj_sticher obj_sticher
DESTINATION DESTINATION
bin bin
@@ -93,7 +93,7 @@ write_basic_package_version_file(tinyobjloader-config-version.cmake
configure_file(tinyobjloader.pc.in tinyobjloader.pc @ONLY) configure_file(tinyobjloader.pc.in tinyobjloader.pc @ONLY)
#Installation #Installation
install ( TARGETS install(TARGETS
tinyobjloader tinyobjloader
EXPORT ${PROJECT_NAME}-targets EXPORT ${PROJECT_NAME}-targets
DESTINATION DESTINATION
@@ -103,23 +103,23 @@ install ( TARGETS
RUNTIME DESTINATION RUNTIME DESTINATION
bin bin
) )
install ( EXPORT install(EXPORT
${PROJECT_NAME}-targets ${PROJECT_NAME}-targets
DESTINATION DESTINATION
${TINYOBJLOADER_LIBRARY_DIR} ${TINYOBJLOADER_CMAKE_DIR}
) )
install ( FILES install(FILES
tiny_obj_loader.h tiny_obj_loader.h
DESTINATION DESTINATION
${TINYOBJLOADER_INCLUDE_DIR} ${TINYOBJLOADER_INCLUDE_DIR}
) )
install ( FILES install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader-config-version.cmake" "${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader-config-version.cmake"
DESTINATION DESTINATION
${TINYOBJLOADER_CMAKE_DIR} ${TINYOBJLOADER_CMAKE_DIR}
) )
install ( FILES install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader.pc" "${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader.pc"
DESTINATION DESTINATION
${TINYOBJLOADER_PKGCONFIG_DIR} ${TINYOBJLOADER_PKGCONFIG_DIR}