[Vm-dev] VM Maker: CMakeVMMakerSqueak-tty.84.mcz
commits at source.squeak.org
commits at source.squeak.org
Tue Jul 8 23:10:43 UTC 2014
Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.84.mcz
==================== Summary ====================
Name: CMakeVMMakerSqueak-tty.84
Author: tty
Time: 8 July 2014, 7:10:49.861 pm
UUID: 99c06038-e989-4717-82de-104b6fa25b49
Ancestors: CMakeVMMakerSqueak-tty.83
This is a development stage save.
Plugins inject their config.cmake CMake commands into the main CMakeLists.txt
compile fails with multiple definition of 'main' with Ian's
testDoubleWordAlignment
testDoubleWordOrder
testLanginfoCodeset
Will investigate tomorrow.
Next Up. study the Squeak Plugin code and resolve overlap in the work I just did.
=============== Diff against CMakeVMMakerSqueak-tty.83 ===============
Item was changed:
CMakeGeneratorForSqueak subclass: #CMakePluginGeneratorForSqueak
+ instanceVariableNames: 'plugin vmGen internal extraRules doNotGenerate externalDependencies configDotCMake'
- instanceVariableNames: 'plugin vmGen internal extraRules doNotGenerate externalDependencies'
classVariableNames: ''
poolDictionaries: ''
category: 'CMakeVMMakerSqueak'!
+ !CMakePluginGeneratorForSqueak commentStamp: 'tty 7/8/2014 12:46' prior: 0!
- !CMakePluginGeneratorForSqueak commentStamp: 'tty 5/16/2014 15:52' prior: 0!
A CMakePluginGeneratorForSqueak overides some CMakeVMPluginGenerator methods for squeak compatibility.
+ I also add Dictionary for storing a plugins config.cmake file
+
Instance Variables
!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotAioPlugin (in category 'cmake commands') -----
+ configDotAioPlugin
+ ^'
+ PLUGIN_DEFINITIONS (-DSQAIO_H=\"sqaio.h\")
+ PLUGIN_INCLUDE_DIRECTORIES (${crossDir}/plugins/FilePlugin ${crossDir}/plugins/SocketPlugin)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotB3DAcceleratorPlugin (in category 'cmake commands') -----
+ configDotB3DAcceleratorPlugin
+ ^'
+ IF (OPENGL_FOUND OR AGL_FOUND)
+ SET (USE_OPENGL 1)
+ PLUGIN_INCLUDE_DIRECTORIES (${OPENGL_INCLUDE_DIR})
+ ELSE ()
+ PLUGIN_DISABLE ()
+ ENDIF ()
+
+ IF (OPENGL_FOUND)
+ SET (USE_X11_GLX 1)
+ ENDIF ()
+
+ IF (AGL_FOUND)
+ SET (USE_QUARTZ_CGL 1)
+ SET (HAVE_OPENGL_GL_H 1)
+ ENDIF ()
+
+ IF (OPENGL_FOUND OR AGL_FOUND)
+ CHECK_INCLUDE_FILE (GL/gl.h HAVE_GL_GL_H -I${OPENGL_INCLUDE_DIR})
+ ENDIF (OPENGL_FOUND OR AGL_FOUND)
+
+ CONFIG_DEFINE (USE_OPENGL)
+ CONFIG_DEFINE (USE_X11_GLX)
+ CONFIG_DEFINE (USE_QUARTZ_CGL)
+ CONFIG_DEFINE (HAVE_GL_GL_H)
+ CONFIG_DEFINE (HAVE_OPENGL_GL_H)
+
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotBitBltSimulation (in category 'cmake commands') -----
+ configDotBitBltSimulation
+ self flag:'tty'. "how to hand vm-hos-os STREQUAL linux"
+ ^'
+ SET(${plugin}_sources "${${plugin}_source_dir}/${plugin}.c")
+
+ SET(xbbp "${crossDir}/plugins/${plugin}")
+
+ IF (DEFINED ENABLE-FAST-BLT)
+ LIST(APPEND ${plugin}_extra_sources ${xbbp}/BitBltDispatch.c ${xbbp}/BitBltGeneric.c)
+ IF (vm-host-cpu MATCHES "arm")
+ ENABLE_LANGUAGE (ASM)
+ SET (CMAKE_ASM_COMPILE_OBJECT "asasm -cpu 6 -I ${xbbp} -o <OBJECT> <SOURCE>")
+ LIST(APPEND ${plugin}_extra_sources
+ ${xbbp}/BitBltArm.c ${xbbp}/BitBltArmSimd.c ${xbbp}/BitBltArmSimdAlphaBlend.s
+ ${xbbp}/BitBltArmSimdBitLogical.s ${xbbp}/BitBltArmSimdPixPaint.s
+ ${xbbp}/BitBltArmSimdSourceWord.s
+ )
+ PLUGIN_DEFINITIONS("-DENABLE_FAST_BLT")
+ IF (vm-host-os STREQUAL "linux")
+ LIST (APPEND ${plugin}_extra_sources ${xbbp}/BitBltArmLinux.c)
+ ELSE ()
+ LIST (APPEND ${plugin}_extra_sources ${xbbp}/BitBltArmOther.c)
+ ENDIF ()
+
+
+ ELSE ()
+ MESSAGE (FATAL_ERROR "
+ --enableFastBlt is not supported on this platform
+ " )
+ ENDIF ()
+ ENDIF ()
+
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotCMake (in category 'accessing') -----
+ configDotCMake
+ ^ configDotCMake!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotCameraPlugin (in category 'cmake commands') -----
+ configDotCameraPlugin
+ ^'PLUGIN_REQUIRE_INCLUDE(V4L2 linux/videodev2.h /usr/include)'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotClipboardExtendedPlugin (in category 'cmake commands') -----
+ configDotClipboardExtendedPlugin
+ ^'
+ IF (NOT X11_FOUND)
+ PLUGIN_DISABLE()
+ ENDIF ()'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotCmakeEmpty (in category 'cmake commands') -----
+ configDotCmakeEmpty
+ "most config.cmake files are empty files"
+ ^''!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotDropPlugin (in category 'cmake commands') -----
+ configDotDropPlugin
+ ^'PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin)'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotFT2Plugin (in category 'cmake commands') -----
+ configDotFT2Plugin
+ ^'PLUGIN_FIND_PACKAGE (FREETYPE freetype2)
+ IF (NOT FREETYPE_FOUND)
+ CHECK_INCLUDE_FILE (ft2build.h HAVE_FT2BUILD_H)
+ IF (NOT HAVE_FT2BUILD_H)
+ PLUGIN_DISABLE ()
+ ELSE ()
+ PLUGIN_REQUIRE_LIBRARY (FREETYPE freetype)
+ PLUGIN_REQUIRE_LIBRARY (Z z)
+ ENDIF ()
+ ENDIF ()'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotFilePlugin (in category 'cmake commands') -----
+ configDotFilePlugin
+ ^'
+ CHECK_INCLUDE_FILE (dirent.h HAVE_DIRENT_H)
+ CHECK_INCLUDE_FILE (sys/ndir.h HAVE_SYS_NDIR_H)
+ CHECK_INCLUDE_FILE (sys/dir.h HAVE_SYS_DIR_H)
+ CHECK_INCLUDE_FILE (ndir.h HAVE_NDIR_H)
+ CHECK_INCLUDE_FILE (unistd.h HAVE_UNISTD_H)
+
+ CONFIG_DEFINE (HAVE_DIRENT_H)
+ CONFIG_DEFINE (HAVE_SYS_NDIR_H)
+ CONFIG_DEFINE (HAVE_SYS_DIR_H)
+ CONFIG_DEFINE (HAVE_NDIR_H)
+ CONFIG_DEFINE (HAVE_UNISTD_H)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotFloatMathPlugin (in category 'cmake commands') -----
+ configDotFloatMathPlugin
+ ^'
+ PLUGIN_DEFINITIONS (-DNO_ISNAN=1)
+
+ # fdlibm.h does not recognize x86_64, so set endianness here for all platforms.
+
+ TEST_BIG_ENDIAN (IS_BIG_ENDIAN)
+ IF (NOT IS_BIG_ENDIAN)
+ PLUGIN_DEFINITIONS (-D__LITTLE_ENDIAN=1)
+ ENDIF ()
+
+ SET (LIBM_CFLAGS "${CMAKE_C_FLAGS}")
+
+ # GCC optimizations break fdlibm so disable them for now.
+ #
+ # IF (CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ # SET (LIBM_CFLAGS "${CMAKE_C_FLAGS} -O0 -mno-fused-madd")
+ # ENDIF ()'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotGStreamerPlugin (in category 'cmake commands') -----
+ configDotGStreamerPlugin
+ ^'PLUGIN_REQUIRE_PACKAGE (GLIB2 glib-2.0)
+ PLUGIN_REQUIRE_PACKAGE (XML2 libxml-2.0)
+ PLUGIN_REQUIRE_PACKAGE (GSTREAMER gstreamer-0.10)'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotHostWindowPlugin (in category 'cmake commands') -----
+ configDotHostWindowPlugin
+ ^'
+ IF (NOT X11_FOUND)
+ PLUGIN_DISABLE ()
+ ENDIF (NOT X11_FOUND)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotMIDIPlugin (in category 'cmake commands') -----
+ configDotMIDIPlugin
+ ^'
+ PLUGIN_REQUIRE_INCLUDE (ALSA_SOUNDLIB alsa/asoundlib.h)
+ PLUGIN_REQUIRE_LIBRARY (ASOUND asound)
+ IF (HAVE_ALSA_SOUNDLIB_H AND HAVE_LIBASOUND)
+ SET (USE_MIDI_ALSA 1)
+ CONFIG_DEFINE (USE_MIDI_ALSA)
+ ENDIF ()
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotMpeg3Plugin (in category 'cmake commands') -----
+ configDotMpeg3Plugin
+ ^'
+ IF (VM_HOST_CPU MATCHES "i[3456789]86")
+ PLUGIN_DEFINITIONS (-DUSE_MMX=1)
+ ENDIF ()
+
+ PLUGIN_DEFINITIONS (-DNOPTHREADS=1)
+
+ SET (lmp3 "${cross}/plugins/Mpeg3Plugin/libmpeg")
+
+ LIST(APPEND ${plugin}_extra_sources
+ ${lmp3}/bitstream.c ${lmp3}/libmpeg3.c ${lmp3}/mpeg3atrack.c ${lmp3}/mpeg3demux.c ${lmp3}/mpeg3io.c
+ ${lmp3}/mpeg3title.c ${lmp3}/mpeg3vtrack.c ${lmp3}/changesForSqueak.c
+ ${lmp3}/audio/dct.c ${lmp3}/audio/header.c ${lmp3}/audio/layer2.c ${lmp3}/audio/layer3.c
+ ${lmp3}/audio/mpeg3audio.c ${lmp3}/audio/pcm.c ${lmp3}/audio/synthesizers.c ${lmp3}/audio/tables.c
+ ${lmp3}/video/getpicture.c ${lmp3}/video/headers.c ${lmp3}/video/idct.c ${lmp3}/video/macroblocks.c
+ ${lmp3}/video/mmxtest.c ${lmp3}/video/motion.c ${lmp3}/video/mpeg3video.c ${lmp3}/video/output.c
+ ${lmp3}/video/reconstruct.c ${lmp3}/video/seek.c ${lmp3}/video/slice.c ${lmp3}/video/vlc.c
+ )
+
+ PLUGIN_INCLUDE_DIRECTORIES (${lmp3} ${lmp3}/audio ${lmp3}/video)
+
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotRomePlugin (in category 'cmake commands') -----
+ configDotRomePlugin
+ ^'
+ PLUGIN_REQUIRE_PACKAGE (PANGOCAIRO pangocairo)
+ PLUGIN_REQUIRE_PACKAGE (FREETYPE freetype2)
+ PLUGIN_REQUIRE_INCLUDE (CAIRO_FT cairo-ft.h)
+ PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/SurfacePlugin)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotSocketPlugin (in category 'cmake commands') -----
+ configDotSocketPlugin
+ ^'
+ PLUGIN_FIND_LIBRARY(SOCKET socket)
+ PLUGIN_FIND_LIBRARY(NSL nsl)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotSqueakSSL (in category 'cmake commands') -----
+ configDotSqueakSSL
+ ^'PLUGIN_REQUIRE_PACKAGE (OPENSSL openssl)'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotUUIDPlugin (in category 'cmake commands') -----
+ configDotUUIDPlugin
+ ^'PLUGIN_FIND_INCLUDE (UUID uuid.h)
+ CONFIG_DEFINE (HAVE_UUID_H)
+
+ PLUGIN_FIND_INCLUDE (SYS_UUID sys/uuid.h)
+ CONFIG_DEFINE (HAVE_SYS_UUID_H)
+
+ PLUGIN_FIND_INCLUDE (UUID_UUID uuid/uuid.h)
+ CONFIG_DEFINE (HAVE_UUID_UUID_H)
+
+ PLUGIN_FIND_LIBRARY (UUID uuid)
+
+ IF (HAVE_UUID_H OR HAVE_SYS_UUID_H OR HAVE_UUID_UUID_H)
+ IF (HAVE_LIBUUID)
+ SET (CMAKE_REQUIRED_LIBRARIES uuid)
+ ENDIF (HAVE_LIBUUID)
+ ELSE ()
+ PLUGIN_DISABLE ()
+ ENDIF (HAVE_UUID_H OR HAVE_SYS_UUID_H OR HAVE_UUID_UUID_H)
+
+ CHECK_FUNCTION_EXISTS (uuidgen HAVE_UUIDGEN)
+ CONFIG_DEFINE (HAVE_UUIDGEN)
+
+ CHECK_FUNCTION_EXISTS (uuid_generate HAVE_UUID_GENERATE)
+ CONFIG_DEFINE (HAVE_UUID_GENERATE)
+
+ CHECK_FUNCTION_EXISTS (uuid_create HAVE_UUID_CREATE)
+ CONFIG_DEFINE (HAVE_UUID_CREATE)
+
+ IF (NOT HAVE_UUIDGEN AND NOT HAVE_UUID_GENERATE AND NOT HAVE_UUID_CREATE)
+ PLUGIN_DISABLE ()
+ ENDIF (NOT HAVE_UUIDGEN AND NOT HAVE_UUID_GENERATE AND NOT HAVE_UUID_CREATE)
+
+ # IF (UUID_UUID_GENERATE)
+ # SET (HAVE_UUID_GENERATE 1)
+ # PLUGIN_LINK_LIBRARIES (uuid)
+ # ENDIF (UUID_UUID_GENERATE)'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotVmDisplayFbdev (in category 'cmake commands') -----
+ configDotVmDisplayFbdev
+ ^'
+ PLUGIN_REQUIRE_INCLUDE (LINUX_FB linux/fb.h)
+ PLUGIN_SOURCES (${unix}/${plugin}/sqUnixFBDev.c)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotVmDisplayQuartz (in category 'cmake commands') -----
+ configDotVmDisplayQuartz
+ ^'IF (NOT APPLE)
+ PLUGIN_DISABLE ()
+ ELSE ()
+ PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${AGL_INCLUDE_DIR})
+ PLUGIN_LINK_LIBRARIES (${AGL_LIBRARIES} "-framework Cocoa")
+ ENDIF (NOT APPLE)'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotVmDisplayX11 (in category 'cmake commands') -----
+ configDotVmDisplayX11
+ ^'SET (${plugin}_sources ${unix}/${plugin}/sqUnixX11.c ${unix}/${plugin}/sqUnixMozilla.c)
+
+ IF (NOT X11_FOUND)
+ PLUGIN_DISABLE ()
+ ELSE ()
+ SET (USE_X11 1)
+ IF (X11_Xext_FOUND)
+ SET (HAVE_LIBXEXT 1)
+ CHECK_LIBRARY_EXISTS (Xext XShmAttach ${X11_LIBRARY_DIR} USE_XSHM)
+ ENDIF ()
+ CHECK_INCLUDE_FILE (X11/extensions/Xrender.h HAVE_X11_EXTENSIONS_XRENDER_H -I${X11_INCLUDE_DIR})
+ IF (HAVE_X11_EXTENSIONS_XRENDER_H)
+ CHECK_LIBRARY_EXISTS (Xrender XRenderQueryVersion ${X11_LIBRARY_DIR} HAVE_LIBXRENDER)
+ IF (HAVE_LIBXRENDER)
+ PLUGIN_LINK_LIBRARIES (${X11_Xrender_LIB})
+ ENDIF ()
+ ENDIF (HAVE_X11_EXTENSIONS_XRENDER_H)
+ IF (OPENGL_FOUND)
+ CHECK_INCLUDE_FILE (GL/gl.h HAVE_GL_GL_H -I${X11_INCLUDE_DIR})
+ CHECK_INCLUDE_FILE (GL/glx.h HAVE_GL_GLX_H -I${X11_INCLUDE_DIR})
+ IF (HAVE_GL_GL_H AND HAVE_GL_GLX_H)
+ SET (USE_X11_GLX 1)
+ ENDIF (HAVE_GL_GL_H AND HAVE_GL_GLX_H)
+ ENDIF (OPENGL_FOUND)
+ IF (DEFINED ENABLE-FAST-BLT)
+ SET (USE_FAST_BLT 1)
+ IF (vm-host-cpu MATCHES "arm")
+ ENABLE_LANGUAGE (ASM)
+ SET (CMAKE_ASM_COMPILE_OBJECT "asasm -cpu 6 -I ${cross}/plugins/BitBltPlugin -o <OBJECT> <SOURCE>")
+ SET (${plugin}_sources ${${plugin}_sources} "${unix}/${plugin}/sqUnixX11Arm.S")
+ ELSE ()
+ MESSAGE (FATAL_ERROR "
+ --enableFastBlt is not supported on this platform
+ " )
+ ENDIF ()
+ ENDIF (DEFINED ENABLE-FAST-BLT)
+ PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${cross}/plugins/FilePlugin)
+ PLUGIN_INCLUDE_DIRECTORIES (${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ PLUGIN_LINK_LIBRARIES (${X11_LIBRARIES} ${OPENGL_LIBRARIES})
+ ENDIF ()
+
+ CONFIG_DEFINE (USE_X11)
+ CONFIG_DEFINE (USE_X11_GLX)
+ CONFIG_DEFINE (USE_FAST_BLT)
+
+ CONFIG_DEFINE (HAVE_LIBXEXT)
+ CONFIG_DEFINE (HAVE_LIBXRENDER)
+
+ CONFIG_DEFINE (USE_XSHM)
+
+ CONFIG_DEFINE (USE_XICFONT_OPTION)
+ CONFIG_DEFINE (USE_XICFONT_DEFAULT)
+ CONFIG_DEFINE (USE_XICFONT_RESOURCE)
+
+ CHECK_FUNCTION_EXISTS (snprintf HAVE_SNPRINTF)
+ CHECK_FUNCTION_EXISTS (__snprintf HAVE___SNPRINTF)
+
+ CONFIG_DEFINE (HAVE_SNPRINTF)
+ CONFIG_DEFINE (HAVE___SNPRINTF)
+
+ CHECK_INCLUDE_FILE (sys/select.h HAVE_SYS_SELECT_H)
+
+ CONFIG_DEFINE (HAVE_SYS_SELECT_H)'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotVmSoundALSA (in category 'cmake commands') -----
+ configDotVmSoundALSA
+ ^'PLUGIN_REQUIRE_INCLUDE (ALSA_SOUNDLIB alsa/asoundlib.h)
+ PLUGIN_REQUIRE_LIBRARY (ASOUND asound)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotVmSoundMacOSX (in category 'cmake commands') -----
+ configDotVmSoundMacOSX
+ ^'
+ IF (NOT APPLE)
+ PLUGIN_DISABLE ()
+ ENDIF ()'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotVmSoundNAS (in category 'cmake commands') -----
+ configDotVmSoundNAS
+ ^'PLUGIN_REQUIRE_INCLUDE (AUDIO_AUDIO_H audio/audio.h)
+ PLUGIN_REQUIRE_LIBRARY (AUDIO audio)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotVmSoundOSS (in category 'cmake commands') -----
+ configDotVmSoundOSS
+ ^'PLUGIN_REQUIRE_INCLUDE (ALSA_SOUNDLIB alsa/asoundlib.h)
+ PLUGIN_REQUIRE_LIBRARY (ASOUND asound)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotVmSoundPulse (in category 'cmake commands') -----
+ configDotVmSoundPulse
+ ^'PLUGIN_REQUIRE_LIBRARY (PULSE pulse-simple)'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotVmSoundSun (in category 'cmake commands') -----
+ configDotVmSoundSun
+ ^'PLUGIN_FIND_INCLUDE (SYS_AUDIOIO sys/audioio.h)
+ PLUGIN_FIND_INCLUDE (SUN_AUDIOIO sun/audioio.h)
+ PLUGIN_REQUIRE_INCLUDE (STROPTS stropts.h)
+
+ IF (NOT VM_HOST_OS MATCHES "solaris.*")
+ PLUGIN_DISABLE ()
+ ELSE ()
+ IF (NOT HAVE_SYS_AUDIOIO_H AND NOT HAVE_SUN_AUDIOIO_H)
+ PLUGIN_DISABLE ()
+ ENDIF ()
+ ENDIF ()
+
+ CONFIG_DEFINE (HAVE_SYS_AUDIOIO_H)
+ '!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotWeDoPlugin (in category 'cmake commands') -----
+ configDotWeDoPlugin
+ ^'PLUGIN_REQUIRE_INCLUDE(HIDDEV linux/hiddev.h /usr/include)'!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>configDotXDisplayControlPlugin (in category 'cmake commands') -----
+ configDotXDisplayControlPlugin
+ ^'IF (NOT X11_FOUND)
+ PLUGIN_DISABLE ()
+ ELSE ()
+ PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin)
+ ENDIF ()'!
Item was changed:
----- Method: CMakePluginGeneratorForSqueak>>generate (in category 'squeak compatibility') -----
generate
-
| name |
+
output := String new writeStream.
name := plugin moduleName.
#( vmGen config setGlobalOptions: self.
-
self
printHeader;
project: name;
"include directories generated for build"
include: '../directories.cmake'.
-
self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'.
).
self message: (internal ifTrue: [ 'Adding internal plugin: '] ifFalse: ['Adding external plugin: ']) , name.
-
self
set: #pluginName toString: name;
set: #pluginSrc toString: '${srcPluginsDir}/', name;
set: #pluginCross toString: '${crossDir}/plugins/', name;
set: #pluginPlatform toString: '${targetPlatform}/plugins/', name.
+ self set: #LINKLIBS to: ''. "clear LINKLIBS variable"
+ internal ifTrue: [ self puts: 'add_definitions(-DSQUEAK_BUILTIN_PLUGIN)'].
- "clear LINKLIBS variable"
- self set: #LINKLIBS to: ''.
-
- internal
- ifTrue: [ self puts: 'add_definitions(-DSQUEAK_BUILTIN_PLUGIN)'].
-
- self addSources: { name , '.c' } prefixed: '${pluginSrc}/'.
+ self addSources: { name , '.c' } prefixed: '${pluginSrc}/'.
+ self includeDirectories: '${pluginSrc} ${pluginCross} ${targetPlatform}/plugins/${pluginName}'. " default include directories for plugin "
+ "self addDefinitions: vmGen config compilerFlags." "Not needed because there are already there (inherited from main configuration)"
- " default include directories for plugin "
- self includeDirectories: '${pluginSrc} ${pluginCross} ${targetPlatform}/plugins/${pluginName}'.
-
- "Not needed because there are already there (inherited from main configuration)"
- "self addDefinitions: vmGen config compilerFlags."
-
" perform config's configureXYZ: message to apply per-plugin custom rules, if any "
+
-
vmGen config configurePlugin: plugin with: self.
-
extraRules ifNotNil: [ extraRules value: self ].
-
" generate a static lib for internal plugin, or shared for external"
+ internal
+ ifTrue: [ self cmd: 'add_library' params: name , ' STATIC ${sources}'.]
+ ifFalse: [self cmd: 'add_library' params: name , ' SHARED ${sources}'.].
- internal ifTrue: [
- self cmd: 'add_library' params: name , ' STATIC ${sources}'.
- ] ifFalse: [
- self cmd: 'add_library' params: name , ' SHARED ${sources}'.
-
- " self cmd: 'set_property' params: 'TARGET ' , name , ' PROPERTY LINK_FLAGS -bundle'"
- ].
-
vmGen config extraPluginSettings: self.
+ self isExternal
+ ifTrue: [ self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'.].
+
+ self cmd: 'set_property' params: 'TARGET ', name, ' PROPERTY LINK_FLAGS "${linkFlags}"'. " see senders of #linkFlags "
+ self puts: 'IF (',self moduleName , '_dependencies)'. "set dependencies"
+ self cmd: 'add_dependencies' params: name , ' ${', self moduleName , '_dependencies}'.
- self isExternal ifTrue: [
- self cmd: 'target_link_libraries'
- params: self moduleName , ' ${LINKLIBS}'.
- ].
-
- " see senders of #linkFlags "
- self
- cmd: 'set_property'
- params: 'TARGET ', name, ' PROPERTY LINK_FLAGS "${linkFlags}"'.
-
- "set dependencies"
- self puts: 'IF (',self moduleName , '_dependencies)'.
-
- self cmd: 'add_dependencies'
- params: name , ' ${', self moduleName , '_dependencies}'.
-
self puts: 'ENDIF (',self moduleName , '_dependencies)'.
+ self saveFile.
+
+
+ !
- self saveFile.!
Item was changed:
----- Method: CMakePluginGeneratorForSqueak>>initialize (in category 'initialize-release') -----
initialize
super initialize.
+ externalDependencies := #().
+ configDotCMake:=self initializeConfigDotCmakeFiles.!
- externalDependencies := #().!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>initializeConfigDotCmakeFiles (in category 'initialize-release') -----
+ initializeConfigDotCmakeFiles
+ "simple hard-coded Dictionary keyed by plugin name containing the contents of a Plugin's config.cmake file"
+ |d|
+ d:=Dictionary new.
+ d
+ at: #ADPCMCodecPlugin put: self configDotCmakeEmpty;
+ at: #AioPlugin put: self configDotCmakeEmpty;
+ at: #UnixAioPlugin put: self configDotCmakeEmpty;
+ at: #B3DAcceleratorPlugin put: self configDotCmakeEmpty;
+ at: #BMPReadWriterPlugin put: self configDotCmakeEmpty;
+ at: #BalloonEngineBase put: self configDotCmakeEmpty;
+ at: #BalloonEnginePlugin put: self configDotCmakeEmpty;
+ at: #BalloonEngineSimulation put: self configDotCmakeEmpty;
+ at: #BrokenPlugin put: self configDotCmakeEmpty;
+ at: #CameraPlugin put: self configDotCmakeEmpty;
+ at: #CroquetPlugin put: self configDotCmakeEmpty;
+ at: #DSAPlugin put: self configDotCmakeEmpty;
+ at: #DropPlugin put: self configDotCmakeEmpty;
+ at: #FFIPlugin put: self configDotFilePlugin;
+ at: #FFTPlugin put: self configDotCmakeEmpty;
+ at: #FilePlugin put: self configDotFilePlugin;
+ at: #FilePluginSimulator put: self configDotCmakeEmpty;
+ at: #FloatArrayPlugin put: self configDotCmakeEmpty;
+ at: #FloatMathPlugin put: self configDotCmakeEmpty;
+ at: #FloatMathPluginSimulator put: self configDotCmakeEmpty;
+ at: #IA32ABIPlugin put: self configDotCmakeEmpty;
+ at: #IA32ABIPluginSimulator put: self configDotCmakeEmpty;
+ at: #InflatePlugin put: self configDotCmakeEmpty;
+ at: #DeflatePlugin put: self configDotCmakeEmpty;
+ at: #JPEGReaderPlugin put: self configDotCmakeEmpty;
+ at: #KlattSynthesizerPlugin put: self configDotCmakeEmpty;
+ at: #Matrix2x3Plugin put: self configDotCmakeEmpty;
+ at: #MiscPrimitivePlugin put: self configDotCmakeEmpty;
+ at: #NewsqueakIA32ABIPlugin put: self configDotCmakeEmpty;
+ at: #NewsqueakIA32ABIPluginAttic put: self configDotCmakeEmpty;
+ at: #NewsqueakIA32ABIPluginSimulator put: self configDotCmakeEmpty;
+ at: #OSProcessPlugin put: self configDotCmakeEmpty;
+ at: #UnixOSProcessPlugin put: self configDotCmakeEmpty;
+ at: #Win32OSProcessPlugin put: self configDotCmakeEmpty;
+ at: #ScratchPlugin put: self configDotCmakeEmpty;
+ at: #SecurityPlugin put: self configDotCmakeEmpty;
+ at: #SlangTestPlugin put: self configDotCmakeEmpty;
+ at: #SmartSyntaxInterpreterPlugin put: self configDotCmakeEmpty;
+ at: #AsynchFilePlugin put: self configDotCmakeEmpty;
+ at: #BitBltSimulation put: self configDotCmakeEmpty;
+ at: #BitBltSimulator put: self configDotCmakeEmpty;
+ at: #BochsIA32Plugin put: self configDotCmakeEmpty;
+ at: #ClipboardExtendedPlugin put: self configDotCmakeEmpty;
+ at: #FT2Plugin put: self configDotCmakeEmpty;
+ at: #FileCopyPlugin put: self configDotCmakeEmpty;
+ at: #GdbARMPlugin put: self configDotCmakeEmpty;
+ at: #GeniePlugin put: self configDotCmakeEmpty;
+ at: #HostWindowPlugin put: self configDotCmakeEmpty;
+ at: #IOSPlugin put: self configDotCmakeEmpty;
+ at: #ImmX11Plugin put: self configDotCmakeEmpty;
+ at: #InternetConfigPlugin put: self configDotCmakeEmpty;
+ at: #JPEGReadWriter2Plugin put: self configDotCmakeEmpty;
+ at: #JoystickTabletPlugin put: self configDotCmakeEmpty;
+ at: #LargeIntegersPlugin put: self configDotCmakeEmpty;
+ at: #LocalePlugin put: self configDotCmakeEmpty;
+ at: #MIDIPlugin put: self configDotCmakeEmpty;
+ at: #MacMenubarPlugin put: self configDotCmakeEmpty;
+ at: #Mpeg3Plugin put: self configDotCmakeEmpty;
+ at: #ObjectiveCPlugin put: self configDotCmakeEmpty;
+ at: #QuicktimePlugin put: self configDotCmakeEmpty;
+ at: #RePlugin put: self configDotCmakeEmpty;
+ at: #SerialPlugin put: self configDotCmakeEmpty;
+ at: #SocketPlugin put: self configDotCmakeEmpty;
+ at: #SoundPlugin put: self configDotCmakeEmpty;
+ at: #TestOSAPlugin put: self configDotCmakeEmpty;
+ at: #UUIDPlugin put: self configDotCmakeEmpty;
+ at: #SmartSyntaxPluginSimulator put: self configDotCmakeEmpty;
+ at: #SoundCodecPlugin put: self configDotCmakeEmpty;
+ at: #SoundGenerationPlugin put: self configDotCmakeEmpty;
+ at: #SqueakSSLPlugin put: self configDotCmakeEmpty;
+ at: #StarSqueakPlugin put: self configDotCmakeEmpty;
+ at: #SurfacePlugin put: self configDotCmakeEmpty;
+ at: #ThreadedFFIPlugin put: self configDotCmakeEmpty;
+ at: #ThreadedARMFFIPlugin put: self configDotCmakeEmpty;
+ at: #ThreadedIA32FFIPlugin put: self configDotCmakeEmpty;
+ at: #ThreadedPPCBEFFIPlugin put: self configDotCmakeEmpty;
+ at: #UnicodePlugin put: self configDotCmakeEmpty;
+ at: #VMProfileLinuxSupportPlugin put: self configDotCmakeEmpty;
+ at: #VMProfileMacSupportPlugin put: self configDotCmakeEmpty;
+ at: #WeDoPlugin put: self configDotCmakeEmpty;
+ at: #XDisplayControlPlugin put: self configDotCmakeEmpty.
+ ^d.
+ !
Item was changed:
----- Method: CMakeVMGeneratorForSqueak>>generate (in category 'code generation') -----
generate
| intPlugins extPlugins |
output := String new writeStream.
config setGlobalOptions: self.
self
printHeader;
project: config executableName.
config setGlobalOptionsAfterDetermineSystem: self.
config setupDirectories: self.
self message: '${CMAKE_MODULE_PATH}'.
self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'.
config preferredIncludes do: [ :each | self includeDirectories: each ].
self includeDirectories: self includeDirs.
config standardIncludes do: [:each | self includeDirectories: each ].
self addDefinitions: config compilerFlags.
config extraVMSettings: self.
self puts: 'add_executable(' , config executableName, ' ', config executableType, ' ' , self sources , ')'.
+ self break.
-
intPlugins := self generatePluginConfigs: config internalPlugins internal: true.
extPlugins := self generatePluginConfigs: config externalPlugins internal: false.
self processThirdpartyLibraries.
self processPlugins: intPlugins, extPlugins.
config setExtraTargetProperties: self.
self cmd: 'target_link_libraries'
params: self moduleName , ' ${LINKLIBS}'.
config postBuildActions: self.
self saveFile.
self generateBuildScript.!
Item was changed:
----- Method: CMakeVMGeneratorForSqueak>>processPlugins: (in category 'as yet unclassified') -----
processPlugins: pluginGenerators
| libs libDeps |
-
libs := OrderedCollection new.
libDeps := Dictionary new.
pluginGenerators do: [:gen |
gen doNotGenerate ifFalse: [
+ self puts: (gen configDotCMake at: (gen plugin name) ifAbsent:[gen configDotCmakeEmpty]). "plugin injects its config.cmake info"
gen isInternal
ifTrue: [
libs add: gen plugin moduleName ]
ifFalse: [
"make main module to depend on external plugin, just to make sure it is built
before main module built"
self
cmd: 'add_dependencies'
params: config executableName, ' ' , gen plugin moduleName ].
gen externalDependencies
ifNotEmpty: [ :deps |
libDeps
at: gen plugin moduleName
put: (deps fold: [ :a :b | a, ' ', b ]) ].
self addSubdirectory: gen plugin moduleName ] ].
self cmd: 'target_link_libraries' params: config executableName , ' ' ,
(libs inject: '' into: [:res :ea | res, ' ' , ea ]).
libDeps keysAndValuesDo: [ :moduleName :dependencies |
self
cmd: 'add_dependencies'
params: moduleName, ' ', dependencies ].
self generateExportsH: libs.!
Item was changed:
----- Method: CMakeVMMakerSqueakDeveloperHelp class>>plugins (in category 'pages') -----
plugins
^HelpTopic
title:'Plugins'
contents:'
TODO explain the design and methodology of the ''plugin extra rules'' protocol in
+ Explain CMakePluginGeneratorSqueak containing the config.cmake files
+
provide example of mapping from plugins.int to defaultInternalPlugins
|s|
Transcript clear.
s:=SortedCollection new.
InterpreterPlugin allSubclassesDo:[:p|
p moduleName = ''B2DPlugin''
ifTrue:[Transcript show:p name].
s add: (p moduleName)].
Transcript show: s.
SqueakUnixConfig browse
'!
Item was changed:
----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testThirdPartyLibs (in category 'as yet unclassified') -----
testThirdPartyLibs
#(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig )
do:[:each |
(Smalltalk at:each)
allSubclassesDo:[:configuration | | o buildTypes|
o:= configuration new.
(o excludeFromBuild not) & (configuration isAbstractBaseClass not)
ifTrue:[
buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone).
buildTypes do:[:buildType |
o configureForBuildType: buildType.
+ self assert:(o thirdpartyLibs isKindOf: Collection).
- self assert:(o thirdPartyLibs isKindOf: Collection).
]]]].
!
Item was changed:
----- Method: CPlatformConfigForSqueak class>>utilsCMake (in category 'as yet unclassified') -----
utilsCMake
+ ^'
+ # Some random useful things to avoid repetition
- ^'# Some random useful things to avoid repetition
#
# Last edited: 2009-08-26 10:41:32 by piumarta on ubuntu.piumarta.com
MACRO (STRING_APPEND var str)
IF (DEFINED ${var})
SET (${var} "${${var}} ${str}")
ELSE (DEFINED ${var})
SET (${var} "${str}")
ENDIF (DEFINED ${var})
ENDMACRO (STRING_APPEND)
MACRO (LIST_APPEND list)
LIST (APPEND ${list} "${ARGN}")
LIST (REMOVE_DUPLICATES ${list})
ENDMACRO (LIST_APPEND)
MACRO (FILE_APPEND to from)
IF (EXISTS ${from})
FILE (READ ${from} tmp)
FILE (APPEND ${to} "${tmp}")
ENDIF (EXISTS ${from})
ENDMACRO (FILE_APPEND)
MACRO (FILE_COPY to from)
IF (EXISTS ${from})
FILE (READ ${from} tmp)
FILE (WRITE ${to} "${tmp}")
ENDIF (EXISTS ${from})
ENDMACRO (FILE_COPY)
##added by tty. cut-n-paste from ian CMakeLists.txt
MACRO (USE_LIBRARY lib)
LIST (APPEND squeak_libs "${lib}")
ENDMACRO (USE_LIBRARY)
MACRO (USE_FRAMEWORK fwk)
USE_LIBRARY ("-framework ${fwk}")
ENDMACRO (USE_FRAMEWORK)
MACRO (CONFIG_DEFINE var)
LIST (APPEND config_vars "${var}")
ENDMACRO (CONFIG_DEFINE var)
##End tty additions
'!
Item was changed:
----- Method: CPlatformConfigForSqueak class>>vmConfigCmake (in category 'as yet unclassified') -----
vmConfigCmake
self flag:'tty'. "parse me. look at that set(interp...) command and others"
"${version} was generated in Ian's script from interp.h and svn stuff. I fake it here. Address later"
+ ^'
+ IF (NOT DEFINED __sq_config_h)
+ SET(__sq_config_h 1)
+ CONFIG_DEFINE(__sq_config_h)
- ^'SET (OS_TYPE \"unix\")
+ SET (OS_TYPE \"unix\")
+ CONFIG_DEFINE (OS_TYPE)
- CONFIG_DEFINE (OS_TYPE)
- SET (version \"1.2.3.4\")
- MESSAGE("FIX ME: version is a bogus number: ${version}")
+ SET (version \"1.2.3.4\")
+ MESSAGE("FIX ME: version is a bogus number: ${version}")
- STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\1" major ${version})
- STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\2" minor ${version})
- STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\3" patch ${version})
- STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\4" release ${version})
+ STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\1" major ${version})
+ STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\2" minor ${version})
+ STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\3" patch ${version})
+ STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\4" release ${version})
- IF (APPLE)
- SET (DARWIN 1)
- STRING_APPEND (CMAKE_C_FLAGS -DMACOSX) # ffi.h
- USE_FRAMEWORK (CoreFoundation)
- USE_FRAMEWORK (CoreServices)
- ENDIF (APPLE)
+ IF (APPLE)
+ SET (DARWIN 1)
+ STRING_APPEND (CMAKE_C_FLAGS -DMACOSX) # ffi.h
+ USE_FRAMEWORK (CoreFoundation)
+ USE_FRAMEWORK (CoreServices)
+ ENDIF (APPLE)
- CONFIG_DEFINE (DARWIN)
+ CONFIG_DEFINE (DARWIN)
- IF (CMAKE_COMPILER_IS_GNUCC)
- SET (interp gnu-interp)
- ELSE ()
- SET (interp interp)
- MESSAGE ("!!!! Cannot optimise interpreter performance for GCC")
- ENDIF (CMAKE_COMPILER_IS_GNUCC)
+ IF (CMAKE_COMPILER_IS_GNUCC)
+ SET (interp gnu-interp)
+ ELSE ()
+ SET (interp interp)
+ MESSAGE ("!!!! Cannot optimise interpreter performance for GCC")
+ ENDIF (CMAKE_COMPILER_IS_GNUCC)
- INCLUDE (TestBigEndian)
- INCLUDE (CheckIncludeFile)
- INCLUDE (CheckLibraryExists)
- INCLUDE (CheckTypeSize)
- INCLUDE (CheckFunctionExists)
- INCLUDE (CheckVariableExists)
- INCLUDE (CheckStructHasMember)
- INCLUDE (FindPkgConfig)
+ # tty see: setGlobalOptionsAfterDetermineSystemBuild
+ # INCLUDE (TestBigEndian)
+ # INCLUDE (CheckIncludeFile)
+ # INCLUDE (CheckLibraryExists)
+ # INCLUDE (CheckTypeSize)
+ # INCLUDE (CheckFunctionExists)
+ # INCLUDE (CheckVariableExists)
+ # INCLUDE (CheckStructHasMember)
+ # INCLUDE (FindPkgConfig)
- FIND_PACKAGE (X11)
- IF (X11_FOUND)
- LIST (REMOVE_DUPLICATES X11_INCLUDE_DIR)
- ENDIF ()
+ FIND_PACKAGE (X11)
+ IF (X11_FOUND)
+ LIST (REMOVE_DUPLICATES X11_INCLUDE_DIR)
+ ENDIF ()
- IF (NOT without-gl)
- FIND_PACKAGE (OpenGL)
- LIST (REMOVE_DUPLICATES OPENGL_INCLUDE_DIR)
- ENDIF ()
+ message("without-gl = ${without_gl}")
- IF (APPLE AND NOT without-gl)
- SET (AGL_FOUND ${OPENGL_FOUND})
- SET (AGL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
- SET (AGL_LIBRARIES ${OPENGL_LIBRARIES})
- IF (X11_FOUND)
- FIND_PATH (GLX_INCLUDE_DIR GL/gl.h /usr/X11/include /usr/X11R6/include)
- FIND_LIBRARY (GLX_LIBRARIES GL /usr/X11/lib /usr/X11R6/lib)
- IF (GLX_INCLUDE_DIR AND GLX_LIBRARIES)
- SET (OPENGL_INCLUDE_DIR ${GLX_INCLUDE_DIR})
- SET (OPENGL_LIBRARIES ${GLX_LIBRARIES})
- ELSE ()
- SET (OPENGL_FOUND)
- ENDIF ()
- ELSE (X11_FOUND)
- SET (OPENGL_FOUND)
- ENDIF (X11_FOUND)
- ENDIF (APPLE AND NOT without-gl)
+ IF (NOT without-gl)
+ FIND_PACKAGE (OpenGL)
+ LIST (REMOVE_DUPLICATES OPENGL_INCLUDE_DIR)
+ ENDIF ()
- IF (NOT OPENGL_FOUND)
- SET (OPENGL_INCLUDE_DIR "")
- ENDIF ()
+ IF (APPLE AND NOT without-gl)
+ SET (AGL_FOUND ${OPENGL_FOUND})
+ SET (AGL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
+ SET (AGL_LIBRARIES ${OPENGL_LIBRARIES})
+ IF (X11_FOUND)
+ FIND_PATH (GLX_INCLUDE_DIR GL/gl.h /usr/X11/include /usr/X11R6/include)
+ FIND_LIBRARY (GLX_LIBRARIES GL /usr/X11/lib /usr/X11R6/lib)
+ IF (GLX_INCLUDE_DIR AND GLX_LIBRARIES)
+ SET (OPENGL_INCLUDE_DIR ${GLX_INCLUDE_DIR})
+ SET (OPENGL_LIBRARIES ${GLX_LIBRARIES})
+ ELSE ()
+ SET (OPENGL_FOUND)
+ ENDIF ()
+ ELSE (X11_FOUND)
+ SET (OPENGL_FOUND)
+ ENDIF (X11_FOUND)
+ ENDIF (APPLE AND NOT without-gl)
+
+ IF (NOT OPENGL_FOUND)
+ SET (OPENGL_INCLUDE_DIR "")
+ ENDIF ()
+
# FOREACH (var AGL_FOUND AGL_INCLUDE_DIR AGL_LIBRARIES OPENGL_FOUND OPENGL_INCLUDE_DIR OPENGL_LIBRARIES)
# MESSAGE ("${var} = ${${var}}")
# ENDFOREACH ()
+ TEST_BIG_ENDIAN (WORDS_BIGENDIAN)
+ IF (WORDS_BIGENDIAN)
+ SET (MSB_FIRST 1)
+ ELSE ()
+ SET (LSB_FIRST 1)
+ ENDIF ()
- TEST_BIG_ENDIAN (WORDS_BIGENDIAN)
- IF (WORDS_BIGENDIAN)
- SET (MSB_FIRST 1)
- ELSE ()
- SET (LSB_FIRST 1)
- ENDIF ()
+ CONFIG_DEFINE (WORDS_BIGENDIAN)
+ CONFIG_DEFINE (LSB_FIRST)
+ CONFIG_DEFINE (MSB_FIRST)
- CONFIG_DEFINE (WORDS_BIGENDIAN)
- CONFIG_DEFINE (LSB_FIRST)
- CONFIG_DEFINE (MSB_FIRST)
+ CHECK_FUNCTION_EXISTS (atexit HAVE_ATEXIT)
+ CHECK_FUNCTION_EXISTS (on_exit HAVE_ON_EXIT)
- CHECK_FUNCTION_EXISTS (atexit HAVE_ATEXIT)
- CHECK_FUNCTION_EXISTS (on_exit HAVE_ON_EXIT)
+ IF (HAVE_ATEXIT)
+ SET (AT_EXIT atexit)
+ ELSEIF (HAVE_ON_EXIT)
+ SET (AT_EXIT on_exit)
+ ENDIF ()
- IF (HAVE_ATEXIT)
- SET (AT_EXIT atexit)
- ELSEIF (HAVE_ON_EXIT)
- SET (AT_EXIT on_exit)
- ENDIF ()
+ CONFIG_DEFINE (AT_EXIT)
- CONFIG_DEFINE (AT_EXIT)
+ # sqMemoryAccess.h
- # sqMemoryAccess.h
+ # tty. set in outer CMakeLists.txt as well. oy vey./src/vm/interp.h
+ CHECK_INCLUDE_FILE (interp.h HAVE_INTERP_H -I${srcVMDir})
+ CONFIG_DEFINE (HAVE_INTERP_H)
- # tty. set in outer CMakeLists.txt as well. oy vey./src/vm/interp.h
- CHECK_INCLUDE_FILE (interp.h HAVE_INTERP_H -I${srcVMDir})
- CONFIG_DEFINE (HAVE_INTERP_H)
+ CHECK_TYPE_SIZE (int SIZEOF_INT)
+ CHECK_TYPE_SIZE (long SIZEOF_LONG)
+ CHECK_TYPE_SIZE ("long long" SIZEOF_LONG_LONG)
+ CHECK_TYPE_SIZE ("void *" SIZEOF_VOID_P)
- CHECK_TYPE_SIZE (int SIZEOF_INT)
- CHECK_TYPE_SIZE (long SIZEOF_LONG)
- CHECK_TYPE_SIZE ("long long" SIZEOF_LONG_LONG)
- CHECK_TYPE_SIZE ("void *" SIZEOF_VOID_P)
+ CONFIG_DEFINE (SIZEOF_INT)
+ CONFIG_DEFINE (SIZEOF_LONG)
+ CONFIG_DEFINE (SIZEOF_LONG_LONG)
+ CONFIG_DEFINE (SIZEOF_VOID_P)
- CONFIG_DEFINE (SIZEOF_INT)
- CONFIG_DEFINE (SIZEOF_LONG)
- CONFIG_DEFINE (SIZEOF_LONG_LONG)
- CONFIG_DEFINE (SIZEOF_VOID_P)
- MESSAGE("CMAKE_BINARY_DIR ${CMAKE_BINARY_DIR} ")
- MESSAGE("CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR} ")
- TRY_RUN (DOUBLE_WORD_ALIGNMENT tmp ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/testDoubleWordAlignment.c)
- TRY_RUN (DOUBLE_WORD_ORDER tmp ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/testDoubleWordOrder.c)
+ TRY_RUN (DOUBLE_WORD_ALIGNMENT tmp ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/testDoubleWordAlignment.c)
+ TRY_RUN (DOUBLE_WORD_ORDER tmp ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/testDoubleWordOrder.c)
- CONFIG_DEFINE (DOUBLE_WORD_ALIGNMENT)
- CONFIG_DEFINE (DOUBLE_WORD_ORDER)
+ CONFIG_DEFINE (DOUBLE_WORD_ALIGNMENT)
+ CONFIG_DEFINE (DOUBLE_WORD_ORDER)
- # sqPlatformSpecific.h
+ # sqPlatformSpecific.h
- CHECK_INCLUDE_FILE (alloca.h HAVE_ALLOCA_H)
+ CHECK_INCLUDE_FILE (alloca.h HAVE_ALLOCA_H)
- CONFIG_DEFINE (HAVE_ALLOCA_H)
+ CONFIG_DEFINE (HAVE_ALLOCA_H)
- IF (HAVE_ALLOCA_H)
- SET (HAVE_ALLOCA 1)
- ELSE ()
- CHECK_FUNCTION_EXISTS (alloca HAVE_ALLOCA)
- ENDIF ()
+ IF (HAVE_ALLOCA_H)
+ SET (HAVE_ALLOCA 1)
+ ELSE ()
+ CHECK_FUNCTION_EXISTS (alloca HAVE_ALLOCA)
+ ENDIF ()
- CONFIG_DEFINE (HAVE_ALLOCA)
+ CONFIG_DEFINE (HAVE_ALLOCA)
- # aio.c
+ # aio.c
- CHECK_INCLUDE_FILE (sys/time.h HAVE_SYS_TIME_H)
- CHECK_INCLUDE_FILE (sys/filio.h HAVE_SYS_FILIO_H)
+ CHECK_INCLUDE_FILE (sys/time.h HAVE_SYS_TIME_H)
+ CHECK_INCLUDE_FILE (sys/filio.h HAVE_SYS_FILIO_H)
- CONFIG_DEFINE (HAVE_SYS_TIME_H)
- CONFIG_DEFINE (HAVE_SYS_FILIO_H)
+ CONFIG_DEFINE (HAVE_SYS_TIME_H)
+ CONFIG_DEFINE (HAVE_SYS_FILIO_H)
- CHECK_FUNCTION_EXISTS (nanosleep HAVE_NANOSLEEP)
+ CHECK_FUNCTION_EXISTS (nanosleep HAVE_NANOSLEEP)
- CONFIG_DEFINE (HAVE_NANOSLEEP)
+ CONFIG_DEFINE (HAVE_NANOSLEEP)
- # sqUnixCharConv.c
+ # sqUnixCharConv.c
- CHECK_INCLUDE_FILE (iconv.h HAVE_ICONV_H)
- CHECK_INCLUDE_FILE (langinfo.h HAVE_LANGINFO_H)
+ CHECK_INCLUDE_FILE (iconv.h HAVE_ICONV_H)
+ CHECK_INCLUDE_FILE (langinfo.h HAVE_LANGINFO_H)
- IF (HAVE_LANGINFO_H)
- TRY_COMPILE (HAVE_LANGINFO_CODESET ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/testLanginfoCodeset.c)
- ENDIF (HAVE_LANGINFO_H)
+ IF (HAVE_LANGINFO_H)
+ TRY_COMPILE (HAVE_LANGINFO_CODESET ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/testLanginfoCodeset.c)
+ ENDIF (HAVE_LANGINFO_H)
- CHECK_LIBRARY_EXISTS (iconv libiconv_open "" HAVE_LIBICONV)
- IF (HAVE_LIBICONV)
- USE_LIBRARY (iconv)
- ENDIF (HAVE_LIBICONV)
+ CHECK_LIBRARY_EXISTS (iconv libiconv_open "" HAVE_LIBICONV)
+ IF (HAVE_LIBICONV)
+ USE_LIBRARY (iconv)
+ ENDIF (HAVE_LIBICONV)
- CONFIG_DEFINE (HAVE_ICONV_H)
- CONFIG_DEFINE (HAVE_LANGINFO_CODESET)
+ CONFIG_DEFINE (HAVE_ICONV_H)
+ CONFIG_DEFINE (HAVE_LANGINFO_CODESET)
- # sqUnixExternalPrims.c
+ # sqUnixExternalPrims.c
- CHECK_INCLUDE_FILE (dlfcn.h HAVE_DLFCN_H)
+ CHECK_INCLUDE_FILE (dlfcn.h HAVE_DLFCN_H)
- CHECK_LIBRARY_EXISTS (dl dlopen "" HAVE_LIBDL)
- IF (HAVE_LIBDL)
- USE_LIBRARY (dl)
- ENDIF (HAVE_LIBDL)
- IF (HAVE_LIBDL)
- SET (HAVE_DLOPEN 1)
- ELSE ()
- CHECK_FUNCTION_EXISTS (dlopen HAVE_DLOPEN)
- ENDIF (HAVE_LIBDL)
+ CHECK_LIBRARY_EXISTS (dl dlopen "" HAVE_LIBDL)
+ IF (HAVE_LIBDL)
+ USE_LIBRARY (dl)
+ ENDIF (HAVE_LIBDL)
+ IF (HAVE_LIBDL)
+ SET (HAVE_DLOPEN 1)
+ ELSE ()
+ CHECK_FUNCTION_EXISTS (dlopen HAVE_DLOPEN)
+ ENDIF (HAVE_LIBDL)
- CHECK_FUNCTION_EXISTS (_dyld_present HAVE_DYLD)
- CHECK_FUNCTION_EXISTS (snprintf HAVE_SNPRINTF)
- CHECK_FUNCTION_EXISTS (__snprintf HAVE___SNPRINTF)
+ CHECK_FUNCTION_EXISTS (_dyld_present HAVE_DYLD)
+ CHECK_FUNCTION_EXISTS (snprintf HAVE_SNPRINTF)
+ CHECK_FUNCTION_EXISTS (__snprintf HAVE___SNPRINTF)
- CONFIG_DEFINE (HAVE_DLFCN_H)
- CONFIG_DEFINE (HAVE_DLOPEN)
- CONFIG_DEFINE (HAVE_DYLD)
- CONFIG_DEFINE (HAVE_SNPRINTF)
- CONFIG_DEFINE (HAVE___SNPRINTF)
+ CONFIG_DEFINE (HAVE_DLFCN_H)
+ CONFIG_DEFINE (HAVE_DLOPEN)
+ CONFIG_DEFINE (HAVE_DYLD)
+ CONFIG_DEFINE (HAVE_SNPRINTF)
+ CONFIG_DEFINE (HAVE___SNPRINTF)
- SET (VM_X11DIR \"${X11_LIBRARY_DIR}\")
+ SET (VM_X11DIR \"${X11_LIBRARY_DIR}\")
- CONFIG_DEFINE (VM_X11DIR)
+ CONFIG_DEFINE (VM_X11DIR)
- SET (VM_MODULE_PREFIX \"${CMAKE_SHARED_MODULE_PREFIX}\")
+ SET (VM_MODULE_PREFIX \"${CMAKE_SHARED_MODULE_PREFIX}\")
- CONFIG_DEFINE (VM_MODULE_PREFIX)
+ CONFIG_DEFINE (VM_MODULE_PREFIX)
- SET (CMAKE_SHARED_MODULE_PREFIX "so.")
- SET (CMAKE_SHARED_MODULE_SUFFIX "")
+ SET (CMAKE_SHARED_MODULE_PREFIX "so.")
+ SET (CMAKE_SHARED_MODULE_SUFFIX "")
- SET (MODULE_PREFIX \"${CMAKE_SHARED_MODULE_PREFIX}\")
- SET (MODULE_SUFFIX \"${CMAKE_SHARED_MODULE_SUFFIX}\")
- SET (LIBRARY_PREFIX \"${CMAKE_SHARED_LIBRARY_PREFIX}\")
- SET (LIBRARY_SUFFIX \"${CMAKE_SHARED_LIBRARY_SUFFIX}\")
+ SET (MODULE_PREFIX \"${CMAKE_SHARED_MODULE_PREFIX}\")
+ SET (MODULE_SUFFIX \"${CMAKE_SHARED_MODULE_SUFFIX}\")
+ SET (LIBRARY_PREFIX \"${CMAKE_SHARED_LIBRARY_PREFIX}\")
+ SET (LIBRARY_SUFFIX \"${CMAKE_SHARED_LIBRARY_SUFFIX}\")
- CONFIG_DEFINE (MODULE_PREFIX)
- CONFIG_DEFINE (MODULE_SUFFIX)
- CONFIG_DEFINE (LIBRARY_PREFIX)
- CONFIG_DEFINE (LIBRARY_SUFFIX)
+ CONFIG_DEFINE (MODULE_PREFIX)
+ CONFIG_DEFINE (MODULE_SUFFIX)
+ CONFIG_DEFINE (LIBRARY_PREFIX)
+ CONFIG_DEFINE (LIBRARY_SUFFIX)
- # sqUnixMain.c
+ # sqUnixMain.c
- SET (VM_BUILD_STRING "\"Unix built on \"__DATE__ \" \"__TIME__\" Compiler: \"__VERSION__")
+ SET (VM_BUILD_STRING "\"Unix built on \"__DATE__ \" \"__TIME__\" Compiler: \"__VERSION__")
- CONFIG_DEFINE (VM_BUILD_STRING)
+ CONFIG_DEFINE (VM_BUILD_STRING)
- SET (VM_LIBDIR "\"${prefix}/${plgdir}\"")
+ SET (VM_LIBDIR "\"${prefix}/${plgdir}\"")
- CONFIG_DEFINE (VM_LIBDIR)
+ CONFIG_DEFINE (VM_LIBDIR)
- SET (VM_HOST \"${VM_HOST}\")
- SET (VM_HOST_CPU \"${VM_HOST_CPU}\")
- SET (VM_HOST_VENDOR \"${VM_HOST_VENDOR}\")
- SET (VM_HOST_OS \"${VM_HOST_OS}\")
+ SET (VM_HOST \"${VM_HOST}\")
+ SET (VM_HOST_CPU \"${VM_HOST_CPU}\")
+ SET (VM_HOST_VENDOR \"${VM_HOST_VENDOR}\")
+ SET (VM_HOST_OS \"${VM_HOST_OS}\")
- CONFIG_DEFINE (VM_HOST)
- CONFIG_DEFINE (VM_HOST_CPU)
- CONFIG_DEFINE (VM_HOST_VENDOR)
- CONFIG_DEFINE (VM_HOST_OS)
+ CONFIG_DEFINE (VM_HOST)
+ CONFIG_DEFINE (VM_HOST_CPU)
+ CONFIG_DEFINE (VM_HOST_VENDOR)
+ CONFIG_DEFINE (VM_HOST_OS)
- SET (VM_VERSION_INFO \"${VM_VERSION}${versionsuffix}\")
- SET (VM_VERSION \"${VM_VERSION}\")
- SET (PLATFORM_SOURCE_VERSION \"${PLATFORM_SOURCE_VERSION}\")
+ SET (VM_VERSION_INFO \"${VM_VERSION}${versionsuffix}\")
+ SET (VM_VERSION \"${VM_VERSION}\")
+ SET (PLATFORM_SOURCE_VERSION \"${PLATFORM_SOURCE_VERSION}\")
- CONFIG_DEFINE (VM_VERSION)
- CONFIG_DEFINE (VM_VERSION_INFO)
- CONFIG_DEFINE (PLATFORM_SOURCE_VERSION)
- CONFIG_DEFINE (SQ_VERSION)
+ CONFIG_DEFINE (VM_VERSION)
+ CONFIG_DEFINE (VM_VERSION_INFO)
+ CONFIG_DEFINE (PLATFORM_SOURCE_VERSION)
+ CONFIG_DEFINE (SQ_VERSION)
- CHECK_FUNCTION_EXISTS (tzset HAVE_TZSET)
- CHECK_VARIABLE_EXISTS (timezone HAVE_TIMEZONE)
- CHECK_STRUCT_HAS_MEMBER ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
+ CHECK_FUNCTION_EXISTS (tzset HAVE_TZSET)
+ CHECK_VARIABLE_EXISTS (timezone HAVE_TIMEZONE)
+ CHECK_STRUCT_HAS_MEMBER ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
- CONFIG_DEFINE (HAVE_TZSET)
- CONFIG_DEFINE (HAVE_TIMEZONE)
- CONFIG_DEFINE (HAVE_TM_GMTOFF)
+ CONFIG_DEFINE (HAVE_TZSET)
+ CONFIG_DEFINE (HAVE_TIMEZONE)
+ CONFIG_DEFINE (HAVE_TM_GMTOFF)
- CONFIG_DEFINE (IMAGE_DUMP)
+ CONFIG_DEFINE (IMAGE_DUMP)
- # sqUnixMemory.c
+ # sqUnixMemory.c
- CHECK_FUNCTION_EXISTS (mmap HAVE_MMAP)
+ CHECK_FUNCTION_EXISTS (mmap HAVE_MMAP)
- CONFIG_DEFINE (HAVE_MMAP)
+ CONFIG_DEFINE (HAVE_MMAP)
- # OLPC
+ # OLPC
- IF (NOT without-SUGAR)
- SET (SUGAR 1)
- ENDIF ()
+ IF (NOT without-SUGAR)
+ SET (SUGAR 1)
+ ENDIF ()
- CONFIG_DEFINE (SUGAR)
+ CONFIG_DEFINE (SUGAR)
+
+ IF (DEFINED SQ_VI_BYTES_PER_WORD)
+ CONFIG_DEFINE (SQ_VI_BYTES_PER_WORD)
+ ENDIF (DEFINED SQ_VI_BYTES_PER_WORD)
+
+ ENDIF (NOT DEFINED __sq_config_h)
- IF (DEFINED SQ_VI_BYTES_PER_WORD)
- CONFIG_DEFINE (SQ_VI_BYTES_PER_WORD)
- ENDIF (DEFINED SQ_VI_BYTES_PER_WORD)
'!
Item was removed:
- ----- Method: CPlatformConfigForSqueak>>thirdPartyLibs (in category 'cmake buildType redirects') -----
- thirdPartyLibs
- "Route this message send to the message appropriate for my buildType "
- |d |
- d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy.
- d
- at: #build put: [self thirdpartyLibsBuild];
- at: #buildAssert put: [self thirdpartyLibsBuildAssert];
- at: #buildAssertITimerHeartbeat put: [self thirdpartyLibsBuildAssertITimerHeartbeat];
- at:#buildDebug put: [self thirdpartyLibsBuildDebug];
- at: #buildDebugITimerHeartbeat put: [self thirdpartyLibsBuildDebugITimerHeartbeat ];
- at: #buildITimerHeartbeat put: [self thirdpartyLibsBuildITimerHeartbeat];
- at: #buildMultiThreaded put: [self thirdpartyLibsBuildMultiThreaded];
- at: #buildMultiThreadedAssert put: [self thirdpartyLibsBuildMultiThreadedAssert];
- at: #buildMultiThreadedDebug put: [self thirdpartyLibsBuildMultiThreadedDebug ];
- at: #buildNone put:[self thirdpartyLibsBuildNone].
- ^(d at: buildType) value
- !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>thirdpartyLibs (in category 'cmake buildType redirects') -----
+ thirdpartyLibs
+ "Route this message send to the message appropriate for my buildType "
+ |d |
+ d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy.
+ d
+ at: #build put: [self thirdpartyLibsBuild];
+ at: #buildAssert put: [self thirdpartyLibsBuildAssert];
+ at: #buildAssertITimerHeartbeat put: [self thirdpartyLibsBuildAssertITimerHeartbeat];
+ at:#buildDebug put: [self thirdpartyLibsBuildDebug];
+ at: #buildDebugITimerHeartbeat put: [self thirdpartyLibsBuildDebugITimerHeartbeat ];
+ at: #buildITimerHeartbeat put: [self thirdpartyLibsBuildITimerHeartbeat];
+ at: #buildMultiThreaded put: [self thirdpartyLibsBuildMultiThreaded];
+ at: #buildMultiThreadedAssert put: [self thirdpartyLibsBuildMultiThreadedAssert];
+ at: #buildMultiThreadedDebug put: [self thirdpartyLibsBuildMultiThreadedDebug ];
+ at: #buildNone put:[self thirdpartyLibsBuildNone].
+ ^(d at: buildType) value
+ !
Item was removed:
- ----- Method: Linux64x86w32BitConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
- super extraPluginSettings: maker.
- maker set: #linkFlags toString: '${linkFlags} -m32'!
Item was changed:
----- Method: Linux64x86w32BitConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') -----
postBuildActionsBuild: aMaker
"SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"
aMaker message: 'postBuildActionsBuild: aMaker'.
+ aMaker include: 'config.cmake'.
+ "# CONFIGURE_PLUGINS"
+ aMaker cmd: 'LIST' params:'REMOVE_DUPLICATES config_vars'.
+ aMaker cmd: 'FILE' params: 'WRITE ${CMAKE_BINARY_DIR}/config.h.in ""'.
+ aMaker puts:'
+ FOREACH (var ${config_vars})
+ FILE (APPEND ${CMAKE_BINARY_DIR}/config.h.in "#cmakedefine ${var} @${var}@\n")
+ ENDFOREACH (var)'.
+ aMaker cmd: 'CONFIGURE_FILE' params:'${CMAKE_BINARY_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h'.
+ "# INCLUDE(build.cmake) <--this tells me the config needs to be up higher
+ # BUILD PLUGINS
+ #ADD_SUBDIRECTORY (${unix}/npsqueak)
+ #SET (cmake ${unix}/../../cmake)
+ #IF (EXISTS ${cmake}/Packages.cmake)
+ # INCLUDE (${cmake}/Packages.cmake)
+ #ENDIF ()
+ "
+ aMaker cmd: 'GET_CMAKE_PROPERTY' params: 'tmp VARIABLES'.
+ aMaker cmd: 'LIST' params: 'REMOVE_ITEM tmp tmp'.
+ aMaker cmd: 'LIST' params: 'SORT tmp'.
+ aMaker cmd: 'FILE' params: 'WRITE ${CMAKE_BINARY_DIR}/config.h.status ""'.
+ aMaker puts:'
+ FILE (WRITE ${CMAKE_BINARY_DIR}/config.status "")
+ FOREACH (var ${tmp})
+ FILE (APPEND ${CMAKE_BINARY_DIR}/config.status "${var}=${${var}}\n")
+ ENDFOREACH ()'
+
+ !
- aMaker include: 'config.cmake'.!
Item was changed:
----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') -----
setGlobalOptionsAfterDetermineSystemBuild: aMaker
"
SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:'"
aMaker message: 'setGlobalOptionsAfterDetermineSystemBuild: aMaker'.
+ aMaker
+ include: 'Utils.cmake';
+ include: 'Plugins.cmake';
+ include: 'TestBigEndian';
+ include: 'CheckIncludeFile';
+ include: 'CheckLibraryExists';
+ include: 'CheckTypeSize';
+ include: 'CheckFunctionExists';
+ include: 'CheckVariableExists';
+ include: 'CheckStructHasMember';
+ include: 'FindPkgConfig'.
- aMaker include: 'Utils.cmake'.
- aMaker include: 'Plugins.cmake'
+ !
- " aMaker set: 'CMAKE_FIND_ROOT_PATH' to: '/usr/lib ' " !
Item was changed:
----- Method: Linux64x86w32BitSqueakCogV3Config>>defaultExternalPlugins (in category 'plugins') -----
defaultExternalPlugins
""
+ ^#()!
- ^ #(
-
- ThreadedFFIPlugin "SqueakFFIPrims"
- "UUIDPlugin"
- "UnixOSProcessPlugin ?? "
- JPEGReaderPlugin
- JPEGReadWriter2Plugin
- RePlugin
- )!
More information about the Vm-dev
mailing list