commonmarker 0.14.0 → 0.14.1

data/ext/commonmarker/cmark/build/man/Makefile

@@ -39,10 +39,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.1/bin/cmake
+CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.2/bin/cmake
 
 # The command to remove a file.
-RM = /usr/local/Cellar/cmake/3.7.1/bin/cmake -E remove -f
+RM = /usr/local/Cellar/cmake/3.7.2/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
@@ -59,7 +59,7 @@ CMAKE_BINARY_DIR = /Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker
 # Special rule for the target install/strip
 install/strip: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip
 
 # Special rule for the target install/strip
@@ -70,13 +70,13 @@ install/strip/fast: install/strip
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
 # Special rule for the target list_install_components
@@ -92,7 +92,7 @@ list_install_components/fast: list_install_components
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache
@@ -103,7 +103,7 @@ rebuild_cache/fast: rebuild_cache
 # Special rule for the target edit_cache
 edit_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/usr/local/Cellar/cmake/3.7.1/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/usr/local/Cellar/cmake/3.7.2/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -114,7 +114,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target install/local
 install/local: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local
 
 # Special rule for the target install/local
@@ -125,7 +125,7 @@ install/local/fast: install/local
 # Special rule for the target test
 test:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
-	/usr/local/Cellar/cmake/3.7.1/bin/ctest --force-new-ctest-process $(ARGS)
+	/usr/local/Cellar/cmake/3.7.2/bin/ctest --force-new-ctest-process $(ARGS)
 .PHONY : test
 
 # Special rule for the target test

data/ext/commonmarker/cmark/build/src/CMakeFiles/Export/lib/cmake/cmark-release.cmake

