diff options
Diffstat (limited to 'src/svnqt/CMakeLists.txt')
-rw-r--r-- | src/svnqt/CMakeLists.txt | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/src/svnqt/CMakeLists.txt b/src/svnqt/CMakeLists.txt index a6212fd..d8fd1a0 100644 --- a/src/svnqt/CMakeLists.txt +++ b/src/svnqt/CMakeLists.txt @@ -45,7 +45,6 @@ SET(SOURCES cache/DatabaseException.cpp ) -IF (NOT QT4_FOUND) IF (SQLITE_FOUND) MESSAGE(STATUS "Build own sqlite3 database modul") SET(SOURCES @@ -58,10 +57,6 @@ IF (NOT QT4_FOUND) ELSE (SQLITE_FOUND) MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found") ENDIF (SQLITE_FOUND) -ELSE (NOT QT4_FOUND) - MESSAGE(STATUS "Build with QT4.") - ADD_DEFINITIONS(-DNO_SQLITE3) -ENDIF (NOT QT4_FOUND) SET(CACHEINST_HEADERS cache/LogCache.hpp @@ -108,19 +103,7 @@ SET(INST_HEADERS FILE(GLOB svnhdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.hpp") SET(svnhdr ${svnhdr} ${CACHE_INST_HEADERS}) -#IF(QT4_FOUND) -# MESSAGE(STATUS "Qt: ${QT_LIBRARY_DIR}") -# MESSAGE(STATUS "Qt: ${QT_QTCORE_LIBRARY}") -# SET(TOUTF8 "toUtf8") -# SET(FROMUTF8 "fromUtf8") -# SET(QLIST "QList") -# SET(TOASCII "toAscii") -# SET(HOMEDIR "homePath") -# SET(svnqt-name svnqt-qt4) -# SET(QDATABASE "QSqlDatabase") -# SET(QLONG "qlonglong") -#ELSE(QT4_FOUND) -# IF(QT_FOUND) + SET(TOUTF8 "utf8") SET(FROMUTF8 "fromUtf8") SET(QLIST "TQValueList") @@ -128,17 +111,12 @@ SET(svnhdr ${svnhdr} ${CACHE_INST_HEADERS}) SET(HOMEDIR "homeDirPath") SET(QDATABASE "TQSqlDatabase*") SET(QLONG "Q_LLONG") -# ENDIF(QT_FOUND) SET(svnqt-name svnqt) -#ENDIF(QT4_FOUND) IF (HAVE_GCC_VISIBILITY) SET(_SVNQT_EXPORT "__attribute__ ((visibility(\"default\")))") SET(_SVNQT_NOEXPORT "__attribute__ ((visibility(\"hidden\")))") ENDIF (HAVE_GCC_VISIBILITY) -IF (WIN32) - SET(_SVNQT_EXPORT "__declspec(dllexport)") -ENDIF (WIN32) CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/svnqt_defines.hpp.in" @@ -150,14 +128,10 @@ SET(INST_HEADERS ${INST_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(${svnqt-name} SHARED ${SOURCES} ${svnhdr}) -IF(WIN32) - ADD_DEFINITIONS(-D_USE_32BIT_TIME_T) -ELSE(WIN32) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX}) SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) -ENDIF(WIN32) SET(LIB_MAJOR 4) SET(LIB_MINOR 2) @@ -174,16 +148,12 @@ SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}") SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}") TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS}) -IF (SQLITE_FOUND AND NOT QT4_FOUND) +IF (SQLITE_FOUND) TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES}) INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR) -ELSE (SQLITE_FOUND AND NOT QT4_FOUND) +ELSE (SQLITE_FOUND) TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY}) -ENDIF (SQLITE_FOUND AND NOT QT4_FOUND) - -IF (WIN32) - TARGET_LINK_LIBRARIES( ${svnqt-name} wsock32.lib ) -ENDIF (WIN32) +ENDIF (SQLITE_FOUND) # Just a small linking test IF (BUILD_TESTS) @@ -191,13 +161,9 @@ IF (BUILD_TESTS) TARGET_LINK_LIBRARIES(testlink ${svnqt-name}) ENDIF (BUILD_TESTS) -# install rules -# in win32 we don't install it -IF(NOT WIN32) INSTALL(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(FILES ${INST_HEADERS} DESTINATION include/${svnqt-name}) INSTALL(FILES ${CACHEINST_HEADERS} DESTINATION include/${svnqt-name}/cache) -ENDIF(NOT WIN32) IF (BUILD_TESTS) ADD_SUBDIRECTORY(tests) |