Author: piumarta Date: 2009-08-26 23:09:55 -0700 (Wed, 26 Aug 2009) New Revision: 2108
Modified: trunk/platforms/unix/CMakeLists.txt trunk/platforms/unix/cmake/Plugins.cmake Log: recognise --without-PluginName for all plugins
Modified: trunk/platforms/unix/CMakeLists.txt =================================================================== --- trunk/platforms/unix/CMakeLists.txt 2009-08-27 06:09:09 UTC (rev 2107) +++ trunk/platforms/unix/CMakeLists.txt 2009-08-27 06:09:55 UTC (rev 2108) @@ -1,6 +1,6 @@ # Yes, it's true: you can write makefiles in COBOL. # -# Last edited: 2009-08-21 10:38:21 by piumarta on ubuntu.piumarta.com +# Last edited: 2009-08-26 22:47:15 by piumarta on emilia-2.local
PROJECT (squeak)
@@ -63,17 +63,19 @@ SET (vm-host-os "${VM_HOST_OS}") SET (vm-host-cpu "${VM_HOST_CPU}")
-IF (OPT_CFLAGS) - SET (CMAKE_C_FLAGS "${OPT_CFLAGS}") -ENDIF (OPT_CFLAGS) +IF (OPT--CFLAGS) + SET (CMAKE_C_FLAGS "${OPT--CFLAGS}") +ENDIF ()
IF (NOT CMAKE_C_FLAGS) IF (CMAKE_COMPILER_IS_GNUCC) - IF (${VM_HOST_CPU} MATCHES "i.86") + IF (VM_HOST_CPU MATCHES "i.86") SET (CMAKE_C_FLAGS "-g -O2 -fomit-frame-pointer") - ELSEIF (${VM_HOST_CPU} STREQUAL "ppc" OR ${VM_HOST_CPU} STREQUAL "powerpc") + ELSEIF (VM_HOST_CPU STREQUAL "ppc" OR VM_HOST_CPU STREQUAL "powerpc") SET (CMAKE_C_FLAGS "-g -O3 -funroll-loops -mcpu=750 -mno-fused-madd") ENDIF () + ELSE () + SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_RELEASE}") ENDIF (CMAKE_COMPILER_IS_GNUCC) ENDIF (NOT CMAKE_C_FLAGS)
@@ -81,6 +83,8 @@ SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_RELEASE}") ENDIF (NOT CMAKE_C_FLAGS)
+MESSAGE (STATUS "Using CFLAGS ${CMAKE_C_FLAGS}") + MACRO (USE_LIBRARY lib) LIST (APPEND squeak_libs "${lib}") ENDMACRO (USE_LIBRARY)
Modified: trunk/platforms/unix/cmake/Plugins.cmake =================================================================== --- trunk/platforms/unix/cmake/Plugins.cmake 2009-08-27 06:09:09 UTC (rev 2107) +++ trunk/platforms/unix/cmake/Plugins.cmake 2009-08-27 06:09:55 UTC (rev 2108) @@ -1,6 +1,6 @@ # Figure out which plugins to build and create a configuration for each. # -# Last edited: 2009-08-26 11:58:56 by piumarta on ubuntu.piumarta.com +# Last edited: 2009-08-26 21:00:32 by piumarta on emilia-2.local
FILE (STRINGS ${src}/plugins.int plugins_int) STRING (REGEX REPLACE ".*= (.*)" "\1" plugins_int ${plugins_int}) @@ -98,7 +98,7 @@ ENDIF (${plugins_list} STREQUAL "plugins_int") SET (plugin_disabled) INCLUDE (${bld}/${plugin}/config.cmake) - IF (OPT_without-${plugin}) + IF (without-${plugin}) SET (plugin_disabled 1) ENDIF () IF (DEFINED plugin_disabled)
vm-dev@lists.squeakfoundation.org