mirror of https://github.com/microsoft/vcpkg.git
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt
|
|
index e545b6d..01d84af 100644
|
|
--- a/extensions/CMakeLists.txt
|
|
+++ b/extensions/CMakeLists.txt
|
|
@@ -1,3 +1,8 @@
|
|
+if(BUILD_SHARED_LIBS)
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dlibcmark_gfm_EXPORTS")
|
|
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dlibcmark_gfm_EXPORTS")
|
|
+endif()
|
|
+
|
|
set(LIBRARY "libcmark-gfm-extensions")
|
|
set(STATICLIBRARY "libcmark-gfm-extensions_static")
|
|
set(LIBRARY_SOURCES
|
|
@@ -66,6 +71,7 @@ endif()
|
|
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
|
|
|
|
include (InstallRequiredSystemLibraries)
|
|
+target_include_directories(${CMARK_INSTALL} INTERFACE $<INSTALL_INTERFACE:include>)
|
|
install(TARGETS ${CMARK_INSTALL}
|
|
EXPORT cmark-gfm-extensions
|
|
RUNTIME DESTINATION bin
|
|
@@ -79,7 +85,7 @@ if (CMARK_SHARED OR CMARK_STATIC)
|
|
DESTINATION include
|
|
)
|
|
|
|
- install(EXPORT cmark-gfm-extensions DESTINATION lib${LIB_SUFFIX}/cmake-gfm-extensions)
|
|
+ install(EXPORT cmark-gfm-extensions FILE cmark-gfm-extensions-config.cmake DESTINATION lib${LIB_SUFFIX}/cmake-gfm-extensions)
|
|
endif()
|
|
|
|
# Feature tests
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 84dd2a0..f355de5 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -154,12 +154,17 @@ endif()
|
|
|
|
set(libdir lib${LIB_SUFFIX})
|
|
|
|
+if(NOT BUILD_TOOLS)
|
|
+ set_target_properties(${PROGRAM} PROPERTIES EXCLUDE_FROM_ALL 1)
|
|
+ set(PROGRAM "")
|
|
+endif()
|
|
install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
|
|
EXPORT cmark-gfm
|
|
RUNTIME DESTINATION bin
|
|
LIBRARY DESTINATION ${libdir}
|
|
ARCHIVE DESTINATION ${libdir}
|
|
)
|
|
+target_include_directories(${CMARK_INSTALL} INTERFACE $<INSTALL_INTERFACE:include>)
|
|
|
|
if(CMARK_SHARED OR CMARK_STATIC)
|
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark-gfm.pc.in
|
|
@@ -175,7 +180,7 @@ if(CMARK_SHARED OR CMARK_STATIC)
|
|
DESTINATION include
|
|
)
|
|
|
|
- install(EXPORT cmark-gfm DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
|
+ install(EXPORT cmark-gfm FILE cmark-gfm-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
|
endif()
|
|
|
|
# Feature tests
|