Просмотр исходного кода

Merge pull request #566 from redagito/master

CMake fix for static library only build
Lee Thomason 8 лет назад
Родитель
Сommit
86be0cdfe5
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      CMakeLists.txt

+ 3 - 3
CMakeLists.txt

@@ -91,7 +91,7 @@ set_target_properties(tinyxml2_static PROPERTIES
         SOVERSION "${GENERIC_LIB_SOVERSION}")
 set_target_properties( tinyxml2_static PROPERTIES OUTPUT_NAME tinyxml2 )
 
-target_compile_definitions(tinyxml2 PUBLIC -D_CRT_SECURE_NO_WARNINGS)
+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 
@@ -99,7 +99,7 @@ if(DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
                           $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
 
     if(MSVC)
-      target_compile_definitions(tinyxml2 PUBLIC -D_CRT_SECURE_NO_WARNINGS)
+      target_compile_definitions(tinyxml2_static PUBLIC -D_CRT_SECURE_NO_WARNINGS)
     endif(MSVC)
 else()
     include_directories(${PROJECT_SOURCE_DIR})
@@ -168,4 +168,4 @@ install(FILES
         DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
 
 install(EXPORT ${CMAKE_PROJECT_NAME}Targets
-        DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
+        DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})