@@ -18,7 +18,7 @@ list(APPEND _IMPORT_CHECK_FILES_FOR_cmark "${_IMPORT_PREFIX}/bin/cmark" )
 set_property(TARGET libcmark APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 set_target_properties(libcmark PROPERTIES
   IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libcmark.0.27.1.dylib"
-  IMPORTED_SONAME_RELEASE "@rpath/libcmark.0.27.1.dylib"
+  IMPORTED_SONAME_RELEASE "libcmark.0.27.1.dylib"
   )
 
 list(APPEND _IMPORT_CHECK_TARGETS libcmark )

data/ext/commonmarker/cmark/build/src/CMakeFiles/cmark.dir/build.make

@@ -34,10 +34,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.1/bin/cmake
+CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.2/bin/cmake
 
 # The command to remove a file.
-RM = /usr/local/Cellar/cmake/3.7.1/bin/cmake -E remove -f
+RM = /usr/local/Cellar/cmake/3.7.2/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =

data/ext/commonmarker/cmark/build/src/CMakeFiles/cmark.dir/link.txt

@@ -1 +1 @@
-/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc  -fPIC -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic -O3 -DNDEBUG -Wl,-search_paths_first -Wl,-headerpad_max_install_names  CMakeFiles/cmark.dir/main.c.o  -o cmark -Wl,-rpath,/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/src  libcmark.0.27.1.dylib ../extensions/libcmarkextensions.a 
+/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc  -fPIC -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic -O3 -DNDEBUG -Wl,-search_paths_first -Wl,-headerpad_max_install_names  CMakeFiles/cmark.dir/main.c.o  -o cmark  libcmark.0.27.1.dylib ../extensions/libcmarkextensions.a 

data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark.dir/build.make

@@ -34,10 +34,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.1/bin/cmake
+CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.2/bin/cmake
 
 # The command to remove a file.
-RM = /usr/local/Cellar/cmake/3.7.1/bin/cmake -E remove -f
+RM = /usr/local/Cellar/cmake/3.7.2/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =

data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark.dir/link.txt

@@ -1 +1 @@
-/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc  -fPIC -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic -O3 -DNDEBUG -dynamiclib -Wl,-headerpad_max_install_names -compatibility_version 0.27.1 -current_version 0.27.1 -o libcmark.0.27.1.dylib -install_name @rpath/libcmark.0.27.1.dylib CMakeFiles/libcmark.dir/cmark.c.o CMakeFiles/libcmark.dir/node.c.o CMakeFiles/libcmark.dir/iterator.c.o CMakeFiles/libcmark.dir/blocks.c.o CMakeFiles/libcmark.dir/inlines.c.o CMakeFiles/libcmark.dir/scanners.c.o CMakeFiles/libcmark.dir/utf8.c.o CMakeFiles/libcmark.dir/buffer.c.o CMakeFiles/libcmark.dir/references.c.o CMakeFiles/libcmark.dir/render.c.o CMakeFiles/libcmark.dir/man.c.o CMakeFiles/libcmark.dir/xml.c.o CMakeFiles/libcmark.dir/html.c.o CMakeFiles/libcmark.dir/commonmark.c.o CMakeFiles/libcmark.dir/latex.c.o CMakeFiles/libcmark.dir/houdini_href_e.c.o CMakeFiles/libcmark.dir/houdini_html_e.c.o CMakeFiles/libcmark.dir/houdini_html_u.c.o CMakeFiles/libcmark.dir/cmark_ctype.c.o CMakeFiles/libcmark.dir/arena.c.o CMakeFiles/libcmark.dir/linked_list.c.o CMakeFiles/libcmark.dir/syntax_extension.c.o CMakeFiles/libcmark.dir/registry.c.o CMakeFiles/libcmark.dir/plugin.c.o 
+/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc  -fPIC -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic -O3 -DNDEBUG -dynamiclib -Wl,-headerpad_max_install_names -compatibility_version 0.27.1 -current_version 0.27.1 -o libcmark.0.27.1.dylib -install_name /Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/src/libcmark.0.27.1.dylib CMakeFiles/libcmark.dir/cmark.c.o CMakeFiles/libcmark.dir/node.c.o CMakeFiles/libcmark.dir/iterator.c.o CMakeFiles/libcmark.dir/blocks.c.o CMakeFiles/libcmark.dir/inlines.c.o CMakeFiles/libcmark.dir/scanners.c.o CMakeFiles/libcmark.dir/utf8.c.o CMakeFiles/libcmark.dir/buffer.c.o CMakeFiles/libcmark.dir/references.c.o CMakeFiles/libcmark.dir/render.c.o CMakeFiles/libcmark.dir/man.c.o CMakeFiles/libcmark.dir/xml.c.o CMakeFiles/libcmark.dir/html.c.o CMakeFiles/libcmark.dir/commonmark.c.o CMakeFiles/libcmark.dir/latex.c.o CMakeFiles/libcmark.dir/houdini_href_e.c.o CMakeFiles/libcmark.dir/houdini_html_e.c.o CMakeFiles/libcmark.dir/houdini_html_u.c.o CMakeFiles/libcmark.dir/cmark_ctype.c.o CMakeFiles/libcmark.dir/arena.c.o CMakeFiles/libcmark.dir/linked_list.c.o CMakeFiles/libcmark.dir/syntax_extension.c.o CMakeFiles/libcmark.dir/registry.c.o CMakeFiles/libcmark.dir/plugin.c.o 

data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/C.includecache

@@ -195,6 +195,8 @@ cmark.h
 -
 render.h
 -
+buffer.h
+-
 
 /Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/src/commonmark.c
 stdlib.h

data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/build.make

@@ -34,10 +34,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.1/bin/cmake
+CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.2/bin/cmake
 
 # The command to remove a file.
-RM = /usr/local/Cellar/cmake/3.7.1/bin/cmake -E remove -f
+RM = /usr/local/Cellar/cmake/3.7.2/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =

data/ext/commonmarker/cmark/build/src/Makefile

@@ -39,10 +39,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.1/bin/cmake
+CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.2/bin/cmake
 
 # The command to remove a file.
-RM = /usr/local/Cellar/cmake/3.7.1/bin/cmake -E remove -f
+RM = /usr/local/Cellar/cmake/3.7.2/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
@@ -59,7 +59,7 @@ CMAKE_BINARY_DIR = /Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker
 # Special rule for the target install/strip
 install/strip: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip
 
 # Special rule for the target install/strip
@@ -70,13 +70,13 @@ install/strip/fast: install/strip
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
 # Special rule for the target list_install_components
@@ -92,7 +92,7 @@ list_install_components/fast: list_install_components
 # Special rule for the target edit_cache
 edit_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/usr/local/Cellar/cmake/3.7.1/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/usr/local/Cellar/cmake/3.7.2/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -103,7 +103,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target install/local
 install/local: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local
 
 # Special rule for the target install/local
@@ -114,7 +114,7 @@ install/local/fast: install/local
 # Special rule for the target test
 test:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
-	/usr/local/Cellar/cmake/3.7.1/bin/ctest --force-new-ctest-process $(ARGS)
+	/usr/local/Cellar/cmake/3.7.2/bin/ctest --force-new-ctest-process $(ARGS)
 .PHONY : test
 
 # Special rule for the target test
@@ -125,7 +125,7 @@ test/fast: test
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache

data/ext/commonmarker/cmark/build/src/cmake_install.cmake

@@ -27,16 +27,12 @@ if(NOT CMAKE_INSTALL_COMPONENT)
   endif()
 endif()
 
-if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
-  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" TYPE FILE FILES "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/src/libcmark.pc")
-endif()
-
 if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
   file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE EXECUTABLE FILES "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/src/cmark")
   if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cmark" AND
      NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cmark")
