CMake fixes

pull/1/head
Timothy Pearson 13 years ago
parent 18b7338644
commit 7a8eeda357

@ -62,6 +62,16 @@ IF(BUILD_TESTS)
ENDIF(BUILD_TESTS) ENDIF(BUILD_TESTS)
##### versioning ################################
SET(BASE_VERSION 1.0.4)
SET(VERSION "$ENV{KDESVN_VERSION}")
IF(NOT VERSION)
SET(VERSION ${BASE_VERSION})
ENDIF(NOT VERSION)
SET(KDESVN_VERSION \"${VERSION}\")
##### configure checks ########################## ##### configure checks ##########################
include( ConfigureChecks.cmake ) include( ConfigureChecks.cmake )
@ -93,4 +103,4 @@ configure_file( tdesvn.spec.in tdesvn.spec @ONLY )
configure_file( Helperstuff/BuildService/tdesvn.spec.in Helperstuff/BuildService/tdesvn.spec @ONLY ) configure_file( Helperstuff/BuildService/tdesvn.spec.in Helperstuff/BuildService/tdesvn.spec @ONLY )
configure_file( Helperstuff/BuildService/tdesvn.dsc.in Helperstuff/BuildService/tdesvn.dsc @ONLY ) configure_file( Helperstuff/BuildService/tdesvn.dsc.in Helperstuff/BuildService/tdesvn.dsc @ONLY )
configure_file( Doxyfile.in Doxyfile @ONLY ) configure_file( Doxyfile.in Doxyfile @ONLY )
configure_file( Doxyfile.svnqt.in Doxyfile.svnqt @ONLY ) configure_file( Doxyfile.svnqt.in Doxyfile.svnqt @ONLY )

@ -1,5 +1,20 @@
ifndef _KDESVN_CONFIG_H
#define _KDESVN_CONFIG_H
#cmakedefine SIZEOF_INT @SIZEOF_INT@ #cmakedefine SIZEOF_INT @SIZEOF_INT@
#cmakedefine SIZEOF_LONG @SIZEOF_LONG@ #cmakedefine SIZEOF_LONG @SIZEOF_LONG@
#cmakedefine HAVE_STDINT_H 1 #cmakedefine HAVE_STDINT_H 1
#cmakedefine HAVE_SYSTEMS_H 1 #cmakedefine HAVE_SYSTEMS_H 1
#cmakedefine HAVE_STATVFS 1 #cmakedefine HAVE_STATVFS 1
#cmakedefine VERSION @KDESVN_VERSION@
#cmakedefine SQLITE_FOUND
#cmakedefine HAS_SETENV
#define KDESVN_EXPORT @_KDESVN_EXPORT@
#define KDESVN_NOEXPORT @_KDESVN_NOEXPORT@
#define WALLETNAME "@PROJECT_NAME@"
#endif

@ -24,7 +24,7 @@ link_directories(
##### tdesvnhelpers ############################## ##### tdesvnhelpers ##############################
tde_add_library( tdesvnhelpers STATIC AUTOMOC tde_add_library( tdesvnhelpers STATIC AUTOMOC
SOURCES helperssrc ktranslateurl.cpp sshagent.cpp sub2qt.cpp SOURCES ktranslateurl.cpp sshagent.cpp sub2qt.cpp
# LINK kio-shared # LINK kio-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -29,11 +29,11 @@ tde_add_library( ksvnwidgets STATIC AUTOMOC
SOURCES authdialogimpl.cpp logmsg_impl.cpp ssltrustprompt_impl.cpp SOURCES authdialogimpl.cpp logmsg_impl.cpp ssltrustprompt_impl.cpp
pwstorage.cpp diffbrowser.cpp diffbrowserdata.cpp pwstorage.cpp diffbrowser.cpp diffbrowserdata.cpp
diffsyntax.cpp encodingselector_impl.cpp depthselector.cpp diffsyntax.cpp encodingselector_impl.cpp depthselector.cpp
revertform_impl.cpp tdesvn_shared_ui logmessage.ui revertform_impl.cpp logmessage.ui
ssltrustprompt.ui authdlg.ui encodingselector.ui ssltrustprompt.ui authdlg.ui encodingselector.ui
depthform.ui revertform.ui depthform.ui revertform.ui
# LINK kio-shared # LINK kio-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
# ADD_DEPENDENCIES(ksvnwidgets tdesvncfgreader) # ADD_DEPENDENCIES(ksvnwidgets tdesvncfgreader)

@ -28,7 +28,7 @@ link_directories(
file (GLOB hdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h") file (GLOB hdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
tde_add_library( tdesvncfgreader STATIC AUTOMOC tde_add_library( tdesvncfgreader STATIC AUTOMOC
SOURCES settings_ui_sources dispcolor_settings.ui SOURCES dispcolor_settings.ui
display_settings.ui revisiontree_settings.ui display_settings.ui revisiontree_settings.ui
subversion_settings.ui cmdexecsettings.ui subversion_settings.ui cmdexecsettings.ui
diffmergesettings.ui dispcolorsettings_impl.cpp diffmergesettings.ui dispcolorsettings_impl.cpp

@ -98,4 +98,4 @@ tde_add_library( svnfrontend STATIC AUTOMOC
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
ADD_DEPENDENCIES(svnfrontend ksvnwidgets) # ADD_DEPENDENCIES(svnfrontend ksvnwidgets)

Loading…
Cancel
Save