From: <tj...@us...> - 2006-07-26 13:43:24
|
Revision: 7400 Author: tjaden Date: 2006-07-26 05:52:37 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/alleg/?rev=7400&view=rev Log Message: ----------- In the CMake build, install modules.lst if Unix modules are enabled. Modified Paths: -------------- allegro/branches/4.3/CMakeLists.txt Modified: allegro/branches/4.3/CMakeLists.txt =================================================================== --- allegro/branches/4.3/CMakeLists.txt 2006-07-26 12:28:55 UTC (rev 7399) +++ allegro/branches/4.3/CMakeLists.txt 2006-07-26 12:52:37 UTC (rev 7400) @@ -741,6 +741,10 @@ audio) endif(SUPPORT_SGIAL) + install(FILES modules.lst + DESTINATION ${ALLEGRO_MODULES_PATH_TAIL} + ) + endif(SUPPORT_MODULES) #-----------------------------------------------------------------------------# This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tj...@us...> - 2006-07-26 14:49:32
|
Revision: 7403 Author: tjaden Date: 2006-07-26 07:12:08 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/alleg/?rev=7403&view=rev Log Message: ----------- Fixed CMake build's handling of modules on Unix. Modified Paths: -------------- allegro/branches/4.3/CMakeLists.txt Modified: allegro/branches/4.3/CMakeLists.txt =================================================================== --- allegro/branches/4.3/CMakeLists.txt 2006-07-26 13:18:49 UTC (rev 7402) +++ allegro/branches/4.3/CMakeLists.txt 2006-07-26 14:12:08 UTC (rev 7403) @@ -24,6 +24,10 @@ #-----------------------------------------------------------------------------# project(ALLEGRO C) + +# TODO soft-code the version number +set(ALLEGRO_VERSION 4.3.1) + include_directories( . include include/allegro) include(FileList) @@ -240,11 +244,10 @@ list(APPEND PLATFORM_LIBS pthread) endif(HAVE_LIBPTHREAD) - # TODO softcode the version number if(SUPPORT_MODULES) - set(ALLEGRO_MODULES_PATH_TAIL lib/allegro/4.3.1) + set(ALLEGRO_MODULES_PATH_TAIL lib/allegro) set(ALLEGRO_MODULES_PATH - \"${CMAKE_INSTALL_PREFIX}${ALLEGRO_MODULES_PATH_TAIL}\" + \"${CMAKE_INSTALL_PREFIX}/${ALLEGRO_MODULES_PATH_TAIL}\" ) endif(SUPPORT_MODULES) @@ -685,7 +688,7 @@ target_link_libraries(${target} ${ARGN}) install(TARGETS ${target} - DESTINATION ${ALLEGRO_MODULES_PATH_TAIL} + DESTINATION ${ALLEGRO_MODULES_PATH_TAIL}/${ALLEGRO_VERSION} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE @@ -693,6 +696,10 @@ ) endmacro(add_module) + install(FILES modules.lst + DESTINATION ${ALLEGRO_MODULES_PATH_TAIL}/${ALLEGRO_VERSION} + ) + if(SUPPORT_FBCON) add_module(alleg-fbcon "${ALLEGRO_MODULE_FBCON_FILES}") endif(SUPPORT_FBCON) @@ -741,10 +748,6 @@ audio) endif(SUPPORT_SGIAL) - install(FILES modules.lst - DESTINATION ${ALLEGRO_MODULES_PATH_TAIL} - ) - endif(SUPPORT_MODULES) #-----------------------------------------------------------------------------# This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tj...@us...> - 2006-07-28 17:56:41
|
Revision: 7410 Author: tjaden Date: 2006-07-28 09:24:59 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/alleg/?rev=7410&view=rev Log Message: ----------- Revert whitespace changes from r7407. Modified Paths: -------------- allegro/branches/4.3/CMakeLists.txt Modified: allegro/branches/4.3/CMakeLists.txt =================================================================== --- allegro/branches/4.3/CMakeLists.txt 2006-07-28 15:56:25 UTC (rev 7409) +++ allegro/branches/4.3/CMakeLists.txt 2006-07-28 16:24:59 UTC (rev 7410) @@ -139,8 +139,7 @@ check_function_exists(getexecname ALLEGRO_SYS_GETEXECNAME) set(ALLEGRO_HAVE_GETEXECNAME ${ALLEGRO_SYS_GETEXECNAME}) - # ^ what's goin on here? That'll be set automatically with the check_function exists? - # ??? both are used in the source + # ??? both are used in the source check_function_exists(memcmp HAVE_MEMCMP) check_function_exists(mkstemp HAVE_MKSTEMP) check_function_exists(mmap HAVE_MMAP) @@ -153,32 +152,32 @@ check_type_size("_Bool" HAVE__BOOL) check_c_source_compiles(" -#include <sys/procfs.h> + #include <sys/procfs.h> int main(void) { struct prpsinfo psinfo; psinfo.pr_argc = 0; return 0; - }" + }" ALLEGRO_HAVE_PROCFS_ARGCV ) check_c_source_compiles(" -#include <sys/procfs.h> -#include <sys/ioctl.h> + #include <sys/procfs.h> + #include <sys/ioctl.h> int main(void) { struct prpsinfo psinfo; ioctl(0, PIOCPSINFO, &psinfo); return 0; - }" + }" ALLEGRO_HAVE_SV_PROCFS ) check_c_source_compiles(" -#include <time.h> -#include <sys/time.h> + #include <time.h> + #include <sys/time.h> int main(void) { return 0; - }" + }" TIME_WITH_SYS_TIME ) @@ -188,8 +187,8 @@ #-----------------------------------------------------------------------------# if(WANT_ASM) -# TODO check if assembly is support on this platform -# Write up another macro? + # TODO check if assembly is support on this platform + # Write up another macro? set(SUPPORT_ASM 1) @@ -197,14 +196,14 @@ check_MMX(ALLEGRO_MMX) check_SSE(ALLEGRO_SSE) else(WANT_ASM) -# Added it to alplatf.h.cmake, if this isn't wise just uncomment -# and remove the set and the entry in alplatf.h.cmake -#add_definitions(-DALLEGRO_NO_ASM) + # Added it to alplatf.h.cmake, if this isn't wise just uncomment + # and remove the set and the entry in alplatf.h.cmake + #add_definitions(-DALLEGRO_NO_ASM) set(ALLEGRO_NO_ASM 1) endif(WANT_ASM) if(WANT_MODULES) -# Should ask CMake whether it can build modules on this platform. + # Should ask CMake whether it can build modules on this platform. set(ALLEGRO_WITH_MODULES 1) set(SUPPORT_MODULES 1) endif(WANT_MODULES) @@ -219,12 +218,12 @@ # #-----------------------------------------------------------------------------# -# Accumulate extra libraries needed for the platform. -# + # Accumulate extra libraries needed for the platform. + # set(PLATFORM_LIBS) -# Accumulate extra libraries needed due to drivers. -# + # Accumulate extra libraries needed due to drivers. + # set(DRIVER_LIBS_STATIC) set(DRIVER_LIBS_SHARED) @@ -249,20 +248,20 @@ ) endif(SUPPORT_MODULES) -# -# Sound drivers -# + # + # Sound drivers + # if(WANT_ALSADIGI) check_c_source_compiles(" -#include <sys/asoundlib.h> + #include <sys/asoundlib.h> int main(void) { -#if(SND_LIB_MAJOR > 0) || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR == 9 && SND_LIB_SUBMINOR >= 1) + #if(SND_LIB_MAJOR > 0) || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR == 9 && SND_LIB_SUBMINOR >= 1) return 0; -#else + #else return 1; -#endif - }" + #endif + }" SUPPORT_ALSADIGI ) if(SUPPORT_ALSADIGI) @@ -274,14 +273,14 @@ if(WANT_ALSAMIDI) check_c_source_compiles(" -#include <sys/asoundlib.h> + #include <sys/asoundlib.h> int main(void) { -#if(SND_LIB_MAJOR > 0) || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR == 9) + #if(SND_LIB_MAJOR > 0) || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR == 9) return 0; -#else + #else return 1; -#endif - }" + #endif + }" SUPPORT_ALSAMIDI ) if(SUPPORT_ALSAMIDI) @@ -292,7 +291,7 @@ endif(WANT_ALSAMIDI) if(WANT_ARTS) -# XXX artsc doesn't use pkg-config + # XXX artsc doesn't use pkg-config pkgconfig(artsc ARTS_INCLUDEDIR ARTS_LIBDIR ARTS_LINKFLAGS ARTS_CFLAGS @@ -305,7 +304,7 @@ endif(WANT_ARTS) if(WANT_ESD) -# XXX esd doesn't use pkg-config + # XXX esd doesn't use pkg-config pkgconfig(esd ESD_INCLUDEDIR ESD_LIBDIR ESD_LINKFLAGS ESD_CFLAGS @@ -366,22 +365,20 @@ # # TODO check actually on Linux -#if(WANT_LINUX_CONSOLE AND UNIX) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(SUPPORT_LINUX_CONSOLE 1) set(ALLEGRO_LINUX 1) endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") -#endif(WANT_LINUX_CONSOLE AND UNIX) if(SUPPORT_LINUX_CONSOLE) if(WANT_FBCON) check_c_source_compiles(" -#include <linux/fb.h> + #include <linux/fb.h> int main(void) { int x = FB_SYNC_ON_GREEN; return 0; - }" + }" SUPPORT_FBCON ) if(SUPPORT_FBCON) @@ -398,12 +395,12 @@ set(CMAKE_REQUIRED_LIBRARIES vga) check_c_source_compiles(" - #include <vga.h> - int main(void) { - int x = vga_version; - return x; - }" - ALLEGRO_LINUX_SVGALIB_HAVE_VGA_VERSION + #include <vga.h> + int main(void) { + int x = vga_version; + return x; + }" + ALLEGRO_LINUX_SVGALIB_HAVE_VGA_VERSION ) set(CMAKE_REQUIRED_LIBRARIES) endif(WANT_SVGALIB) @@ -496,18 +493,18 @@ # #-----------------------------------------------------------------------------# -# List of source files need to compile Allegro in this configuration on -# this platform. -# + # List of source files need to compile Allegro in this configuration on + # this platform. + # set(LIBRARY_SOURCES ${ALLEGRO_SRC_FILES}) -# Libraries that we always need to link against on this platform -# e.g. -lm on Unix. -# + # Libraries that we always need to link against on this platform + # e.g. -lm on Unix. + # set(PLATFORM_LIBS) -# Whether using hand-written assembly code or C-only. -# + # Whether using hand-written assembly code or C-only. + # if(SUPPORT_ASM) list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_I386_FILES}) else(SUPPORT_ASM) @@ -517,8 +514,8 @@ endif(WIN32) endif(SUPPORT_ASM) -# Assembly code and Windows port both require generated asmdef.inc. -# + # Assembly code and Windows port both require generated asmdef.inc. + # add_executable(asmdef src/i386/asmdef.c) get_target_property(ASMDEF_EXE asmdef LOCATION) @@ -554,7 +551,7 @@ if(WIN32) list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_WIN_FILES}) -# TODO this still needs to be produced with misc/fixdll.sh + # TODO this still needs to be produced with misc/fixdll.sh if(MINGW) list(APPEND LIBRARY_SOURCES lib/mingw32/allegro.def) endif(MINGW) @@ -577,11 +574,11 @@ "-DALLEGRO_LIB_BUILD -DALLEGRO_SRC ${WFLAGS} ${extra_flags}" ) -# -# Assembly files. -# I can't get it to work by adding the asm source file to the library, so -# we add the object file to the library instead. -# + # + # Assembly files. + # I can't get it to work by adding the asm source file to the library, so + # we add the object file to the library instead. + # set(ASM_OBJS) set(ASM_SOURCES) foreach(SOURCE ${LIBRARY_SOURCES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tj...@us...> - 2006-07-29 12:17:10
|
Revision: 7424 Author: tjaden Date: 2006-07-29 05:15:58 -0700 (Sat, 29 Jul 2006) ViewCVS: http://svn.sourceforge.net/alleg/?rev=7424&view=rev Log Message: ----------- Produce allegro-config scripts with sensible values substituted. Modified Paths: -------------- allegro/branches/4.3/CMakeLists.txt Modified: allegro/branches/4.3/CMakeLists.txt =================================================================== --- allegro/branches/4.3/CMakeLists.txt 2006-07-29 11:19:30 UTC (rev 7423) +++ allegro/branches/4.3/CMakeLists.txt 2006-07-29 12:15:58 UTC (rev 7424) @@ -489,16 +489,9 @@ endif(MINGW) if(UNIX) - set(CONFIG_FILE include/allegro/platform/alunixac.h) configure_file(${CONFIG_FILE}.cmake ${CONFIG_FILE}) add_definitions(-DHAVE_CONFIG_H) - - configure_file(misc/allegro-config.in allegro-config) - install(PROGRAMS ${CMAKE_BINARY_DIR}/allegro-config - DESTINATION bin - ) - endif(UNIX) #-----------------------------------------------------------------------------# @@ -782,20 +775,20 @@ # over dynamically linked. It would be worth making this configurable. # if(GRADE_STANDARD) - set(LINK_WITH alleg) + set(LIB_TO_LINK alleg) endif(GRADE_STANDARD) -if(NOT LINK_WITH AND GRADE_DEBUG) - set(LINK_WITH alld) -endif(NOT LINK_WITH AND GRADE_DEBUG) -if(NOT LINK_WITH AND GRADE_PROFILE) - set(LINK_WITH allp) -endif(NOT LINK_WITH AND GRADE_PROFILE) +if(NOT LIB_TO_LINK AND GRADE_DEBUG) + set(LIB_TO_LINK alld) +endif(NOT LIB_TO_LINK AND GRADE_DEBUG) +if(NOT LIB_TO_LINK AND GRADE_PROFILE) + set(LIB_TO_LINK allp) +endif(NOT LIB_TO_LINK AND GRADE_PROFILE) if(STATIC) - set(LINK_WITH ${LINK_WITH}_static) + set(LINK_WITH ${LIB_TO_LINK}_static) set(MAYBE_ALLEGRO_STATICLINK "-DALLEGRO_STATICLINK") else(STATIC) - set(LINK_WITH ${LINK_WITH}_shared) + set(LINK_WITH ${LIB_TO_LINK}_shared) endif(STATIC) macro(add_allegro_executable nm) @@ -814,6 +807,43 @@ #-----------------------------------------------------------------------------# # +# allegro-config script +# +#-----------------------------------------------------------------------------# + +if(UNIX) + + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(INCLUDE_PREFIX "${prefix}") + + if(SHARED) + set(LINK_WITH_STATIC_LIBS no) + else(SHARED) + set(LINK_WITH_STATIC_LIBS yes) + endif(SHARED) + + set(LDFLAGS) + if(SUPPORT_MODULES) + set(LDFLAGS "-Wl,--export-dynamic ${LDFLAGS}") + endif(SUPPORT_MODULES) + + set(LIBS) + foreach(lib ${PLATFORM_LIBS}) + if("${lib}" MATCHES "^-l|^/") + set(LIBS "${LIBS}${lib} ") + else("${lib}" MATCHES "^-l|^/") + set(LIBS "${LIBS}-l${lib} ") + endif("${lib}" MATCHES "^-l|^/") + endforeach(lib) + + configure_file(misc/allegro-config.in allegro-config) + install(PROGRAMS ${CMAKE_BINARY_DIR}/allegro-config + DESTINATION bin + ) +endif(UNIX) + +#-----------------------------------------------------------------------------# +# # Documentation # #-----------------------------------------------------------------------------# This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tj...@us...> - 2006-07-30 12:28:33
|
Revision: 7425 Author: tjaden Date: 2006-07-30 05:28:26 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/alleg/?rev=7425&view=rev Log Message: ----------- CMake: only support Linux console on a Linux system if it is wanted. Modified Paths: -------------- allegro/branches/4.3/CMakeLists.txt Modified: allegro/branches/4.3/CMakeLists.txt =================================================================== --- allegro/branches/4.3/CMakeLists.txt 2006-07-29 12:15:58 UTC (rev 7424) +++ allegro/branches/4.3/CMakeLists.txt 2006-07-30 12:28:26 UTC (rev 7425) @@ -370,11 +370,12 @@ # Linux-specific # -# TODO check actually on Linux -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(SUPPORT_LINUX_CONSOLE 1) - set(ALLEGRO_LINUX 1) -endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") +if(WANT_LINUX_CONSOLE) + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(SUPPORT_LINUX_CONSOLE 1) + set(ALLEGRO_LINUX 1) + endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") +endif(WANT_LINUX_CONSOLE) if(SUPPORT_LINUX_CONSOLE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tj...@us...> - 2006-09-09 04:46:55
|
Revision: 7530 http://svn.sourceforge.net/alleg/?rev=7530&view=rev Author: tjaden Date: 2006-09-08 21:46:47 -0700 (Fri, 08 Sep 2006) Log Message: ----------- CMake build: fix linking problems on Unix when static linking and not using modules (it wasn't linking in libraries needed by optional drivers). Modified Paths: -------------- allegro/branches/4.3/CMakeLists.txt Modified: allegro/branches/4.3/CMakeLists.txt =================================================================== --- allegro/branches/4.3/CMakeLists.txt 2006-09-09 04:21:27 UTC (rev 7529) +++ allegro/branches/4.3/CMakeLists.txt 2006-09-09 04:46:47 UTC (rev 7530) @@ -224,10 +224,6 @@ # #-----------------------------------------------------------------------------# - # Accumulate extra libraries needed for the platform. - # -set(PLATFORM_LIBS) - # Accumulate extra libraries needed due to drivers. # set(DRIVER_LIBS_STATIC) @@ -243,9 +239,6 @@ if(CMAKE_USE_PTHREADS_INIT) set(HAVE_LIBPTHREAD 1) endif(CMAKE_USE_PTHREADS_INIT) - if(HAVE_LIBPTHREAD) - list(APPEND PLATFORM_LIBS pthread) - endif(HAVE_LIBPTHREAD) if(SUPPORT_MODULES) set(ALLEGRO_MODULES_PATH_TAIL lib/allegro) @@ -452,9 +445,9 @@ if(WANT_DGA2) check_library_exists(Xxf86dga XDGAQueryExtension "" ALLEGRO_XWINDOWS_WITH_XF86DGA2) - if(ALLEGRO_XWINDOWS_WITH_XF86DGA2) - list(APPEND DRIVER_LIBS_STATIC "Xxf86dga") - endif(ALLEGRO_XWINDOWS_WITH_XF86DGA2) + if(ALLEGRO_XWINDOWS_WITH_XF86DGA2 AND NOT SUPPORT_MODULES) + list(APPEND X11_LIBRARIES "Xxf86dga") + endif(ALLEGRO_XWINDOWS_WITH_XF86DGA2 AND NOT SUPPORT_MODULES) endif(WANT_DGA2) check_library_exists(X11 XOpenIM "" ALLEGRO_USE_XIM) @@ -549,6 +542,9 @@ if(UNIX) list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_UNIX_FILES}) list(APPEND PLATFORM_LIBS m pthread) + if(NOT SUPPORT_MODULES) + list(APPEND PLATFORM_LIBS "${DRIVER_LIBS_STATIC}") + endif(NOT SUPPORT_MODULES) endif(UNIX) if(SUPPORT_LINUX_CONSOLE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tj...@us...> - 2006-09-09 05:44:07
|
Revision: 7531 http://svn.sourceforge.net/alleg/?rev=7531&view=rev Author: tjaden Date: 2006-09-08 22:43:50 -0700 (Fri, 08 Sep 2006) Log Message: ----------- CMake build: decouple testing of whether a feature can be supported on this system/platform, from whether we *are* supporting it in this build. The former value is cached and so if the user decided to disable a feature which was enabled previously, it would still be enabled. Modified Paths: -------------- allegro/branches/4.3/CMakeLists.txt Modified: allegro/branches/4.3/CMakeLists.txt =================================================================== --- allegro/branches/4.3/CMakeLists.txt 2006-09-09 04:46:47 UTC (rev 7530) +++ allegro/branches/4.3/CMakeLists.txt 2006-09-09 05:43:50 UTC (rev 7531) @@ -224,6 +224,27 @@ # #-----------------------------------------------------------------------------# +# +# These are the conventions for this CMakeFile. +# +# The WANT_* variables indicate whether the user wants to have an optional +# feature enabled, i.e. whether they have selected something in the CMake UI. +# +# The CAN_* variables indicate whether a feature *can* be enabled on this +# system/platform. As these variable values are cached, CAN_ variables could +# be set even though the user has turned a corresponding WANT_* variable +# off---it might have been tested and set in a previous run. +# +# The SUPPORT_* variables are the conjunction of WANT_FEATURE and CAN_FEATURE, +# i.e. the user wants it and the system can support it. +# +# Those variables are internal to the CMake build. Allegro header files use +# preprocessor constants with names like ALLEGRO_WITH_* and HAVE_*. Sometimes +# we make use of those variables in this CMakeFile as well, but generally +# that's just due to sloppiness. +# + + # Accumulate extra libraries needed due to drivers. # set(DRIVER_LIBS_STATIC) @@ -261,13 +282,14 @@ return 1; #endif }" - SUPPORT_ALSADIGI + CAN_ALSADIGI ) - if(SUPPORT_ALSADIGI) + if(CAN_ALSADIGI) + set(SUPPORT_ALSADIGI 1) set(ALLEGRO_WITH_ALSADIGI 1) set(ALLEGRO_ALSA_VERSION 9) list(APPEND DRIVER_LIBS_STATIC asound) - endif(SUPPORT_ALSADIGI) + endif(CAN_ALSADIGI) endif(WANT_ALSADIGI) if(WANT_ALSAMIDI) @@ -280,13 +302,14 @@ return 1; #endif }" - SUPPORT_ALSAMIDI + CAN_ALSAMIDI ) - if(SUPPORT_ALSAMIDI) + if(CAN_ALSAMIDI) + set(SUPPORT_ALSAMIDI 1) set(ALLEGRO_WITH_ALSAMIDI 1) set(ALLEGRO_ALSA_VERSION 9) list(APPEND DRIVER_LIBS_STATIC asound) - endif(SUPPORT_ALSAMIDI) + endif(CAN_ALSAMIDI) endif(WANT_ALSAMIDI) if(WANT_ARTS) @@ -340,6 +363,7 @@ set(ALLEGRO_WITH_OSSMIDI 1) endif(WANT_OSSMIDI) + # XXX we assume that if libossaudio exists then we need to use it. check_library_exists(ossaudio _oss_ioctl "" HAVE_LIBOSSAUDIO) if(HAVE_LIBOSSAUDIO) list(APPEND DRIVER_LIBS_STATIC ossaudio) @@ -350,11 +374,12 @@ HAVE_MACHINE_SOUNDCARD_H OR HAVE_LINUX_SOUNDCARD_H) if(WANT_SGIAL) - check_library_exists(audio alOpenPort "" SUPPORT_SGIAL) - if(SUPPORT_SGIAL) + check_library_exists(audio alOpenPort "" CAN_SGIAL) + if(CAN_SGIAL) + set(SUPPORT_SGIAL 1) set(ALLEGRO_WITH_SGIALDIGI 1) list(append DRIVER_LIBS_STATIC audio) - endif(SUPPORT_SGIAL) + endif(CAN_SGIAL) endif(WANT_SGIAL) endif(UNIX) @@ -379,19 +404,21 @@ int x = FB_SYNC_ON_GREEN; return 0; }" - SUPPORT_FBCON + CAN_FBCON ) - if(SUPPORT_FBCON) + if(CAN_FBCON) + set(SUPPORT_FBCON 1) set(ALLEGRO_LINUX_FBCON 1) - endif(SUPPORT_FBCON) + endif(CAN_FBCON) endif(WANT_FBCON) if(WANT_SVGALIB) - check_library_exists(vga vga_init "" SUPPORT_SVGALIB) - if(SUPPORT_SVGALIB) + check_library_exists(vga vga_init "" CAN_SVGALIB) + if(CAN_SVGALIB) + set(SUPPORT_SVGALIB 1) set(ALLEGRO_LINUX_SVGALIB 1) list(APPEND DRIVER_LIBS_STATIC vga) - endif(SUPPORT_SVGALIB) + endif(CAN_SVGALIB) set(CMAKE_REQUIRED_LIBRARIES vga) check_c_source_compiles(" @@ -427,39 +454,45 @@ if(SUPPORT_X11) set(CMAKE_REQUIRED_LIBRARIES ${X11_LIBRARIES}) - check_library_exists(Xext XShmQueryExtension "" - ALLEGRO_XWINDOWS_WITH_SHM) + check_library_exists(Xext XShmQueryExtension "" CAN_XSHM) + if(CAN_XSHM) + set(ALLEGRO_XWINDOWS_WITH_SHM 1) + endif(CAN_XSHM) - check_library_exists(Xcursor XcursorImageCreate "" - ALLEGRO_XWINDOWS_WITH_XCURSOR) - if(ALLEGRO_XWINDOWS_WITH_XCURSOR) + check_library_exists(Xcursor XcursorImageCreate "" CAN_XCURSOR) + if(CAN_XCURSOR) + set(ALLEGRO_XWINDOWS_WITH_XCURSOR 1) list(APPEND X11_LIBRARIES "Xcursor") - endif(ALLEGRO_XWINDOWS_WITH_XCURSOR) + endif(CAN_XCURSOR) - check_library_exists(Xxf86vm XF86VidModeQueryExtension "" - ALLEGRO_XWINDOWS_WITH_XF86VIDMODE) - if(ALLEGRO_XWINDOWS_WITH_XF86VIDMODE) + check_library_exists(Xxf86vm XF86VidModeQueryExtension "" CAN_XF86VIDMODE) + if(CAN_XF86VIDMODE) + set(ALLEGRO_XWINDOWS_WITH_XF86VIDMODE 1) list(APPEND X11_LIBRARIES "Xxf86vm") - endif(ALLEGRO_XWINDOWS_WITH_XF86VIDMODE) + endif(CAN_XF86VIDMODE) if(WANT_DGA2) - check_library_exists(Xxf86dga XDGAQueryExtension "" - ALLEGRO_XWINDOWS_WITH_XF86DGA2) - if(ALLEGRO_XWINDOWS_WITH_XF86DGA2 AND NOT SUPPORT_MODULES) - list(APPEND X11_LIBRARIES "Xxf86dga") - endif(ALLEGRO_XWINDOWS_WITH_XF86DGA2 AND NOT SUPPORT_MODULES) + check_library_exists(Xxf86dga XDGAQueryExtension "" CAN_XF86DGA) + if(CAN_XF86DGA) + set(SUPPORT_DGA2 1) + set(ALLEGRO_XWINDOWS_WITH_XF86DGA2 1) + if(NOT SUPPORT_MODULES) + list(APPEND X11_LIBRARIES "Xxf86dga") + endif(NOT SUPPORT_MODULES) + endif(CAN_XF86DGA) endif(WANT_DGA2) - check_library_exists(X11 XOpenIM "" ALLEGRO_USE_XIM) + check_library_exists(X11 XOpenIM "" CAN_XIM) + if(CAN_XIM) + set(ALLEGRO_USE_XIM 1) + endif(CAN_XIM) check_include_files(X11/xpm.h HAVE_X11_XPM_H) - if(HAVE_X11_XPM_H) - check_library_exists(Xpm XpmCreatePixmapFromData "" - ALLEGRO_XWINDOWS_WITH_XPM) - if(ALLEGRO_XWINDOWS_WITH_XPM) - list(APPEND X11_LIBRARIES "Xpm") - endif(ALLEGRO_XWINDOWS_WITH_XPM) - endif(HAVE_X11_XPM_H) + check_library_exists(Xpm XpmCreatePixmapFromData "" CAN_XPM) + if(HAVE_X11_XPM_H AND CAN_XPM) + set(ALLEGRO_XWINDOWS_WITH_XPM 1) + list(APPEND X11_LIBRARIES "Xpm") + endif(HAVE_X11_XPM_H AND CAN_XPM) set(CMAKE_REQUIRED_LIBRARIES) endif(SUPPORT_X11) @@ -724,10 +757,10 @@ add_module(alleg-vga "${ALLEGRO_MODULE_VGA_FILES}") endif(SUPPORT_VGA) - if(ALLEGRO_XWINDOWS_WITH_XF86DGA2) + if(SUPPORT_DGA2) add_module(alleg-dga2 "${ALLEGRO_MODULE_DGA2_FILES}" -L${X11_LIBRARY_DIR} Xxf86dga) - endif(ALLEGRO_XWINDOWS_WITH_XF86DGA2) + endif(SUPPORT_DGA2) if(SUPPORT_ALSADIGI) add_module(alleg-alsadigi "${ALLEGRO_MODULE_ALSADIGI_FILES}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tj...@us...> - 2006-11-24 09:21:19
|
Revision: 7576 http://svn.sourceforge.net/alleg/?rev=7576&view=rev Author: tjaden Date: 2006-11-24 01:21:14 -0800 (Fri, 24 Nov 2006) Log Message: ----------- CMake build: make assembler rules work for out of source builds. Modified Paths: -------------- allegro/branches/4.3/CMakeLists.txt Modified: allegro/branches/4.3/CMakeLists.txt =================================================================== --- allegro/branches/4.3/CMakeLists.txt 2006-11-24 08:10:01 UTC (rev 7575) +++ allegro/branches/4.3/CMakeLists.txt 2006-11-24 09:21:14 UTC (rev 7576) @@ -632,7 +632,9 @@ DEPENDS ${SOURCE} ${ASMDEF_INC} COMMAND ${CMAKE_C_COMPILER} -x assembler-with-cpp - -I. -Iinclude ${_wflags} + -I${CMAKE_SOURCE_DIR} + -I${CMAKE_BINARY_DIR} + -I${CMAKE_BINARY_DIR}/include ${_wflags} -c ${CMAKE_SOURCE_DIR}/${SOURCE} -o ${OBJ} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |