Changeset 6473

Show
Ignore:
Timestamp:
04/11/07 10:30:07
Author:
robert
Message:

Removed tabs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenThreads/trunk/CMakeLists.txt

    r6429 r6473  
    2222IF(UNIX AND NOT WIN32 AND NOT APPLE) 
    2323  IF(CMAKE_SIZEOF_VOID_P MATCHES "8") 
    24        SET(LIB_POSTFIX "64") 
     24      SET(LIB_POSTFIX "64") 
    2525  ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") 
    2626ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) 
    …… 
    3131# common files  
    3232SET(OpenThreads_PUBLIC_HEADERS 
    33        ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Barrier 
    34        ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Condition 
    35        ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Exports 
    36        ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Mutex 
    37        ${OpenThreads_SOURCE_DIR}/include/OpenThreads/ScopedLock 
    38        ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Thread 
    39        ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Block 
    40        ${OpenThreads_SOURCE_DIR}/include/OpenThreads/ReentrantMutex 
    41        ${OpenThreads_SOURCE_DIR}/include/OpenThreads/ReadWriteMutex 
     33    ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Barrier 
     34    ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Condition 
     35    ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Exports 
     36    ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Mutex 
     37    ${OpenThreads_SOURCE_DIR}/include/OpenThreads/ScopedLock 
     38    ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Thread 
     39    ${OpenThreads_SOURCE_DIR}/include/OpenThreads/Block 
     40    ${OpenThreads_SOURCE_DIR}/include/OpenThreads/ReentrantMutex 
     41    ${OpenThreads_SOURCE_DIR}/include/OpenThreads/ReadWriteMutex 
    4242) 
    4343 
    …… 
    4545# Hmmm, this isn't working for me in Xcode. 
    4646# SOURCE_GROUP( 
    47 #      "Header Files" 
    48 #      FILES ${OpenThreads_PUBLIC_HEADERS} 
     47#     "Header Files" 
     48#     FILES ${OpenThreads_PUBLIC_HEADERS} 
    4949# ) 
    5050 
    5151# Make the headers visible to everything 
    5252INCLUDE_DIRECTORIES( 
    53        ${OpenThreads_SOURCE_DIR}/include 
     53    ${OpenThreads_SOURCE_DIR}/include 
    5454) 
    5555 
    …… 
    6161OPTION(DYNAMIC_OPENTHREADS "Set to ON to build OpenThreads for dynamic linking.  Use OFF for static." ON) 
    6262IF   (DYNAMIC_OPENTHREADS) 
    63        SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED") 
     63    SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED") 
    6464ELSE (DYNAMIC_OPENTHREADS) 
    65        SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC") 
     65    SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC") 
    6666ENDIF(DYNAMIC_OPENTHREADS) 
    6767 
    …… 
    7171# Do we have sproc? 
    7272IF(CMAKE_SYSTEM MATCHES IRIX) 
    73        IF(CMAKE_USE_SPROC_INIT) 
    74                # In this case, only Sproc exists, so no option. 
    75                SET(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS 1) 
    76        ELSE(CMAKE_USE_SPROC_INIT) 
    77                IF(CMAKE_HAVE_SPROC_H) 
    78                        OPTION(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS "Set to ON to build OpenThreads against sproc instead of pthreads" OFF) 
    79                ENDIF(CMAKE_HAVE_SPROC_H) 
    80        ENDIF(CMAKE_USE_SPROC_INIT) 
     73    IF(CMAKE_USE_SPROC_INIT) 
     74        # In this case, only Sproc exists, so no option. 
     75        SET(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS 1) 
     76    ELSE(CMAKE_USE_SPROC_INIT) 
     77        IF(CMAKE_HAVE_SPROC_H) 
     78            OPTION(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS "Set to ON to build OpenThreads against sproc instead of pthreads" OFF) 
     79        ENDIF(CMAKE_HAVE_SPROC_H) 
     80    ENDIF(CMAKE_USE_SPROC_INIT) 
    8181ENDIF(CMAKE_SYSTEM MATCHES IRIX) 
    8282 
    8383# Maybe we should be using the FindThreads.cmake module? 
    8484IF(WIN32) 
    85        # So I think Cygwin wants to use pthreads 
    86        IF(CYGWIN) 
    87                SUBDIRS(pthread_src examples_src) 
    88        ELSE(CYGWIN) 
    89                # Everybody else including Msys should probably go here 
    90                SUBDIRS(win32_src)  
    91                # examples_src) 
    92        ENDIF(CYGWIN) 
     85    # So I think Cygwin wants to use pthreads 
     86    IF(CYGWIN) 
     87        SUBDIRS(pthread_src examples_src) 
     88    ELSE(CYGWIN) 
     89        # Everybody else including Msys should probably go here 
     90        SUBDIRS(win32_src)  
     91        # examples_src) 
     92    ENDIF(CYGWIN) 
    9393ELSE(WIN32) 
    94        IF(UNIX) 
    95                IF(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS) 
    96                        SUBDIRS(sproc_src examples_src) 
    97                ELSE(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS) 
    98                        SUBDIRS(pthread_src examples_src) 
    99                ENDIF(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS) 
    100        ELSE(UNIX) 
    101                MESSAGE("Sorry, OpenThreads may not support your platform") 
    102        ENDIF(UNIX) 
     94    IF(UNIX) 
     95        IF(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS) 
     96            SUBDIRS(sproc_src examples_src) 
     97        ELSE(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS) 
     98            SUBDIRS(pthread_src examples_src) 
     99        ENDIF(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS) 
     100    ELSE(UNIX) 
     101        MESSAGE("Sorry, OpenThreads may not support your platform") 
     102    ENDIF(UNIX) 
    103103ENDIF(WIN32) 
    104104 
    …… 
    133133# and then do the equivalent of "make DoxygenDoc". 
    134134IF(BUILD_DOCUMENTATION) 
    135        IF(DOT) 
    136                SET(HAVE_DOT YES) 
    137        ELSE(DOT) 
    138                SET(HAVE_DOT NO) 
    139        ENDIF(DOT) 
    140        # This processes our Doxyfile.in and substitutes paths to generate 
    141        # a final Doxyfile 
    142        CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/docs/doxyfile.cmake 
    143                ${PROJECT_BINARY_DIR}/docs/doxyfile 
    144                ) 
    145        # This creates a new target to build documentation. 
    146        # It runs ${DOXYGEN} which is the full path and executable to 
    147        # Doxygen on your system, set by the FindDoxygen.cmake module 
    148        # (called by FindDocumentation.cmake). 
    149        # It runs the final generated Doxyfile against it. 
    150        # The DOT_PATH is substituted into the Doxyfile. 
    151        ADD_CUSTOM_TARGET(DoxygenDoc ${DOXYGEN} 
    152                ${PROJECT_BINARY_DIR}/docs/doxyfile 
    153        ) 
     135    IF(DOT) 
     136        SET(HAVE_DOT YES) 
     137    ELSE(DOT) 
     138        SET(HAVE_DOT NO) 
     139    ENDIF(DOT) 
     140    # This processes our Doxyfile.in and substitutes paths to generate 
     141    # a final Doxyfile 
     142    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/docs/doxyfile.cmake 
     143        ${PROJECT_BINARY_DIR}/docs/doxyfile 
     144        ) 
     145    # This creates a new target to build documentation. 
     146    # It runs ${DOXYGEN} which is the full path and executable to 
     147    # Doxygen on your system, set by the FindDoxygen.cmake module 
     148    # (called by FindDocumentation.cmake). 
     149    # It runs the final generated Doxyfile against it. 
     150    # The DOT_PATH is substituted into the Doxyfile. 
     151    ADD_CUSTOM_TARGET(DoxygenDoc ${DOXYGEN} 
     152        ${PROJECT_BINARY_DIR}/docs/doxyfile 
     153    ) 
    154154ENDIF(BUILD_DOCUMENTATION) 
    155155