Author: piumarta Date: 2009-08-26 12:07:50 -0700 (Wed, 26 Aug 2009) New Revision: 2094
Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/vm/build.cmake trunk/platforms/unix/vm/config.cmake Log: remove /usr/pkg tests; treat vm as plugin target
Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-26 19:03:50 UTC (rev 2093) +++ trunk/platforms/unix/ChangeLog 2009-08-26 19:07:50 UTC (rev 2094) @@ -1,5 +1,9 @@ 2009-08-26 piumarta@ubuntu.piumarta.com
+ * vm/config.cmake: Remove explicit test for /usr/pkg. + * vm/build.cmake: Search vm_include_directories and + vm_link_directories. Link against vm_link_libraries. + * cmake/PluginInternal.cmake, cmake/PluginExternal.cmake: Remove CMAKE_REQUIRE_INCLUDES from include paths.
Modified: trunk/platforms/unix/vm/build.cmake =================================================================== --- trunk/platforms/unix/vm/build.cmake 2009-08-26 19:03:50 UTC (rev 2093) +++ trunk/platforms/unix/vm/build.cmake 2009-08-26 19:07:50 UTC (rev 2094) @@ -1,3 +1,5 @@ +LINK_DIRECTORIES (${vm_link_directories}) + ADD_EXECUTABLE (squeakvm ${src}/vm/interp.c ${unix}/vm/aio.c @@ -26,11 +28,12 @@ ${unix}/plugins/B3DAcceleratorPlugin # for sqUnixOpenGL.h ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} + ${vm_include_directories} )
SET_TARGET_PROPERTIES (squeakvm PROPERTIES LINK_FLAGS "${CMAKE_EXE_EXPORTS_C_FLAG}")
-TARGET_LINK_LIBRARIES (squeakvm m ${squeak_libs}) +TARGET_LINK_LIBRARIES (squeakvm m ${squeak_libs} ${vm_link_libraries})
INSTALL (PROGRAMS ${bld}/squeakvm DESTINATION ${plgdir})
Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2009-08-26 19:03:50 UTC (rev 2093) +++ trunk/platforms/unix/vm/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) @@ -15,14 +15,6 @@
CONFIG_DEFINE (DARWIN)
-IF (EXISTS /usr/pkg/include) - LIST (APPEND CMAKE_REQUIRED_INCLUDES /usr/pkg/include) -ENDIF (EXISTS /usr/pkg/include) - -IF (EXISTS /usr/pkg/lib) - LIST (APPEND CMAKE_REQUIRED_LIBRARIES -L/usr/pkg/lib) -ENDIF (EXISTS /usr/pkg/lib) - SET (interp interp)
INCLUDE (TestBigEndian)