diff options
author | tpaviot <tpaviot@gmail.com> | 2011-05-01 17:13:53 +0200 |
---|---|---|
committer | Denis Barbier <bouzim@gmail.com> | 2011-05-01 22:25:26 +0200 |
commit | 24722d06cbcca403f7e9102e1fbfe72d3e9469ac (patch) | |
tree | 3945f8b198ce0ffbd607d2d022addb23e0a038eb | |
parent | 4d158c7fd9a2f09756b2795a42d7c1d630b35f96 (diff) | |
download | oce-24722d06cbcca403f7e9102e1fbfe72d3e9469ac.tar.gz oce-24722d06cbcca403f7e9102e1fbfe72d3e9469ac.zip |
Added support for Fink Tcl/TK under OSX
Removed ?? from PTHREAD status message
Added status message for TCL and TK libraries
-rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0689b754..948d955f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,7 +205,7 @@ IF(${PROJECT_NAME}_VISUALISATION_FULL) MESSAGE(STATUS "OPENGL LIBS: ${OPENGL_LIBRARIES}") MESSAGE(STATUS "FREETYPE LIBS: ${FREETYPE_LIBRARIES}") MESSAGE(STATUS "FREETYPE INCLUDES: ${FREETYPE_INCLUDE_DIRS}") - MESSAGE(STATUS "THREAD LIB??: ${CMAKE_THREAD_LIBS_INIT}") + MESSAGE(STATUS "THREAD LIB: ${CMAKE_THREAD_LIBS_INIT}") FILE(GLOB TEXTURES_RGB_FILES RELATIVE ${${PROJECT_NAME}_SOURCE_DIR} src/Textures/*.rgb) FILE(GLOB FONTMFT_MFT_FILES RELATIVE ${${PROJECT_NAME}_SOURCE_DIR} src/FontMFT/*.mft) @@ -239,7 +239,22 @@ IF(${PROJECT_NAME}_DATAEXCHANGE) ENDIF(${PROJECT_NAME}_DATAEXCHANGE) IF(${PROJECT_NAME}_DRAW) - FIND_PACKAGE(TCL REQUIRED) + IF (NOT APPLE) + FIND_PACKAGE(TCL REQUIRED) + ELSE(NOT APPLE) + # under OSX, should use a X11 based TCL/TK, for instance fink's implementation + SET(FINK_INSTALL_PATH /sw) + MARK_AS_ADVANCED(FINK_INSTALL_PATH) + SET(TCL_LIBRARY ${FINK_INSTALL_PATH}/lib/libtcl.dylib) + SET(TCL_INCLUDE_PATH ${FINK_INSTALL_PATH}/include) + SET(TCL_TCLSH ${FINK_INSTALL_PATH}/bin/tclsh) + SET(TK_LIBRARY ${FINK_INSTALL_PATH}/lib/libtk.dylib) + SET(TK_INCLUDE_PATH ${FINK_INSTALL_PATH}/include) + SET(TK_WISH ${FINK_INSTALL_PATH}/bin/wish) + MARK_AS_ADVANCED(TCL_INCLUDE_PATH TK_INCLUDE_PATH TCL_LIBRARY TK_LIBRARY) + ENDIF(NOT APPLE) + MESSAGE(STATUS "TCL LIB: ${TCL_LIBRARY}") + MESSAGE(STATUS "TK LIB: ${TK_LIBRARY}") FILE(GLOB DRAWRESOURCES_TCL_FILES RELATIVE ${${PROJECT_NAME}_SOURCE_DIR} src/DrawResources/*.tcl) SET(INSTALL_RESOURCE_FILES ${INSTALL_RESOURCE_FILES} ${DRAWRESOURCES_TCL_FILES} |