all repos — mgba @ fc01e1ac4f4b09a901c5231a966cf1b9aa119cce

mGBA Game Boy Advance Emulator

All: Fix Windows configure
Jeffrey Pfau jeffrey@endrift.com
Sat, 06 Jun 2015 14:29:03 -0700
commit

fc01e1ac4f4b09a901c5231a966cf1b9aa119cce

parent

3cffc1076a3613428ae5038d999cc2c0ad0e8d63

1 files changed, 3 insertions(+), 3 deletions(-)

jump to
M CMakeLists.txtCMakeLists.txt

@@ -98,7 +98,7 @@ set(VERSION_STRING ${LIB_VERSION_ABI}-${VERSION_STRING})

endif() endif() -add_custom_target(version ALL touch ${CMAKE_SOURCE_DIR}/src/util/version.c.in +add_custom_target(version-info ALL touch ${CMAKE_SOURCE_DIR}/src/util/version.c.in COMMAND ${CMAKE_COMMAND} -DGIT_COMMIT=${GIT_COMMIT} -DGIT_COMMIT_SHORT=${GIT_COMMIT_SHORT}

@@ -363,13 +363,13 @@ if(BUILD_STATIC)

add_library(${BINARY_NAME}-static STATIC ${SRC}) set_target_properties(${BINARY_NAME}-static PROPERTIES COMPILE_DEFINITIONS "${FEATURE_DEFINES}") install(TARGETS ${BINARY_NAME}-static DESTINATION lib COMPONENT lib${BINARY_NAME}) - add_dependencies(${BINARY_NAME}-static version) + add_dependencies(${BINARY_NAME}-static version-info) endif() else() add_library(${BINARY_NAME} STATIC ${SRC}) endif() -add_dependencies(${BINARY_NAME} version) +add_dependencies(${BINARY_NAME} version-info) target_link_libraries(${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB}) install(TARGETS ${BINARY_NAME} DESTINATION lib COMPONENT lib${BINARY_NAME})