New upstream version 5.3.0GAupstream/5.3.0GAupstream

1 files changed, 48 insertions, 42 deletions

diff --git a/app/wlib/mswlib/CMakeLists.txt b/app/wlib/mswlib/CMakeLists.txt
index 99ac1d4..1d8464a 100644
--- a/app/wlib/mswlib/CMakeLists.txt
+++ b/app/wlib/mswlib/CMakeLists.txt
@@ -1,51 +1,57 @@
-find_package(FreeImage REQUIRED)
-
-FILE(GLOB HEADERS *.h)
-
-SET(SOURCES
-	backgnd.c
-	getopt.c
-	mswbox.c
-	mswbutt.c
-	mswbitmap.c
-	mswchoic.c
-	mswcolor.c
-	mswdraw.c
-	mswedit.c
-	mswlines.c
-	mswlist.c
-	mswmenu.c
-	mswmisc.c
-	mswmsg.c
-	mswpref.c
-	mswprint.c
-	mswsplash.c
-	mswstatus.c
-	mswtext.c
-	gwin32.c
-	simple-gettext.c
-	utf8conv.c
+#
+# build the Win32 variant of the wlib
+#
+
+
+
+if(XTRKCAD_USE_GETTEXT)
+	if(WIN32)
+		add_definitions(-DUSE_SIMPLE_GETTEXT )
+	endif(WIN32)
+endif(XTRKCAD_USE_GETTEXT)
+
+target_sources(xtrkcad-wlib
+	PRIVATE 
+		backgnd.c
+		getopt.c
+		mswbox.c
+		mswbutt.c
+		mswbitmap.c
+		mswchoic.c
+		mswcolor.c
+		mswdraw.c
+		mswedit.c
+		mswlines.c
+		mswlist.c
+		mswmenu.c
+		mswmisc.c
+		mswmsg.c
+		mswpref.c
+		mswprint.c
+		mswsplash.c
+		mswstatus.c
+		mswtext.c
+		gwin32.c
+		simple-gettext.c
+		sysinfo.c
+		utf8conv.c	
+		mswint.h
+		dynarr.h
+		getline/getline.c
 	)
 
-include_directories(${FREEIMAGE_INCLUDE_PATH})
-INCLUDE_DIRECTORIES(${XTrkCAD_BINARY_DIR})
-# INCLUDE_DIRECTORIES(${help_BINARY_DIR})
-
-IF(XTRKCAD_USE_GETTEXT)
-	IF(WIN32)
-		ADD_DEFINITIONS(-DUSE_SIMPLE_GETTEXT )
-	ENDIF(WIN32)
-ENDIF(XTRKCAD_USE_GETTEXT)
-
-ADD_LIBRARY(xtrkcad-wlib ${HEADERS} ${SOURCES})
-
-TARGET_LINK_LIBRARIES(xtrkcad-wlib Htmlhelp msimg32 shlwapi)
-target_link_libraries(xtrkcad-wlib ${FREEIMAGE_LIBRARY})
+target_link_libraries(xtrkcad-wlib 
+	PRIVATE
+	Htmlhelp 
+	msimg32 
+	shlwapi
+	FreeImage::FreeImage
+)
 
 install(FILES
 	${FREEIMAGE_SHAREDLIB}
 	DESTINATION ${XTRKCAD_BIN_INSTALL_DIR}
-	)
+)
 
 if(XTRKCAD_TESTING AND CMOCKA_FOUND)
 	add_subdirectory( unittest )