From b7c169ccbcfec4ad0f0313b1eb201aedd250bd8b Mon Sep 17 00:00:00 2001 From: Lukas Solanka Date: Sat, 28 Apr 2018 00:55:28 +0100 Subject: [PATCH] Replace absolute installation paths with relative --- CMakeLists.txt | 53 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 978a24b..de88807 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,6 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DTINYXML2_DEBUG") # To disable the building of the tests, use cmake . -DBUILD_TESTS:BOOL=OFF option(BUILD_SHARED_LIBS "build as shared library" ON) -option(BUILD_STATIC_LIBS "build as static library" OFF) option(BUILD_TESTS "build xmltest (deprecated: Use BUILD_TESTING)" ON) set(CMAKE_CXX_VISIBILITY_PRESET hidden) @@ -48,8 +47,7 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # to distinguish between debug and release lib set(CMAKE_DEBUG_POSTFIX "d") -if(BUILD_SHARED_LIBS) -add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h) +add_library(tinyxml2 tinyxml2.cpp tinyxml2.h) set_target_properties(tinyxml2 PROPERTIES COMPILE_DEFINITIONS "TINYXML2_EXPORT" @@ -60,7 +58,7 @@ set_target_properties(tinyxml2 PROPERTIES if(DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") target_include_directories(tinyxml2 PUBLIC $ - $) + $) if(MSVC) target_compile_definitions(tinyxml2 PUBLIC -D_CRT_SECURE_NO_WARNINGS) @@ -82,54 +80,11 @@ install(TARGETS tinyxml2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -endif() - -if(BUILD_STATIC_LIBS) -add_library(tinyxml2_static STATIC tinyxml2.cpp tinyxml2.h) -set_target_properties(tinyxml2_static PROPERTIES - COMPILE_DEFINITONS "TINYXML2_EXPORT" - VERSION "${GENERIC_LIB_VERSION}" - SOVERSION "${GENERIC_LIB_SOVERSION}") -set_target_properties( tinyxml2_static PROPERTIES OUTPUT_NAME tinyxml2 ) - -target_compile_definitions(tinyxml2_static PUBLIC -D_CRT_SECURE_NO_WARNINGS) - -if(DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(tinyxml2_static PUBLIC - $ - $) - - if(MSVC) - target_compile_definitions(tinyxml2_static PUBLIC -D_CRT_SECURE_NO_WARNINGS) - endif(MSVC) -else() - include_directories(${PROJECT_SOURCE_DIR}) - - if(MSVC) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - endif(MSVC) -endif() - -# export targets for find_package config mode -export(TARGETS tinyxml2_static - FILE ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Targets.cmake) - -install(TARGETS tinyxml2_static - EXPORT ${CMAKE_PROJECT_NAME}Targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -endif() if(BUILD_TESTING AND BUILD_TESTS) add_executable(xmltest xmltest.cpp) - if(BUILD_SHARED_LIBS) - add_dependencies(xmltest tinyxml2) - target_link_libraries(xmltest tinyxml2) - else(BUILD_STATIC_LIBS) - add_dependencies(xmltest tinyxml2_static) - target_link_libraries(xmltest tinyxml2_static) - endif() + add_dependencies(xmltest tinyxml2) + target_link_libraries(xmltest tinyxml2) # Copy test resources and create test output directory add_custom_command(TARGET xmltest POST_BUILD