AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better CMake dependency handling

This commit is contained in:
Jack Andersen 2019-06-11 16:03:12 -10:00
parent 47a7383c6d
commit 1dd7f604f0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hecl-gui/CMakeLists.txt
View File

@ -34,8 +34,6 @@ file(GLOB QUAZIP_SRCS quazip/quazip/*.c quazip/quazip/*.cpp quazip/quazip/*.h)
list(REMOVE_ITEM QUAZIP_SRCS list(REMOVE_ITEM QUAZIP_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quagzipfile.cpp ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quagzipfile.cpp
${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quagzipfile.h) ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quagzipfile.h)
include_directories(quazip/quazip)
add_definitions(-DQUAZIP_STATIC=1)
add_executable(hecl-gui WIN32 MACOSX_BUNDLE add_executable(hecl-gui WIN32 MACOSX_BUNDLE
ArgumentEditor.ui ArgumentEditor.cpp ArgumentEditor.hpp ArgumentEditor.ui ArgumentEditor.cpp ArgumentEditor.hpp
@ -54,11 +52,18 @@ if(COMMAND add_sanitizers)
add_sanitizers(hecl-gui) add_sanitizers(hecl-gui)
endif() endif()
if (NOT MSVC)
target_compile_options(hecl-gui PRIVATE -Wno-misleading-indentation)
endif()
set_target_properties(hecl-gui PROPERTIES set_target_properties(hecl-gui PROPERTIES
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/platforms/mac/Info.plist") MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/platforms/mac/Info.plist")
target_include_directories(hecl-gui PRIVATE quazip/quazip)
target_compile_definitions(hecl-gui PRIVATE QUAZIP_STATIC=1)
target_link_libraries(hecl-gui ${PLAT_LIBS} target_link_libraries(hecl-gui ${PLAT_LIBS}
${Qt5Widgets_LIBRARIES} ${Qt5Widgets_LIBRARIES}
${Qt5Network_LIBRARIES} ${Qt5Network_LIBRARIES}
${Qt5Xml_LIBRARIES} ${Qt5Xml_LIBRARIES}
hecl-light logvisor zeus athena-core athena-libyaml xxhash z) hecl-light logvisor zeus athena-core xxhash z)

2
hecl-gui/platforms/freedesktop/CMakeLists.txt
View File

@ -1,6 +1,6 @@
include_directories(${LIBPNG_INCLUDE_DIR})
add_executable(mkqticon mkqticon.c) add_executable(mkqticon mkqticon.c)
target_link_libraries(mkqticon ${PNG_LIB} ${ZLIB_LIBRARIES}) target_link_libraries(mkqticon ${PNG_LIB} ${ZLIB_LIBRARIES})
target_include_directories(mkqticon PRIVATE ${LIBPNG_INCLUDE_DIR})
macro(declare_qticon_target) macro(declare_qticon_target)
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/hecl-gui/platforms/freedesktop/mainicon_qt.bin add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/hecl-gui/platforms/freedesktop/mainicon_qt.bin