Browse Source

simplify build

master
alistair 3 years ago
parent
commit
33e1c0ef45
  1. 6
      .gitmodules
  2. 10
      CMakeLists.txt
  3. 1
      lib/MultiMarkdown-6

6
.gitmodules vendored

@ -1,3 +1,9 @@ @@ -1,3 +1,9 @@
[submodule "lib/syntect-c"]
path = lib/syntect-c
url = git@git.topost.net:alistair/syntect-c.git
[submodule "MultiMarkdown-6"]
path = MultiMarkdown-6
url = https://github.com/fletcher/MultiMarkdown-6.git
[submodule "lib/MultiMarkdown-6"]
path = lib/MultiMarkdown-6
url = https://github.com/fletcher/MultiMarkdown-6.git

10
CMakeLists.txt

@ -3,6 +3,7 @@ project (stgen3) @@ -3,6 +3,7 @@ project (stgen3)
# specify the C++ standard
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_CXX_EXTENSIONS False)
set(CMAKE_CXX_EXTENSIONS OFF)
set(BUILD_SHARED_LIBS OFF)
@ -33,6 +34,8 @@ FetchContent_MakeAvailable(spdlog) @@ -33,6 +34,8 @@ FetchContent_MakeAvailable(spdlog)
FetchContent_MakeAvailable(tinyxml2)
FetchContent_MakeAvailable(lexbor)
add_subdirectory(lib/MultiMarkdown-6)
if(NOT TARGET tinyxml2) # Stand-alone build
find_package(tinyxml2 REQUIRED)
endif()
@ -62,17 +65,14 @@ add_custom_command( @@ -62,17 +65,14 @@ add_custom_command(
message("defaults-h")
)
add_definitions(${GLIB_CFLAGS_OTHER})
target_link_libraries(stgen3 PRIVATE tinyxml2)
target_link_libraries(stgen3 PRIVATE ${CMAKE_SOURCE_DIR}/MultiMarkdown/build/libMultiMarkdown.a)
target_link_libraries(stgen3 PRIVATE ${CMAKE_SOURCE_DIR}/build/MultiMarkdown-6/libMultiMarkdown.a)
target_link_libraries(stgen3 PRIVATE ${CMAKE_SOURCE_DIR}/lib/syntect-c/target/release/libcyntct.a)
target_link_libraries(stgen3 PRIVATE pthread dl)
target_link_libraries(stgen3 PRIVATE tinyxml2)
target_link_libraries(stgen3 PRIVATE lexbor)
target_link_libraries(stgen3 PRIVATE lexbor_static.a)
install(TARGETS stgen3)

1
lib/MultiMarkdown-6

@ -0,0 +1 @@ @@ -0,0 +1 @@
Subproject commit ccb06067e1603036f92a5a1768952b22a61ecddc
Loading…
Cancel
Save