[Vm-dev] VM Maker: CMakeVMMakerSqueak-tty.86.mcz

commits at source.squeak.org commits at source.squeak.org
Fri Jul 11 13:02:09 UTC 2014


Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.86.mcz

==================== Summary ====================

Name: CMakeVMMakerSqueak-tty.86
Author: tty
Time: 11 July 2014, 9:02:18.254 am
UUID: c67bddb6-aaa8-445f-bd0f-e92b23527222
Ancestors: CMakeVMMakerSqueak-tty.85

Correctly implement one configuration that compiles and launches.

Next up: Make CMake the driver in the generate stage. This means CMake terminilogy for libs, flags, definitions, etc.

=============== Diff against CMakeVMMakerSqueak-tty.85 ===============

Item was changed:
  ----- Method: CMakePluginGeneratorForSqueak>>configDotUUIDPlugin (in category 'cmake commands') -----
  configDotUUIDPlugin
+ 	^'
+ PLUGIN_FIND_INCLUDE (UUID uuid.h)
- 	^'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 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.
+ "I NEED COMPILER FLAGS, DEFINITIONS, LINKS, INCLUDES HERE"
- 
  	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: CPlatformConfigForSqueak class>>vmConfigCmake (in category 'as yet unclassified') -----
  vmConfigCmake
+ 	"see svn co http://squeakvm.org/svn/squeak/trunk/platforms/unix/vm/config.cmake for original.
+ 	my subclasses have custom version of that script.
+ 	 "
+ 	self subclassResponsibility.
+ !
- 	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\")
- 	CONFIG_DEFINE (OS_TYPE)
- 
- 	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})
- 
- 	IF (APPLE)
- 	  SET (DARWIN 1)
- 	  STRING_APPEND (CMAKE_C_FLAGS -DMACOSX)		# ffi.h
- 	  USE_FRAMEWORK (CoreFoundation)
- 	  USE_FRAMEWORK (CoreServices)
- 	ENDIF (APPLE)
- 
- 	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)
- 
- #    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 ()
- 
- 	message("without-gl = ${without_gl}")
- 
- 	IF (NOT without-gl)
- 	  FIND_PACKAGE (OpenGL)
-  	 LIST (REMOVE_DUPLICATES 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 ()
- 
- 	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)
- 
- 	IF (HAVE_ATEXIT)
- 	  SET (AT_EXIT atexit)
- 	ELSEIF (HAVE_ON_EXIT)
- 	  SET (AT_EXIT on_exit)
- 	ENDIF ()
- 
- 	CONFIG_DEFINE (AT_EXIT)
- 
- 	# 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)
- 
- 	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)
- 
- 	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)
- 
- 	# sqPlatformSpecific.h
- 
- 	CHECK_INCLUDE_FILE (alloca.h HAVE_ALLOCA_H)
- 
- 	CONFIG_DEFINE (HAVE_ALLOCA_H)
- 
- 	IF (HAVE_ALLOCA_H)
-  	 SET (HAVE_ALLOCA 1)
- 	ELSE ()
- 	  CHECK_FUNCTION_EXISTS (alloca HAVE_ALLOCA)
- 	ENDIF ()
- 
- 	CONFIG_DEFINE (HAVE_ALLOCA)
- 
- 	# aio.c
- 
- 	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)
- 
- 	CHECK_FUNCTION_EXISTS (nanosleep HAVE_NANOSLEEP)
- 
- 	CONFIG_DEFINE (HAVE_NANOSLEEP)
- 
- 	# sqUnixCharConv.c
- 
- 	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)
- 
- 	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)
- 
- 	# sqUnixExternalPrims.c
- 
- 	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_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)
- 
- 	SET (VM_X11DIR \"${X11_LIBRARY_DIR}\")
- 
- 	CONFIG_DEFINE (VM_X11DIR)
- 
- 	SET (VM_MODULE_PREFIX \"${CMAKE_SHARED_MODULE_PREFIX}\")
- 
- 	CONFIG_DEFINE (VM_MODULE_PREFIX)
- 
- 	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}\")
- 
- 	CONFIG_DEFINE (MODULE_PREFIX)
- 	CONFIG_DEFINE (MODULE_SUFFIX)
- 	CONFIG_DEFINE (LIBRARY_PREFIX)
- 	CONFIG_DEFINE (LIBRARY_SUFFIX)
- 
- 	# sqUnixMain.c
- 
- 	SET (VM_BUILD_STRING "\"Unix built on \"__DATE__ \" \"__TIME__\" Compiler: \"__VERSION__")
- 
- 	CONFIG_DEFINE (VM_BUILD_STRING)
- 
- 	SET (VM_LIBDIR "\"${prefix}/${plgdir}\"")
- 
- 	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}\")
- 
- 	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}\")
- 
- 	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)
- 
- 	CONFIG_DEFINE (HAVE_TZSET)
- 	CONFIG_DEFINE (HAVE_TIMEZONE)
- 	CONFIG_DEFINE (HAVE_TM_GMTOFF)
- 
- 	CONFIG_DEFINE (IMAGE_DUMP)
- 
- 	# sqUnixMemory.c
- 
- 	CHECK_FUNCTION_EXISTS (mmap HAVE_MMAP)
- 
- 	CONFIG_DEFINE (HAVE_MMAP)
- 
- 	# OLPC
- 
- 	IF (NOT without-SUGAR)
-  	 SET (SUGAR 1)
- 	ENDIF ()
- 
- 	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)
- '!

