ref: 066f4988d30f8380a9aec5e72734165d6dd71637
parent: 720466826bd034126f7727ec1e9c77c66f9e574e
author: Clownacy <[email protected]>
date: Sat Mar 14 19:03:47 EDT 2020
CMake cleanup
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,10 +250,6 @@
list(APPEND RESOURCES "BITMAP/pixel.bmp" "FONT/LiberationMono.ttf")
endif()
-if(NOT WIN32)
- list(APPEND RESOURCES "ICON/ICON_MINI.bmp")
-endif()
-
if(FIX_BUGS)
target_compile_definitions(CSE2 PRIVATE FIX_BUGS)
endif()
@@ -334,7 +330,12 @@
target_compile_options(CSE2 PRIVATE "/utf-8")
endif()
+# On Windows, we use native icons instead
+if(NOT WIN32)
+ list(APPEND RESOURCES "ICON/ICON_MINI.bmp")
+endif()
+
##################
# Misc. settings #
##################
@@ -452,9 +453,6 @@
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=Release
- -DWARNINGS=${WARNINGS}- -DWARNINGS_ALL=${WARNINGS_ALL}- -DWARNINGS_FATAL=${WARNINGS_FATAL}INSTALL_COMMAND
${CMAKE_COMMAND} --build . --config Release --target install)