VM Maker: CMakeVMMaker-EstebanLorenzano.167.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

VM Maker: CMakeVMMaker-EstebanLorenzano.167.mcz

commits-2
 
Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.167.mcz

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

Name: CMakeVMMaker-EstebanLorenzano.167
Author: EstebanLorenzano
Time: 21 June 2012, 9:10:15.172 am
UUID: 7e1f3ee6-b705-bc42-a44d-10737e407627
Ancestors: CMakeVMMaker-EstebanLorenzano.166

changed the order of external library links, so it compiles on windows

=============== Diff against CMakeVMMaker-EstebanLorenzano.166 ===============

Item was changed:
  ----- Method: CMakeVMGenerator>>generate (in category 'code generation') -----
  generate
  | intPlugins extPlugins |
 
  output := String new writeStream.
 
  config setGlobalOptions: self.
 
  self
  printHeader;
  project: config executableName.
 
  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 , ')'.
 
  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}'.
-
 
- self processPlugins:  intPlugins, extPlugins.
-
  config postBuildActions: self.
 
  self saveFile.
  !