Item was changed:
  ----- Method: CPlatformConfigForSqueak>>buildScript (in category 'squeak compatability') -----
  buildScript
+ 	"see standardVM/platforms/unix/cmake/configure"
- 	"answer the build script build.sh"
  	^ '#!!/usr/bin/env bash
  cmake .
+ make'
+ 
+ "  cmake '${unix}'' -DVM_HOST=''${host}'' -DVM_VERSION=''${VM_VERSION}'' -DPLATFORM_SOURCE_VERSION=''${PLATFORM_SOURCE_VERSION}'' -DSRC=''${src}'' -DOPT--CMAKE_C_FLAGS=''${cflags}'' ${args}
+ "!
- make'!

Item was changed:
  ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuild (in category 'cmake buildType redirects') -----
  compilerFlagsBuild
+ 	"this is stupid. We have C_FLAGS, compilerflags, link flags, ld flags definitions."
  	"Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems"
  	^{ 
    '-g3'                                               "more debugging"
   . '-O1'                                              "low optimization level"
   . '-m32'
   . '-msse2'
   . '-D_GNU_SOURCE'
   . '-D_FILE_OFFSET_BITS=64'
   . '-DNDEBUG'                                      "disable assertions"
   . '-DLSB_FIRST=1'                               ""
   . '-DUSE_GLOBAL_STRUCT=0'
   . '-DDEBUGVM=0'
   . '-DCOGMTVM=0'
   . '-fno-tree-pre	'
   . '-fno-caller-saves'
  " . '-L/usr/lib'"
  }
  
  !

