From 358925ec028bcdb312616ffebf427eda595896cd Mon Sep 17 00:00:00 2001
From: Gulliver <gulliver@fargonauten.de>
Date: Wed, 10 Sep 2014 14:08:44 +0200
Subject: added initial version of cmake build-files
---
src/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 src/CMakeLists.txt
(limited to 'src/CMakeLists.txt')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..c454eca
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,34 @@
+set(PROGRAM_stmd "stmd")
+set(PROGRAM_stmd_SOURCES blocks.c
+inlines.c
+main.c
+debug.h
+detab.c
+bstrlib.c
+bstrlib.h
+getopt.c
+html.c
+
+
+print.c
+scanners.h
+scanners.re
+stmd.h
+utf8.c
+utf8.h
+uthash.h
+)
+
+add_executable(${PROGRAM_stmd}
+ ${PROGRAM_stmd_SOURCES})
+
+if (MSVC)
+set_property(TARGET ${PROGRAM_chronolog}
+ APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
+target_link_libraries(${PROGRAM_chronolog} gdiplus.lib)
+endif(MSVC)
+install(TARGETS ${PROGRAM_chronolog}
+RUNTIME DESTINATION bin
+BUNDLE DESTINATION Applications)
+
+
--
cgit v1.2.3
From 0a40eea051e5b61c954f32025df21a475b0ee111 Mon Sep 17 00:00:00 2001
From: Gulliver <gulliver@fargonauten.de>
Date: Wed, 10 Sep 2014 17:24:27 +0200
Subject: added scanner.c to sources and special rule for it to build it from
scanner.re (added setting RE2C which contains the path to needed re2c
utilitity)
---
src/CMakeLists.txt | 55 ++++++++++++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 22 deletions(-)
(limited to 'src/CMakeLists.txt')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c454eca..35de787 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,33 +1,44 @@
set(PROGRAM_stmd "stmd")
-set(PROGRAM_stmd_SOURCES blocks.c
-inlines.c
-main.c
-debug.h
-detab.c
-bstrlib.c
-bstrlib.h
-getopt.c
-html.c
-
-
-print.c
-scanners.h
-scanners.re
-stmd.h
-utf8.c
-utf8.h
-uthash.h
+set(PROGRAM_stmd_SOURCES blocks.c
+ inlines.c
+ main.c
+ debug.h
+ detab.c
+ bstrlib.c
+ bstrlib.h
+ getopt.c
+ html.c
+ print.c
+ scanners.h
+ scanners.c
+ scanners.re
+ stmd.h
+ utf8.c
+ utf8.h
+ uthash.h
)
+if (MSVC)
+ file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} DOS_CURRENT_SOURCE_DIR)
+ add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/scanners.c
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re
+ COMMAND ${RE2C} --case-insensitive -b -i ${DOS_CURRENT_SOURCE_DIR}\\scanners.re >${DOS_CURRENT_SOURCE_DIR}\\scanners.c)
+else(MSVC)
+ add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/scanners.c
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re
+ COMMAND ${RE2C} --case-insensitive -b -i ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re >${CMAKE_CURRENT_SOURCE_DIR}/scanners.c)
+endif(MSVC)
+
add_executable(${PROGRAM_stmd}
${PROGRAM_stmd_SOURCES})
if (MSVC)
-set_property(TARGET ${PROGRAM_chronolog}
- APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
-target_link_libraries(${PROGRAM_chronolog} gdiplus.lib)
+set_property(TARGET PROGRAM_stmd
+ APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
+# if sometimes libs are needed ...
+#target_link_libraries(${PROGRAM_chronolog})
endif(MSVC)
-install(TARGETS ${PROGRAM_chronolog}
+install(TARGETS PROGRAM_stmd
RUNTIME DESTINATION bin
BUNDLE DESTINATION Applications)
--
cgit v1.2.3
From 0a8ab28bed8cef7ff594fd7ab15bd4d300c0fee2 Mon Sep 17 00:00:00 2001
From: Gulliver <gulliver@fargonauten.de>
Date: Thu, 11 Sep 2014 18:49:14 +0200
Subject: fixed using variable ${PROGRAM_stmd}
---
src/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/CMakeLists.txt')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 35de787..3b8b770 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,12 +33,12 @@ add_executable(${PROGRAM_stmd}
${PROGRAM_stmd_SOURCES})
if (MSVC)
-set_property(TARGET PROGRAM_stmd
+set_property(TARGET ${PROGRAM_stmd}
APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
# if sometimes libs are needed ...
#target_link_libraries(${PROGRAM_chronolog})
endif(MSVC)
-install(TARGETS PROGRAM_stmd
+install(TARGETS ${PROGRAM_stmd}
RUNTIME DESTINATION bin
BUNDLE DESTINATION Applications)
--
cgit v1.2.3
From 7e0b564af9ea4aaa35feced8c6fda6a97c7f8948 Mon Sep 17 00:00:00 2001
From: Gulliver <gulliver@fargonauten.de>
Date: Thu, 11 Sep 2014 20:31:59 +0200
Subject: using only includes from system
---
src/CMakeLists.txt | 95 ++++++++++++++++++++++++++++--------------------------
1 file changed, 50 insertions(+), 45 deletions(-)
(limited to 'src/CMakeLists.txt')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b8b770..203e5bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,45 +1,50 @@
-set(PROGRAM_stmd "stmd")
-set(PROGRAM_stmd_SOURCES blocks.c
- inlines.c
- main.c
- debug.h
- detab.c
- bstrlib.c
- bstrlib.h
- getopt.c
- html.c
- print.c
- scanners.h
- scanners.c
- scanners.re
- stmd.h
- utf8.c
- utf8.h
- uthash.h
-)
-
-if (MSVC)
- file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} DOS_CURRENT_SOURCE_DIR)
- add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/scanners.c
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re
- COMMAND ${RE2C} --case-insensitive -b -i ${DOS_CURRENT_SOURCE_DIR}\\scanners.re >${DOS_CURRENT_SOURCE_DIR}\\scanners.c)
-else(MSVC)
- add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/scanners.c
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re
- COMMAND ${RE2C} --case-insensitive -b -i ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re >${CMAKE_CURRENT_SOURCE_DIR}/scanners.c)
-endif(MSVC)
-
-add_executable(${PROGRAM_stmd}
- ${PROGRAM_stmd_SOURCES})
-
-if (MSVC)
-set_property(TARGET ${PROGRAM_stmd}
- APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
-# if sometimes libs are needed ...
-#target_link_libraries(${PROGRAM_chronolog})
-endif(MSVC)
-install(TARGETS ${PROGRAM_stmd}
-RUNTIME DESTINATION bin
-BUNDLE DESTINATION Applications)
-
-
+set(PROGRAM_stmd "stmd")
+set(PROGRAM_stmd_SOURCES blocks.c
+ inlines.c
+ main.c
+ debug.h
+ getopt.c
+ print.c
+ scanners.h
+ scanners.c
+ scanners.re
+ stmd.h
+ utf8.h utf8.c
+ buffer.h buffer.c
+ references.h references.c
+ html/html.c
+ html/html_unescape.h
+ html/html_unescape.gperf
+ html/houdini.h
+ html/houdini_href_e.c
+ html/houdini_html_e.c
+ html/houdini_html_u.c
+)
+
+include_directories(. html)
+
+if (MSVC)
+ file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} DOS_CURRENT_SOURCE_DIR)
+ add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/scanners.c
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re
+ COMMAND ${RE2C} --case-insensitive -b -i ${DOS_CURRENT_SOURCE_DIR}\\scanners.re >${DOS_CURRENT_SOURCE_DIR}\\scanners.c)
+else(MSVC)
+ add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/scanners.c
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re
+ COMMAND ${RE2C} --case-insensitive -b -i ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re >${CMAKE_CURRENT_SOURCE_DIR}/scanners.c)
+endif(MSVC)
+
+add_executable(${PROGRAM_stmd}
+ ${PROGRAM_stmd_SOURCES})
+
+if (MSVC)
+set_property(TARGET ${PROGRAM_stmd}
+ APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
+# if sometimes libs are needed ...
+#target_link_libraries(${PROGRAM_chronolog})
+endif(MSVC)
+install(TARGETS ${PROGRAM_stmd}
+RUNTIME DESTINATION bin
+BUNDLE DESTINATION /Applications)
+
+
--
cgit v1.2.3
From d8a5baa9aef8761f8ebe8218da88234e308d709f Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 25 Oct 2014 21:55:15 -0700
Subject: Removed obsolete src/getopt.c; modified CMake build accordingly.
---
src/CMakeLists.txt | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
(limited to 'src/CMakeLists.txt')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 100bf28..2258178 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,23 +3,25 @@ set(PROGRAM_cmark_SOURCES blocks.c
inlines.c
main.c
debug.h
- getopt.c
print.c
scanners.h
scanners.c
scanners.re
cmark.h
- utf8.h utf8.c
- buffer.h buffer.c
- references.h references.c
- html/html.c
- html/html_unescape.h
- html/html_unescape.gperf
- html/houdini.h
- html/houdini_href_e.c
- html/houdini_html_e.c
- html/houdini_html_u.c
-)
+ utf8.h
+ utf8.c
+ buffer.h
+ buffer.c
+ references.h
+ references.c
+ html/html.c
+ html/html_unescape.h
+ html/html_unescape.gperf
+ html/houdini.h
+ html/houdini_href_e.c
+ html/houdini_html_e.c
+ html/houdini_html_u.c
+ )
include_directories(. html)
--
cgit v1.2.3
From 995050a54053b32b9a34892f3b86c127d5aad5b9 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 25 Oct 2014 22:47:31 -0700
Subject: CMakeLists tweaks.
Use compiler optimizations, -Wall, -Werror.
---
src/CMakeLists.txt | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
(limited to 'src/CMakeLists.txt')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2258178..aa6ec3d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,17 +36,15 @@ else(MSVC)
COMMAND ${RE2C} --case-insensitive -b -i ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re >${CMAKE_CURRENT_SOURCE_DIR}/scanners.c)
endif(MSVC)
-add_executable(${PROGRAM_cmark}
+add_executable(${PROGRAM_cmark}
${PROGRAM_cmark_SOURCES})
if (MSVC)
-set_property(TARGET ${PROGRAM_cmark}
- APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
+set_property(TARGET ${PROGRAM_cmark}
+ APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
# if sometimes libs are needed ...
#target_link_libraries(${PROGRAM_chronolog})
endif(MSVC)
install(TARGETS ${PROGRAM_cmark}
-RUNTIME DESTINATION bin
+RUNTIME DESTINATION bin
BUNDLE DESTINATION /Applications)
-
-
--
cgit v1.2.3
From 48c64a6ce073fbc4e42761a32840ec1a7def4555 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 6 Nov 2014 22:22:10 -0800
Subject: cmake: Create and install shared library.
---
src/CMakeLists.txt | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
(limited to 'src/CMakeLists.txt')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aa6ec3d..6ab59b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,6 @@
-set(PROGRAM_cmark "cmark")
-set(PROGRAM_cmark_SOURCES blocks.c
+set(LIBRARY_cmark "commonmark")
+set(LIBRARY_cmark_SOURCES blocks.c
inlines.c
- main.c
debug.h
print.c
scanners.h
@@ -22,6 +21,9 @@ set(PROGRAM_cmark_SOURCES blocks.c
html/houdini_html_e.c
html/houdini_html_u.c
)
+set(PROGRAM_cmark "cmark")
+set(PROGRAM_cmark_SOURCES ${LIBRARY_cmark_SOURCES}
+ main.c)
include_directories(. html)
@@ -39,6 +41,11 @@ endif(MSVC)
add_executable(${PROGRAM_cmark}
${PROGRAM_cmark_SOURCES})
+add_library(${LIBRARY_cmark} SHARED ${LIBRARY_cmark_SOURCES})
+
+set_property(TARGET ${LIBRARY_cmark}
+ APPEND PROPERTY MACOSX_RPATH true)
+
if (MSVC)
set_property(TARGET ${PROGRAM_cmark}
APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
@@ -46,5 +53,6 @@ set_property(TARGET ${PROGRAM_cmark}
#target_link_libraries(${PROGRAM_chronolog})
endif(MSVC)
install(TARGETS ${PROGRAM_cmark}
-RUNTIME DESTINATION bin
-BUNDLE DESTINATION /Applications)
+ RUNTIME DESTINATION bin)
+install(TARGETS ${LIBRARY_cmark}
+ LIBRARY DESTINATION lib)
--
cgit v1.2.3
From bc978561c1616985df6a73657db5015822c4b33b Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 6 Nov 2014 23:23:50 -0800
Subject: More cmake improvements.
---
src/CMakeLists.txt | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
(limited to 'src/CMakeLists.txt')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ab59b5..f5fe29d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,28 +1,32 @@
-set(LIBRARY_cmark "commonmark")
-set(LIBRARY_cmark_SOURCES blocks.c
- inlines.c
+set(LIBRARY "commonmark")
+set(HEADERS cmark.h
+ buffer.h
+ chunk.h
+ references.h
debug.h
- print.c
+ utf8.h
scanners.h
+ inlines.h
+ html/html_unescape.h
+ html/houdini.h
+ )
+set(LIBRARY_SOURCES blocks.c
+ inlines.c
+ print.c
scanners.c
scanners.re
- cmark.h
- utf8.h
utf8.c
- buffer.h
buffer.c
- references.h
references.c
html/html.c
- html/html_unescape.h
html/html_unescape.gperf
- html/houdini.h
html/houdini_href_e.c
html/houdini_html_e.c
html/houdini_html_u.c
+ ${HEADERS}
)
-set(PROGRAM_cmark "cmark")
-set(PROGRAM_cmark_SOURCES ${LIBRARY_cmark_SOURCES}
+set(PROGRAM "cmark")
+set(PROGRAM_SOURCES ${LIBRARY_SOURCES}
main.c)
include_directories(. html)
@@ -38,21 +42,20 @@ else(MSVC)
COMMAND ${RE2C} --case-insensitive -b -i ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re >${CMAKE_CURRENT_SOURCE_DIR}/scanners.c)
endif(MSVC)
-add_executable(${PROGRAM_cmark}
- ${PROGRAM_cmark_SOURCES})
+add_executable(${PROGRAM}
+ ${PROGRAM_SOURCES})
-add_library(${LIBRARY_cmark} SHARED ${LIBRARY_cmark_SOURCES})
+add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
-set_property(TARGET ${LIBRARY_cmark}
+set_property(TARGET ${LIBRARY}
APPEND PROPERTY MACOSX_RPATH true)
if (MSVC)
-set_property(TARGET ${PROGRAM_cmark}
+set_property(TARGET ${PROGRAM}
APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
# if sometimes libs are needed ...
#target_link_libraries(${PROGRAM_chronolog})
endif(MSVC)
-install(TARGETS ${PROGRAM_cmark}
- RUNTIME DESTINATION bin)
-install(TARGETS ${LIBRARY_cmark}
+install(TARGETS ${PROGRAM} ${LIBRARY}
+ RUNTIME DESTINATION bin
LIBRARY DESTINATION lib)
--
cgit v1.2.3