libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NX build fixes

This commit is contained in:
Jack Andersen 2018-10-06 16:51:06 -10:00
parent 488acc8675
commit 44e4e5a376
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -130,7 +130,7 @@ add_library(athena-wiisave EXCLUDE_FROM_ALL
include/md5.h include/md5.h
include/sha1.h include/sha1.h
) )
if(NOT MSVC AND NOT GEKKO) if(NOT MSVC AND NOT GEKKO AND NOT NX)
set_source_files_properties(src/aes.cpp PROPERTIES COMPILE_FLAGS -maes) set_source_files_properties(src/aes.cpp PROPERTIES COMPILE_FLAGS -maes)
endif() endif()
@ -243,7 +243,7 @@ install(EXPORT AthenaTargets DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT athena)
# atdna import # # atdna import #
################ ################
if(NOT GEKKO) if(NOT GEKKO AND NOT NX)
add_subdirectory(atdna) add_subdirectory(atdna)
# Test target # Test target
atdna(atdna_test.cpp atdna/test.hpp) atdna(atdna_test.cpp atdna/test.hpp)

4
atdna/CMakeLists.txt
View File

@ -181,7 +181,7 @@ endif()
####################### #######################
# Super handy macro for adding atdna target # Super handy macro for adding atdna target
macro(atdna out) function(atdna out)
# Ninja wants invocations in root binary dir for DEPFILE application # Ninja wants invocations in root binary dir for DEPFILE application
file(RELATIVE_PATH out_rel ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/${out}") file(RELATIVE_PATH out_rel ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/${out}")
@ -255,6 +255,6 @@ macro(atdna out)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Generating DNA ${out_rel}") COMMENT "Generating DNA ${out_rel}")
endif() endif()
endmacro() endfunction()
endif() endif()

4
atdna/atdnaConfig.cmake.in
View File

@ -9,7 +9,7 @@ if(NOT TARGET atdna AND NOT atdna_BINARY_DIR)
endif() endif()
# Super handy macro for adding atdna target # Super handy macro for adding atdna target
macro(atdna out) function(atdna out)
# Ninja wants invocations in root binary dir for DEPFILE application # Ninja wants invocations in root binary dir for DEPFILE application
file(RELATIVE_PATH out_rel ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/${out}") file(RELATIVE_PATH out_rel ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/${out}")
@ -80,5 +80,5 @@ macro(atdna out)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Generating DNA ${out_rel}") COMMENT "Generating DNA ${out_rel}")
endif() endif()
endmacro() endfunction()