ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: Use add_executable when not cross-compiling.

This commit is contained in:
orbea 2019-10-06 08:31:26 -07:00 committed by Rafael Kitover
parent 61520df789
commit abff89e4fb
2 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cmake/HostCompile.cmake
View File

@ -1,29 +1,25 @@
function(host_compile src dst_cmd) function(host_compile src dst_cmd)
unset(link_flags) if(CMAKE_CROSSCOMPILING)
unset(link_flags)
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
if(NOT dst MATCHES "\\.[Ee][Xx][Ee]\$")
set(dst "${dst_cmd}.exe") set(dst "${dst_cmd}.exe")
if(CMAKE_COMPILER_IS_GNUCXX)
set(link_flags -Wl,--subsystem,console)
endif()
else()
set(dst "${dst_cmd}")
endif() endif()
if(CMAKE_COMPILER_IS_GNUCXX)
set(link_flags -Wl,--subsystem,console)
endif()
else()
set(dst "${dst_cmd}")
endif()
if(NOT MSVC)
# assume cc foo.c -o foo # will work on most hosts # assume cc foo.c -o foo # will work on most hosts
set(compile_command cc ${src} -o ${dst} ${link_flags}) add_custom_command(
OUTPUT "${dst}"
COMMAND cc ${src} -o ${dst} ${link_flags}
DEPENDS "${src}"
)
else() else()
# special case for Visual Studio get_filename_component(dst "${dst_cmd}" NAME)
set(compile_command ${CMAKE_C_COMPILER} ${src} /link "/out:${dst}") add_executable("${dst}" "${src}")
endif() endif()
add_custom_command(
OUTPUT "${dst}"
COMMAND ${compile_command}
DEPENDS "${src}"
)
endfunction() endfunction()

21
src/wx/CMakeLists.txt
View File

@ -524,20 +524,15 @@ set(XRC_SOURCES
# wxrc does not support xrs files in -c output (> 10x compression) # wxrc does not support xrs files in -c output (> 10x compression)
# we do it using the bin2c.c utility # we do it using the bin2c.c utility
set(BIN2C ${CMAKE_BINARY_DIR}/bin2c) if(CMAKE_CROSSCOMPILING)
set(BIN2C ${CMAKE_BINARY_DIR}/bin2c)
if(NOT MSVC)
include(HostCompile)
host_compile(${CMAKE_CURRENT_SOURCE_DIR}/bin2c.c ${BIN2C})
set(BIN2C_DEP ${BIN2C})
else() else()
# on the appveyor visual studio environment, cl.exe cannot be run from set(BIN2C bin2c)
# cmake
add_executable(bin2c ${CMAKE_CURRENT_SOURCE_DIR}/bin2c.c)
set(BIN2C bin2c)
set(BIN2C_DEP bin2c)
endif() endif()
include(HostCompile)
host_compile(${CMAKE_CURRENT_SOURCE_DIR}/bin2c.c ${BIN2C})
if(WXRC) if(WXRC)
separate_arguments(WXRC UNIX_COMMAND ${WXRC}) separate_arguments(WXRC UNIX_COMMAND ${WXRC})
elseif(DEFINED ENV{WXRC}) elseif(DEFINED ENV{WXRC})
@ -613,14 +608,14 @@ add_custom_command(
add_custom_command( add_custom_command(
OUTPUT builtin-xrc.h OUTPUT builtin-xrc.h
COMMAND ${BIN2C} wxvbam.xrs builtin-xrc.h builtin_xrs COMMAND ${BIN2C} wxvbam.xrs builtin-xrc.h builtin_xrs
DEPENDS wxvbam.xrs ${BIN2C_DEP} DEPENDS wxvbam.xrs ${BIN2C}
) )
# use a built-in vba-over.ini if no config file present # use a built-in vba-over.ini if no config file present
add_custom_command( add_custom_command(
OUTPUT builtin-over.h OUTPUT builtin-over.h
COMMAND ${BIN2C} ${CMAKE_CURRENT_SOURCE_DIR}/../vba-over.ini builtin-over.h builtin_over COMMAND ${BIN2C} ${CMAKE_CURRENT_SOURCE_DIR}/../vba-over.ini builtin-over.h builtin_over
DEPENDS ../vba-over.ini ${BIN2C_DEP} DEPENDS ../vba-over.ini ${BIN2C}
) )
# I don't like duplicating/triplicating code, so I only declare # I don't like duplicating/triplicating code, so I only declare