Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1

1 files changed, 28 insertions, 26 deletions

diff --git a/app/cornu/CMakeLists.txt b/app/cornu/CMakeLists.txt
index b54fc80..4e7e7d3 100644
--- a/app/cornu/CMakeLists.txt
+++ b/app/cornu/CMakeLists.txt
@@ -1,27 +1,29 @@
-PROJECT(cornu)
-
-FILE(GLOB HEADERS *.h)
-
-SET(SOURCES
-	bezctx.c
-	bezctx_xtrkcad.c
-	spiroentrypoints.c
-	spiro.c
-	)
+project(cornu)
 	
-SET(HEADERS 
-	spiro.h
-	)
-
-
-INCLUDE_DIRECTORIES(${XTrkCAD_BINARY_DIR})
-INCLUDE_DIRECTORIES(${XTrkCAD_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${wlib_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${help_BINARY_DIR})
-
-ADD_LIBRARY(xtrkcad-cornu ${HEADERS} ${SOURCES})
-
-
-
-
-
+add_library(xtrkcad-cornu "")
+
+target_sources(xtrkcad-cornu
+	PRIVATE
+		bezctx.c
+		bezctx_xtrkcad.c
+		spiroentrypoints.c
+		spiro.c
+		bezctx.h
+		bezctx_intf.h
+		zmisc.h	
+)
+
+target_sources(xtrkcad-cornu
+	PUBLIC
+		bezctx_xtrkcad.h
+		spiroentrypoints.h
+		spiro.h
+)
+
+target_link_libraries(xtrkcad-cornu
+	PRIVATE
+		xtrkcad-wlib
+		xtrkcad-lib
+)
+
+target_include_directories(xtrkcad-cornu PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")