-    execute_process(COMMAND /usr/bin/install_name_tool
-      -delete_rpath "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/src"
+    execute_process(COMMAND "/usr/bin/install_name_tool"
+      -change "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/src/libcmark.0.27.1.dylib" "libcmark.0.27.1.dylib"
       "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cmark")
     if(CMAKE_INSTALL_DO_STRIP)
       execute_process(COMMAND "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/cmark")
@@ -55,6 +51,9 @@ if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMP
       )
     if(EXISTS "${file}" AND
        NOT IS_SYMLINK "${file}")
+      execute_process(COMMAND "/usr/bin/install_name_tool"
+        -id "libcmark.0.27.1.dylib"
+        "${file}")
       if(CMAKE_INSTALL_DO_STRIP)
         execute_process(COMMAND "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip" "${file}")
       endif()
@@ -70,6 +69,10 @@ if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMP
   endif()
 endif()
 
+if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" TYPE FILE FILES "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/src/libcmark.pc")
+endif()
+
 if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
   file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include" TYPE FILE FILES
     "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/src/cmark.h"

data/ext/commonmarker/cmark/build/testdir/CTestTestfile.cmake

@@ -8,10 +8,10 @@ add_test(api_test "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker
 add_test(html_normalization "/usr/local/bin/python3" "-m" "doctest" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/normalize.py")
 add_test(spectest_library "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/spec_tests.py" "--no-normalize" "--spec" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/spec.txt" "--library-dir" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src")
 add_test(pathological_tests_library "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/pathological_tests.py" "--library-dir" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src")
+add_test(roundtriptest_library "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/roundtrip_tests.py" "--spec" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/spec.txt" "--library-dir" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src")
+add_test(entity_library "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/entity_tests.py" "--library-dir" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src")
 add_test(spectest_executable "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/spec_tests.py" "--no-normalize" "--spec" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/spec.txt" "--program" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src/cmark")
 add_test(smartpuncttest_executable "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/spec_tests.py" "--no-normalize" "--spec" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/smart_punct.txt" "--program" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src/cmark --smart")
 add_test(extensions_executable "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/spec_tests.py" "--no-normalize" "--spec" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/extensions.txt" "--program" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src/cmark -e table -e strikethrough -e autolink -e tagfilter")
-add_test(roundtriptest_library "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/roundtrip_tests.py" "--spec" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/spec.txt" "--library-dir" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src")
 add_test(roundtrip_extensions_executable "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/roundtrip_tests.py" "--spec" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/extensions.txt" "--program" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src/cmark -e table -e strikethrough -e autolink -e tagfilter")
 add_test(regressiontest_executable "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/spec_tests.py" "--no-normalize" "--spec" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/regression.txt" "--program" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src/cmark")
-add_test(entity_executable "/usr/local/bin/python3" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/test/entity_tests.py" "--library-dir" "/Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker/cmark/build/testdir/../src")

data/ext/commonmarker/cmark/build/testdir/Makefile

@@ -39,10 +39,10 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.1/bin/cmake
+CMAKE_COMMAND = /usr/local/Cellar/cmake/3.7.2/bin/cmake
 
 # The command to remove a file.
-RM = /usr/local/Cellar/cmake/3.7.1/bin/cmake -E remove -f
+RM = /usr/local/Cellar/cmake/3.7.2/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
@@ -59,7 +59,7 @@ CMAKE_BINARY_DIR = /Users/kivikakk/Code/gjtorikian/commonmarker/ext/commonmarker
 # Special rule for the target install/strip
 install/strip: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
 .PHONY : install/strip
 
 # Special rule for the target install/strip
@@ -70,13 +70,13 @@ install/strip/fast: install/strip
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
 # Special rule for the target list_install_components
@@ -92,7 +92,7 @@ list_install_components/fast: list_install_components
 # Special rule for the target rebuild_cache
 rebuild_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : rebuild_cache
 
 # Special rule for the target rebuild_cache
@@ -103,7 +103,7 @@ rebuild_cache/fast: rebuild_cache
 # Special rule for the target edit_cache
 edit_cache:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/usr/local/Cellar/cmake/3.7.1/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	/usr/local/Cellar/cmake/3.7.2/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
@@ -114,7 +114,7 @@ edit_cache/fast: edit_cache
 # Special rule for the target install/local
 install/local: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/usr/local/Cellar/cmake/3.7.1/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+	/usr/local/Cellar/cmake/3.7.2/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
 .PHONY : install/local
 
 # Special rule for the target install/local
@@ -125,7 +125,7 @@ install/local/fast: install/local
 # Special rule for the target test
 test:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
-	/usr/local/Cellar/cmake/3.7.1/bin/ctest --force-new-ctest-process $(ARGS)
+	/usr/local/Cellar/cmake/3.7.2/bin/ctest --force-new-ctest-process $(ARGS)
 .PHONY : test
 
 # Special rule for the target test

data/ext/commonmarker/cmark/src/CMakeLists.txt

@@ -57,25 +57,11 @@ set(PROGRAM_SOURCES
   main.c
   )
 
-# We make LIB_INSTALL_DIR configurable rather than
-# hard-coding lib, because on some OSes different locations
-# are used for different architectures (e.g. /usr/lib64 on
-# 64-bit Fedora).
-if(NOT LIB_INSTALL_DIR)
-  set(LIB_INSTALL_DIR "lib" CACHE STRING
-  "Set the installation directory for libraries." FORCE)
-endif(NOT LIB_INSTALL_DIR)
-
 include_directories(. ${CMAKE_CURRENT_BINARY_DIR})
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmark_version.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/cmark_version.h)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc
-  DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-
 include (GenerateExportHeader)
 
 add_executable(${PROGRAM} ${PROGRAM_SOURCES})
@@ -106,27 +92,46 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR ${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
 endif ()
 
-add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
-add_library(${STATICLIBRARY} STATIC ${LIBRARY_SOURCES})
-# Include minor version and patch level in soname for now.
-set_target_properties(${LIBRARY} PROPERTIES
+if (CMARK_SHARED)
+  add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
+  # Include minor version and patch level in soname for now.
+  set_target_properties(${LIBRARY} PROPERTIES
   OUTPUT_NAME "cmark"
   SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
   VERSION ${PROJECT_VERSION})
-set_target_properties(${STATICLIBRARY} PROPERTIES
+
+  set_property(TARGET ${LIBRARY}
+    APPEND PROPERTY MACOSX_RPATH true)
+
+  # Avoid name clash between PROGRAM and LIBRARY pdb files.
+  set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark_dll)
+
+  generate_export_header(${LIBRARY}
+    BASE_NAME ${PROJECT_NAME})
+
+  list(APPEND CMARK_INSTALL ${LIBRARY})
+endif()
+
+if (CMARK_STATIC)
+  add_library(${STATICLIBRARY} STATIC ${LIBRARY_SOURCES})
+  set_target_properties(${STATICLIBRARY} PROPERTIES
   COMPILE_FLAGS -DCMARK_STATIC_DEFINE
   POSITION_INDEPENDENT_CODE ON)
 
-if (MSVC)
+  if (MSVC)
   set_target_properties(${STATICLIBRARY} PROPERTIES
     OUTPUT_NAME "cmark_static"
     VERSION ${PROJECT_VERSION})
-else()
+  else()
   set_target_properties(${STATICLIBRARY} PROPERTIES
     OUTPUT_NAME "cmark"
     VERSION ${PROJECT_VERSION})
 endif(MSVC)
 
+target_link_libraries(cmark ${CMAKE_DL_LIBS})
+
+  list(APPEND CMARK_INSTALL ${STATICLIBRARY})
+endif()
 set_property(TARGET ${LIBRARY}
   APPEND PROPERTY MACOSX_RPATH true)
 
@@ -142,15 +147,22 @@ if (MSVC)
 endif(MSVC)
 
 set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+
 include (InstallRequiredSystemLibraries)
-install(TARGETS ${PROGRAM} ${LIBRARY} ${STATICLIBRARY}
+install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
   EXPORT cmark
   RUNTIME DESTINATION bin
-  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+  LIBRARY DESTINATION lib${LIB_SUFFIX}
+  ARCHIVE DESTINATION lib${LIB_SUFFIX}
   )
 
-install(FILES
+if(CMARK_SHARED OR CMARK_STATIC)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc @ONLY)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc
+    DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+
+  install(FILES
   cmark.h
   cmark_extension_api.h
   ${CMAKE_CURRENT_BINARY_DIR}/cmark_export.h
@@ -158,7 +170,8 @@ install(FILES
   DESTINATION include
   )
 
-install(EXPORT cmark DESTINATION ${LIB_INSTALL_DIR}/cmake)
+  install(EXPORT cmark DESTINATION lib${LIB_SUFFIX}/cmake)
+endif()
 
 # Feature tests
 include(CheckIncludeFile)