Mercurial > minori

diff CMakeLists.txt @ 202:71832ffe425a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
animia: re-add kvm fd source this is all being merged from my wildly out-of-date laptop. SORRY! in other news, I edited the CI file to install the wayland client as well, so the linux CI build might finally get wayland stuff.
author Paper <paper@paper.us.eu.org>
date Tue, 02 Jan 2024 06:05:06 -0500
parents 8f6f8dd2eb23 975a3f0965e2
children 53211cb1e7f5
line wrap: on
line diff
--- a/CMakeLists.txt	Sun Nov 19 19:13:28 2023 -0500
+++ b/CMakeLists.txt	Tue Jan 02 06:05:06 2024 -0500
@@ -1,10 +1,6 @@
 cmake_minimum_required(VERSION 3.18)
 project(minori LANGUAGES CXX VERSION 0.1.0)
 
-if(APPLE)
-	enable_language(OBJCXX)
-endif()
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
@@ -43,8 +39,9 @@
 
 # We need Cocoa for some OS X stuff
 if(APPLE)
-	find_library(COCOA_LIBRARY Cocoa)
-	list(APPEND LIBRARIES ${COCOA_LIBRARY})
+	find_library(FOUNDATION_LIBRARY Foundation)
+	find_library(APPKIT_LIBRARY AppKit)
+	list(APPEND LIBRARIES ${FOUNDATION_LIBRARY} ${APPKIT_LIBRARY})
 endif()
 
 set(SRC_FILES
@@ -103,7 +100,6 @@
 	src/services/anilist.cc
 
 	# Tracking
-	src/track/constants.cc
 	src/track/media.cc
 
 	# Qt resources
@@ -127,7 +123,6 @@
 
 set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/rc/locale")
 
-# dumb little hack to get this working on Qt5 and Qt6
 if(UPDATE_TRANSLATIONS)
 	cmake_language(CALL qt${QT_VERSION_MAJOR}_create_translation ${SRC_FILES} ${TS_FILES} OPTIONS "-I${CMAKE_CURRENT_SOURCE_DIR}/include")
 endif()
@@ -162,8 +157,8 @@
 	set_source_files_properties(${app_icon_osx} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
 	list(APPEND SRC_FILES
-		src/sys/osx/dark_theme.mm
-		src/sys/osx/filesystem.mm
+		src/sys/osx/dark_theme.cc
+		src/sys/osx/filesystem.cc
 		${app_icon_osx}
 	)
 elseif(WIN32) # Windows
@@ -199,6 +194,7 @@
 target_compile_options(minori PRIVATE -Wall -Wpedantic -Wextra -Wsuggest-override -Wold-style-cast)
 if(APPLE)
 	target_compile_definitions(minori PUBLIC MACOSX)
+	set_target_properties(minori PROPERTIES MACOSX_BUNDLE TRUE)
 elseif(WIN32)
 	target_compile_definitions(minori PUBLIC WIN32)
 endif()