From ad96ff0769930f7be7989fda7aa62c0c87e17155 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 20 Dec 2016 09:32:41 -0500 Subject: [PATCH 1/4] Consistently use spaces instead of tabs in CMake files --- CMakeLists.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ebd0af..93d62e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,19 +10,19 @@ set(TINYOBJLOADER_VERSION 1.0.4) set(TINYOBJLOADEREXAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples) set(tinyobjloader-Source - ${CMAKE_CURRENT_SOURCE_DIR}/tiny_obj_loader.h - ${CMAKE_CURRENT_SOURCE_DIR}/tiny_obj_loader.cc - ) + ${CMAKE_CURRENT_SOURCE_DIR}/tiny_obj_loader.h + ${CMAKE_CURRENT_SOURCE_DIR}/tiny_obj_loader.cc + ) set(tinyobjloader-Example-Source - ${CMAKE_CURRENT_SOURCE_DIR}/loader_example.cc - ) + ${CMAKE_CURRENT_SOURCE_DIR}/loader_example.cc + ) set(tinyobjloader-examples-objsticher - ${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_writer.h - ${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_writer.cc - ${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_sticher.cc - ) + ${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_writer.h + ${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_writer.cc + ${TINYOBJLOADEREXAMPLES_DIR}/obj_sticher/obj_sticher.cc + ) #Install destinations set(TINYOBJLOADER_CMAKE_DIR lib/cmake) @@ -34,20 +34,20 @@ option(TINYOBJLOADER_BUILD_TEST_LOADER "Build Example Loader Application" OFF) option(TINYOBJLOADER_COMPILATION_SHARED "Build as shared library" OFF) if (TINYOBJLOADER_COMPILATION_SHARED) - add_library(tinyobjloader SHARED ${tinyobjloader-Source}) - set_target_properties(tinyobjloader PROPERTIES - SOVERSION ${TINYOBJLOADER_SOVERSION} - ) + add_library(tinyobjloader SHARED ${tinyobjloader-Source}) + set_target_properties(tinyobjloader PROPERTIES + SOVERSION ${TINYOBJLOADER_SOVERSION} + ) else() - add_library(tinyobjloader STATIC ${tinyobjloader-Source}) + add_library(tinyobjloader STATIC ${tinyobjloader-Source}) endif() set_target_properties(tinyobjloader PROPERTIES VERSION ${TINYOBJLOADER_VERSION}) target_include_directories(tinyobjloader INTERFACE - $ - $ - ) + $ + $ + ) export(TARGETS tinyobjloader FILE ${PROJECT_NAME}-targets.cmake) From 2019ace3b7e731936b122d8376d9f420b35e9ec7 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 20 Dec 2016 09:32:41 -0500 Subject: [PATCH 2/4] Remove excess padding around some parentheses in CMake files --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93d62e3..e702ce7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ set(TINYOBJLOADER_PKGCONFIG_DIR lib/pkgconfig) option(TINYOBJLOADER_BUILD_TEST_LOADER "Build Example Loader Application" OFF) option(TINYOBJLOADER_COMPILATION_SHARED "Build as shared library" OFF) -if (TINYOBJLOADER_COMPILATION_SHARED) +if(TINYOBJLOADER_COMPILATION_SHARED) add_library(tinyobjloader SHARED ${tinyobjloader-Source}) set_target_properties(tinyobjloader PROPERTIES SOVERSION ${TINYOBJLOADER_SOVERSION} @@ -57,11 +57,11 @@ if(TINYOBJLOADER_BUILD_TEST_LOADER) endif() 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}) target_link_libraries(obj_sticher tinyobjloader) - install ( TARGETS + install(TARGETS obj_sticher DESTINATION bin @@ -93,7 +93,7 @@ write_basic_package_version_file(tinyobjloader-config-version.cmake configure_file(tinyobjloader.pc.in tinyobjloader.pc @ONLY) #Installation -install ( TARGETS +install(TARGETS tinyobjloader EXPORT ${PROJECT_NAME}-targets DESTINATION @@ -103,23 +103,23 @@ install ( TARGETS RUNTIME DESTINATION bin ) -install ( EXPORT +install(EXPORT ${PROJECT_NAME}-targets DESTINATION ${TINYOBJLOADER_LIBRARY_DIR} ) -install ( FILES +install(FILES tiny_obj_loader.h DESTINATION ${TINYOBJLOADER_INCLUDE_DIR} ) -install ( FILES +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader-config-version.cmake" DESTINATION ${TINYOBJLOADER_CMAKE_DIR} ) -install ( FILES +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tinyobjloader.pc" DESTINATION ${TINYOBJLOADER_PKGCONFIG_DIR} From 38c07d34c45f789461e9fc746a9ae3e51df86091 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 20 Dec 2016 09:44:26 -0500 Subject: [PATCH 3/4] Fix typo in destination of CMake export file --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e702ce7..e9ead11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,7 @@ install(TARGETS install(EXPORT ${PROJECT_NAME}-targets DESTINATION - ${TINYOBJLOADER_LIBRARY_DIR} + ${TINYOBJLOADER_CMAKE_DIR} ) install(FILES tiny_obj_loader.h From bbcfe59c0f38362985fb8aec9288a94d34410392 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 20 Dec 2016 09:44:47 -0500 Subject: [PATCH 4/4] Update minimum required version of CMake --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9ead11..d8cbea5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ #This configures the Cmake system with multiple properties, depending #on the platform and configuration it is set to build in. project(tinyobjloader) -cmake_minimum_required(VERSION 2.8.6) +cmake_minimum_required(VERSION 2.8.11) set(TINYOBJLOADER_SOVERSION 1) set(TINYOBJLOADER_VERSION 1.0.4)