cmake fixes
-Whitespace fixes -Binaries installation fixes
This commit is contained in:
parent
24d2521914
commit
d6228254cf
|
@ -276,10 +276,10 @@ if( ENABLE_NLS )
|
|||
IF(ENABLE_LINK)
|
||||
FIND_PATH(LIBINTL_INC libintl.h )
|
||||
FIND_LIBRARY(LIBINTL_LIB intl )
|
||||
IF(LIBINTL_LIB)
|
||||
IF(LIBINTL_LIB)
|
||||
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBINTL_LIB})
|
||||
SET(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${LIBINTL_LIB})
|
||||
ENDIF(LIBINTL_LIB)
|
||||
ENDIF(LIBINTL_LIB)
|
||||
INCLUDE(CheckFunctionExists)
|
||||
CHECK_FUNCTION_EXISTS(gettext GETTEXT_FN)
|
||||
IF(NOT LIBINTL_INC OR NOT GETTEXT_FN)
|
||||
|
@ -674,25 +674,27 @@ IF( ENABLE_SDL )
|
|||
${WIN32_LIBRARIES}
|
||||
${LIRC_CLIENT_LIBRARY}
|
||||
)
|
||||
IF( WIN32 )
|
||||
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
|
||||
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
|
||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}
|
||||
RENAME vbam.cfg)
|
||||
ELSE( WIN32 )
|
||||
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
|
||||
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
|
||||
DESTINATION ${SYSCONF_INSTALL_DIR}
|
||||
RENAME vbam.cfg)
|
||||
ENDIF( WIN32 )
|
||||
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
|
||||
|
||||
IF( WIN32 )
|
||||
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
|
||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}
|
||||
RENAME vbam.cfg)
|
||||
ELSE( WIN32 )
|
||||
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
|
||||
DESTINATION ${SYSCONF_INSTALL_DIR}
|
||||
RENAME vbam.cfg)
|
||||
ENDIF( WIN32 )
|
||||
ENDIF( ENABLE_SDL )
|
||||
|
||||
IF( ENABLE_GTK OR ENABLE_GTK3 )
|
||||
add_subdirectory (src/gtk)
|
||||
add_subdirectory (src/gtk)
|
||||
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gvbam${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
|
||||
ENDIF( ENABLE_GTK OR ENABLE_GTK3 )
|
||||
|
||||
IF( ENABLE_WX )
|
||||
add_subdirectory(src/wx)
|
||||
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
|
||||
ENDIF( ENABLE_WX )
|
||||
|
||||
if( ENABLE_GTK OR ENABLE_GTK3 OR ENABLE_WX )
|
||||
|
@ -708,7 +710,9 @@ ENDIF(NOT APPLE)
|
|||
|
||||
# manual pages
|
||||
IF( UNIX )
|
||||
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
|
||||
IF( ENABLE_SDL )
|
||||
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
|
||||
ENDIF( ENABLE_SDL )
|
||||
IF( ENABLE_GTK OR ENABLE_GTK3 )
|
||||
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
|
||||
ENDIF( ENABLE_GTK OR ENABLE_GTK3 )
|
||||
|
|
Loading…
Reference in New Issue