CMake cleanup
This commit is contained in:
parent
720466826b
commit
066f4988d3
1 changed files with 5 additions and 7 deletions
|
@ -250,10 +250,6 @@ else()
|
|||
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,6 +330,11 @@ if(MSVC)
|
|||
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 @@ ExternalProject_Add(bin2h
|
|||
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
|
||||
)
|
||||
|
|
Loading…
Add table
Reference in a new issue