Attempt at more modern CMake and updated github actions

pguyot · Feb 9, 2024 · 41d244a · 41d244a
1 parent e3c39ff
commit 41d244a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/.github/workflows/mswindows.yml b/.github/workflows/mswindows.yml
@@ -15,14 +15,14 @@ jobs:
     runs-on: windows-latest
     steps:
     - name: Get sources
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Get FLTK
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: fltk/fltk
         path: fltk
     - name: Get newt64
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: MatthiasWM/NEWT64
         path: newt64

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -232,10 +232,7 @@ if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" )
 	)
 	target_link_libraries ( Einstein
 		${system_libs}
-		fltk
-		fltk_images
-		fltk_png
-		fltk_z
+		PRIVATE fltk::fltk fltk::images fltk::png fltk::z
 		pthread
 		"-framework AddressBook"
 		"-framework AudioUnit"
@@ -245,7 +242,7 @@ if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" )
 	)
 	target_link_libraries ( EinsteinTests
 		${system_libs}
-		fltk
+		PRIVATE fltk::fltk
 		pthread
 		"-framework AddressBook"
 		"-framework AudioUnit"
@@ -301,15 +298,12 @@ elseif ( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL
 	)
 	target_link_libraries ( Einstein
 		${system_libs}
-		fltk
-		fltk_images
-		fltk_png
-		fltk_z
+		PRIVATE fltk::fltk fltk::images fltk::png fltk::z
 		pthread
 	)
 	target_link_libraries ( EinsteinTests
 		${system_libs}
-		fltk
+		PRIVATE fltk::fltk
 		pthread
 	)
 
@@ -382,16 +376,13 @@ elseif ( WIN32 )
 	)
 	target_link_libraries ( Einstein
 		${system_libs}
-		fltk
-		fltk_images
-		fltk_png
-		fltk_z
+		PRIVATE fltk::fltk fltk::images fltk::png fltk::z
 		winmm
 		gdiplus
 	)
 	target_link_libraries ( EinsteinTests
 		${system_libs}
-		fltk
+		PRIVATE fltk::fltk
 		gdiplus
 	)