From b623f5953691b2a0614e6f1f4def86bdbb9a4113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 8 Aug 2020 11:53:00 +0200
Subject: New upstream version 5.2.0Beta2.1

---
 app/wlib/mswlib/CMakeLists.txt | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'app/wlib/mswlib/CMakeLists.txt')

diff --git a/app/wlib/mswlib/CMakeLists.txt b/app/wlib/mswlib/CMakeLists.txt
index 82d8371..07558f9 100644
--- a/app/wlib/mswlib/CMakeLists.txt
+++ b/app/wlib/mswlib/CMakeLists.txt
@@ -1,12 +1,13 @@
+find_package(FreeImage REQUIRED)
+
 FILE(GLOB HEADERS *.h)
 
 SET(SOURCES
-#	checksum.c
+	backgnd.c
 	getopt.c
 	mswbox.c
 	mswbutt.c
 	mswbitmap.c
-	mswchksm.c
 	mswchoic.c
 	mswcolor.c
 	mswdraw.c
@@ -19,14 +20,15 @@ SET(SOURCES
 	mswpref.c
 	mswprint.c
 	mswsplash.c
-	mswstatus.c 
+	mswstatus.c
 	mswtext.c
 	gwin32.c
 	simple-gettext.c
+	utf8conv.c
 	)
 
+include_directories(${FREEIMAGE_INCLUDE_PATH})
 INCLUDE_DIRECTORIES(${XTrkCAD_BINARY_DIR})
-# INCLUDE_DIRECTORIES(${XTRKCAD_BINARY_DIR})
 
 IF(XTRKCAD_USE_GETTEXT)
 	IF(WIN32)
@@ -37,4 +39,13 @@ 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})
+
+install(FILES
+	${FREEIMAGE_SHAREDLIB}
+	DESTINATION ${XTRKCAD_BIN_INSTALL_DIR}
+	)
 
+if(XTRKCAD_TESTING AND CMOCKA_FOUND)
+	add_subdirectory( unittest )
+endif()
-- 
cgit v1.2.3