Item was added:
+ ----- Method: SqueakUnixConfig class>>vmConfigCmake (in category 'nil') -----
+ vmConfigCmake
+ 	"move the CXX_FLAGS out later
+ "
+ 	^'
+ 
+ IF (NOT DEFINED __sq_config_h)
+ 
+ 	  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -Wall -m32")
+ 	  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  -Wall -m32")
+ 	  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}  -Wall -m32")
+ 	  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}  -Wall -m32")
+ 	  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}  -Wall -m32")
+ 	  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -m32")
+ 	  MESSAGE("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}")
+ 	  MESSAGE("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}")
+ 	  MESSAGE("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}")
+ 	  MESSAGE("CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}")
+ 	  MESSAGE("CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}")
+ 	  GET_DIRECTORY_PROPERTY( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )
+ 	  FOREACH( d ${DirDefs} )
+ 	      MESSAGE( STATUS "Found Define: " ${d} )
+ 	  ENDFOREACH()
+ 	  MESSAGE( STATUS "DirDefs: " ${DirDefs} )
+ 
+ 	SET(__sq_config_h 1)
+ 	CONFIG_DEFINE(__sq_config_h)
+ 
+ 	SET (OS_TYPE \"unix\")
+ 	CONFIG_DEFINE (OS_TYPE)
+ 
+ 	SET (version  \"1.2.3.4\")
+ 
+ 	SET (without_gl "")
+ 	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 (CMAKE_COMPILER_IS_GNUCC)
+ 	  SET (interp gnu-interp)
+ 	ELSE ()
+ 	  SET (interp interp)
+  	 MESSAGE ("!!!! Cannot optimise interpreter performance for GCC")
+ 	ENDIF (CMAKE_COMPILER_IS_GNUCC)
+ 
+ #LIBRARIES
+ #define HAVE_LANGINFO_CODESET 1
+ #define	TIME_WITH_SYS_TIME 1
+ #define	HAVE_LIBDL 1
+ 	CHECK_LIBRARY_EXISTS (dl dlopen "" HAVE_LIBDL)
+ 	IF (HAVE_LIBDL)
+  	 CONFIG_DEFINE(HAVE_LIBDL)
+ 	ENDIF (HAVE_LIBDL)
+ 
+ #HEADERS
+ 	check_include_file("unistd.h" HAVE_UNISTD_H)
+ 	if(HAVE_UNISTD_H)
+ 	 CONFIG_DEFINE(HAVE_UNISTD_H)
+ 	endif()
+ 
+ 	check_include_file("dirent.h" HAVE_DIRENT_H)
+ 	if(HAVE_DIRENT_H)
+ 	 CONFIG_DEFINE(HAVE_DIRENT_H)
+ 	endif()
+ 
+ 	check_include_file("pty.h" HAVE_PTY_H)
+ 	if(HAVE_PTY_H)
+ 	 CONFIG_DEFINE(HAVE_PTY_H)
+ 	endif()
+ 
+ 	check_include_file("stropts.h" HAVE_STROPTS_H)
+ 	if(HAVE_STROPTS_H)
+ 	 CONFIG_DEFINE(HAVE_STROPTS_H)
+ 	endif()
+ 
+ #PACKAGES
+ 	FIND_PACKAGE (X11)
+ 	IF (X11_FOUND)
+  	 LIST (REMOVE_DUPLICATES X11_INCLUDE_DIR)
+ 	 SET(USE_X11 1)
+ 	 CONFIG_DEFINE(USE_X11)
+ 	ENDIF ()
+ 
+ 	message("without-gl = ${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 ()
+ 
+ 	MESSAGE("OPENGL variables:")
+ 	 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 ()
+ 
+ 	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)
+ 
+ 	IF (HAVE_ATEXIT)
+ 	  SET (AT_EXIT atexit)
+ 	ELSEIF (HAVE_ON_EXIT)
+ 	  SET (AT_EXIT on_exit)
+ 	ENDIF ()
+ 
+ 	CONFIG_DEFINE (AT_EXIT)
+ 
+ 	MESSAGE("# sqMemoryAccess.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)
+ 
+ 	CONFIG_DEFINE (SIZEOF_INT)
+ 	CONFIG_DEFINE (SIZEOF_LONG)
+ 	CONFIG_DEFINE (SIZEOF_LONG_LONG)
+ 	CONFIG_DEFINE (SIZEOF_VOID_P)
+ 
+ 	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)
+ 
+ 	MESSAGE("# sqPlatformSpecific.h")
+ 
+ 	CHECK_INCLUDE_FILE (alloca.h HAVE_ALLOCA_H)
+ 	CONFIG_DEFINE (HAVE_ALLOCA_H)
+ 	IF (HAVE_ALLOCA_H)
+  	 SET (HAVE_ALLOCA 1)
+ 	ELSE ()
+ 	  CHECK_FUNCTION_EXISTS (alloca HAVE_ALLOCA)
+ 	ENDIF ()
+ 
+ 	CONFIG_DEFINE (HAVE_ALLOCA)
+ 
+ 	MESSAGE("# aio.c")
+ 
+ 	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)
+ 
+ 	CHECK_FUNCTION_EXISTS (nanosleep HAVE_NANOSLEEP)
+ 
+ 	CONFIG_DEFINE (HAVE_NANOSLEEP)
+ 
+ 	MESSAGE("# sqUnixCharConv.c")
+ 
+ 	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)
+ 
+ 	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)
+ 
+ 	MESSAGE("# sqUnixExternalPrims.c")
+ 
+ 	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_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)
+ 
+ 	SET (VM_X11DIR \"${X11_LIBRARY_DIR}\")
+ 
+ 	CONFIG_DEFINE (VM_X11DIR)
+ 
+ 	SET (VM_MODULE_PREFIX \"${CMAKE_SHARED_MODULE_PREFIX}\")
+ 
+ 	CONFIG_DEFINE (VM_MODULE_PREFIX)
+ 
+ 	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}\")
+ 
+ 	CONFIG_DEFINE (MODULE_PREFIX)
+ 	CONFIG_DEFINE (MODULE_SUFFIX)
+ 	CONFIG_DEFINE (LIBRARY_PREFIX)
+ 	CONFIG_DEFINE (LIBRARY_SUFFIX)
+ 
+ 	MESSAGE("# sqUnixMain.c")
+ 
+ 	SET (VM_BUILD_STRING "\"Unix built on \"__DATE__ \" \"__TIME__\" Compiler: \"__VERSION__")
+ 
+ 	CONFIG_DEFINE (VM_BUILD_STRING)
+ 
+ 
+ 	SET (VM_LIBDIR "\"${prefix}/${plgdir}\"")
+ 
+ 	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}\")
+ 
+ 	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}\")
+ 
+ 	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)
+ 
+ 	CONFIG_DEFINE (HAVE_TZSET)
+ 	CONFIG_DEFINE (HAVE_TIMEZONE)
+ 	CONFIG_DEFINE (HAVE_TM_GMTOFF)
+ 
+ 	CONFIG_DEFINE (IMAGE_DUMP)
+ 
+ 	MESSAGE("# sqUnixMemory.c")
+ 
+ 	CHECK_FUNCTION_EXISTS (mmap HAVE_MMAP)
+ 	CONFIG_DEFINE (HAVE_MMAP)
+ 
+ 	MESSAGE("# OLPC")
+ 
+ 	IF (NOT without-SUGAR)
+  	 SET (SUGAR 1)
+ 	ENDIF ()
+ 
+ 	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)
+ '!

Item was changed:
  ----- Method: SqueakUnixConfig>>extraSources (in category 'source files') -----
  extraSources	
+ 	"platforms/unix/vm/sqUnixMain.c.o: In function `getVersionInfo': requires this"
+ 	^ 'version.c'!
- 	^ ''!



More information about the Vm-dev mailing list