Permalink
Browse files

Rejiggered 64-bit architecture detection: added the CMake option LIB_…

…SUFFIX to override lib/lib64 installation path autodetection. Specifying LIB_SUFFIX 'foo' will cause libraries to be installed to install_prefix/libfoo/
  • Loading branch information...
1 parent 756c4d4 commit 3edf5a33e390090a6a166cc0f63d8a00353509d4 Rich Mattes committed Sep 15, 2010
Showing with 6 additions and 5 deletions.
  1. +5 −4 cmake/internal/FindOS.cmake
  2. +1 −1 libstage/canvas.cc
@@ -61,12 +61,13 @@ ENDIF (PROJECT_OS_LINUX)
IF(PROJECT_PROC_64BIT)
# Set the install path to lib64
- SET(PROJECT_LIB_DIR "lib64")
- SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}")
+ SET(LIB_SUFFIX "64" CACHE STRING "Suffix for installation library directory")
ELSE (PROJECT_PROC_64BIT)
- SET(PROJECT_LIB_DIR "lib")
- SET(PROJECT_PLUGIN_DIR "lib/${PROJECT_NAME}-${APIVERSION}")
+ SET(LIB_SUFFIX "" CACHE STRING "Suffix for installation library directory")
ENDIF (PROJECT_PROC_64BIT)
+
+SET(PROJECT_LIB_DIR "lib${LIB_SUFFIX}")
+SET(PROJECT_PLUGIN_DIR "lib${LIB_SUFFIX}/${PROJECT_NAME}-${APIVERSION}")
MESSAGE(STATUS "Installing Libraries to ${CMAKE_INSTALL_PREFIX}/${PROJECT_LIB_DIR}")
MESSAGE(STATUS "Installing Plugins to ${CMAKE_INSTALL_PREFIX}/${PROJECT_PLUGIN_DIR}")
View
@@ -685,7 +685,7 @@ void Canvas::DrawFloor()
glVertex2f( bounds.x.min, bounds.y.max );
glEnd();
- glEnd();
+ //glEnd();
}
void Canvas::DrawBlocks()

0 comments on commit 3edf5a3

Please sign in to comment.