From ab924e8955b0ec02d271d1ba2ebeca2226a692ff Mon Sep 17 00:00:00 2001 From: kichikuou Date: Mon, 15 Jul 2019 12:53:59 +0900 Subject: [PATCH] Enable more modules --- modules/CMakeLists.txt | 10 ++++++++++ modules/Gpx/CMakeLists.txt | 1 - modules/Math/CMakeLists.txt | 2 -- modules/MsgSkip/CMakeLists.txt | 3 +++ modules/ShArray/CMakeLists.txt | 3 +++ modules/ShCalc/CMakeLists.txt | 3 +++ modules/ShGraph/CMakeLists.txt | 3 +++ modules/ShPort/CMakeLists.txt | 3 +++ modules/ShSound/CMakeLists.txt | 3 +++ modules/ShString/CMakeLists.txt | 3 +++ modules/dDemo/CMakeLists.txt | 5 +++++ modules/lib/CMakeLists.txt | 4 +++- 12 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 modules/MsgSkip/CMakeLists.txt create mode 100644 modules/ShArray/CMakeLists.txt create mode 100644 modules/ShCalc/CMakeLists.txt create mode 100644 modules/ShGraph/CMakeLists.txt create mode 100644 modules/ShPort/CMakeLists.txt create mode 100644 modules/ShSound/CMakeLists.txt create mode 100644 modules/ShString/CMakeLists.txt create mode 100644 modules/dDemo/CMakeLists.txt diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 4529056..42bbf82 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -4,6 +4,16 @@ if (APPLE) add_link_options("SHELL:-undefined dynamic_lookup") endif() +include_directories(${CMAKE_SOURCE_DIR}/src) + add_subdirectory(lib) +add_subdirectory(dDemo) add_subdirectory(Gpx) add_subdirectory(Math) +add_subdirectory(MsgSkip) +add_subdirectory(ShArray) +add_subdirectory(ShCalc) +add_subdirectory(ShGraph) +add_subdirectory(ShPort) +# add_subdirectory(ShSound) +add_subdirectory(ShString) diff --git a/modules/Gpx/CMakeLists.txt b/modules/Gpx/CMakeLists.txt index 67ba360..38efb59 100644 --- a/modules/Gpx/CMakeLists.txt +++ b/modules/Gpx/CMakeLists.txt @@ -1,6 +1,5 @@ add_library(Gpx MODULE Gpx.c effectcopy.c) target_link_libraries(Gpx PRIVATE graph) -target_include_directories(Gpx PRIVATE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/modules/lib) install(TARGETS Gpx DESTINATION lib/xsystem35) diff --git a/modules/Math/CMakeLists.txt b/modules/Math/CMakeLists.txt index c9cea45..4122de3 100644 --- a/modules/Math/CMakeLists.txt +++ b/modules/Math/CMakeLists.txt @@ -1,5 +1,3 @@ add_library(Math MODULE Math.c) -target_include_directories(Math PRIVATE ${CMAKE_SOURCE_DIR}/src) - install(TARGETS Math DESTINATION lib/xsystem35) diff --git a/modules/MsgSkip/CMakeLists.txt b/modules/MsgSkip/CMakeLists.txt new file mode 100644 index 0000000..6dc4037 --- /dev/null +++ b/modules/MsgSkip/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(MsgSkip MODULE MsgSkip.c) + +install(TARGETS MsgSkip DESTINATION lib/xsystem35) diff --git a/modules/ShArray/CMakeLists.txt b/modules/ShArray/CMakeLists.txt new file mode 100644 index 0000000..86671ad --- /dev/null +++ b/modules/ShArray/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(ShArray MODULE ShArray.c) + +install(TARGETS ShArray DESTINATION lib/xsystem35) diff --git a/modules/ShCalc/CMakeLists.txt b/modules/ShCalc/CMakeLists.txt new file mode 100644 index 0000000..b1bf505 --- /dev/null +++ b/modules/ShCalc/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(ShCalc MODULE ShCalc.c) + +install(TARGETS ShCalc DESTINATION lib/xsystem35) diff --git a/modules/ShGraph/CMakeLists.txt b/modules/ShGraph/CMakeLists.txt new file mode 100644 index 0000000..8b14e8b --- /dev/null +++ b/modules/ShGraph/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(ShGraph MODULE ShGraph.c) + +install(TARGETS ShGraph DESTINATION lib/xsystem35) diff --git a/modules/ShPort/CMakeLists.txt b/modules/ShPort/CMakeLists.txt new file mode 100644 index 0000000..09d0e24 --- /dev/null +++ b/modules/ShPort/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(ShPort MODULE ShPort.c) + +install(TARGETS ShPort DESTINATION lib/xsystem35) diff --git a/modules/ShSound/CMakeLists.txt b/modules/ShSound/CMakeLists.txt new file mode 100644 index 0000000..9d16690 --- /dev/null +++ b/modules/ShSound/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(ShSound MODULE ShSound.c) + +install(TARGETS ShSound DESTINATION lib/xsystem35) diff --git a/modules/ShString/CMakeLists.txt b/modules/ShString/CMakeLists.txt new file mode 100644 index 0000000..3e7af6f --- /dev/null +++ b/modules/ShString/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(ShString MODULE ShString.c) + +install(TARGETS ShString DESTINATION lib/xsystem35) diff --git a/modules/dDemo/CMakeLists.txt b/modules/dDemo/CMakeLists.txt new file mode 100644 index 0000000..c01e40b --- /dev/null +++ b/modules/dDemo/CMakeLists.txt @@ -0,0 +1,5 @@ +add_library(dDemo MODULE dDemo.c) + +target_link_libraries(dDemo PRIVATE graph alk) + +install(TARGETS dDemo DESTINATION lib/xsystem35) diff --git a/modules/lib/CMakeLists.txt b/modules/lib/CMakeLists.txt index 54f88dd..d484049 100644 --- a/modules/lib/CMakeLists.txt +++ b/modules/lib/CMakeLists.txt @@ -27,4 +27,6 @@ add_library(alk STATIC alk.c) add_library(drawtext STATIC drawtext.c) -include_directories(${CMAKE_SOURCE_DIR}/src) +target_include_directories(graph PUBLIC .) +target_include_directories(alk PUBLIC .) +target_include_directories(drawtext PUBLIC .)