duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMake cleanup

Browse source
This commit is contained in:
Clownacy 2020-03-14 23:03:47 +00:00
parent 720466826b
commit 066f4988d3
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -250,10 +250,6 @@ else()
list(APPEND RESOURCES "BITMAP/pixel.bmp" "FONT/LiberationMono.ttf") list(APPEND RESOURCES "BITMAP/pixel.bmp" "FONT/LiberationMono.ttf")
endif() endif()
if(NOT WIN32)
list(APPEND RESOURCES "ICON/ICON_MINI.bmp")
endif()
if(FIX_BUGS) if(FIX_BUGS)
target_compile_definitions(CSE2 PRIVATE FIX_BUGS) target_compile_definitions(CSE2 PRIVATE FIX_BUGS)
endif() endif()
@ -334,6 +330,11 @@ if(MSVC)
target_compile_options(CSE2 PRIVATE "/utf-8") target_compile_options(CSE2 PRIVATE "/utf-8")
endif() endif()
# On Windows, we use native icons instead
if(NOT WIN32)
list(APPEND RESOURCES "ICON/ICON_MINI.bmp")
endif()
################## ##################
# Misc. settings # # Misc. settings #
@ -452,9 +453,6 @@ ExternalProject_Add(bin2h
CMAKE_ARGS CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DWARNINGS=${WARNINGS}
-DWARNINGS_ALL=${WARNINGS_ALL}
-DWARNINGS_FATAL=${WARNINGS_FATAL}
INSTALL_COMMAND INSTALL_COMMAND
${CMAKE_COMMAND} --build . --config Release --target install ${CMAKE_COMMAND} --build . --config Release --target install
) )