summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnu Mittal <anu22mittal@gmail.com>2015-02-07 12:13:00 (GMT)
committerAnu Mittal <anu22mittal@gmail.com>2015-02-09 14:19:32 (GMT)
commit768265a6f4462538c81d9be9fe46bdfb979ad2e4 (patch)
treef070c753c7e09f4c49bfa5eb1546dbd17a6f02f3
parent091a75c1d1f64e9284a60770e8804ecd267dfbb7 (diff)
Ported doc and libscience
-rw-r--r--doc/CMakeLists.txt5
-rw-r--r--libscience/CMakeLists.txt5
-rw-r--r--libscience/tests/CMakeLists.txt15
3 files changed, 13 insertions, 12 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f04a92b..79acf14 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,5 +1,4 @@
########### install files ###############
-#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kalzium)
-kde4_create_manpage(man-kalzium.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kalzium)
+kdoctools_create_manpage(man-kalzium.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
index ac66132..cf7ac6f 100644
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@ -15,10 +15,9 @@ set(science_LIB_SRCS
)
-kde4_add_library(science SHARED ${science_LIB_SRCS})
-
-target_link_libraries(science ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KUNITCONVERSION_LIBRARY})
+add_library(science SHARED ${science_LIB_SRCS})
+target_link_libraries(science Qt5::Xml KF5::UnitConversion KF5::WidgetsAddons)
set_target_properties(science PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS science ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/libscience/tests/CMakeLists.txt b/libscience/tests/CMakeLists.txt
index 21c4f85..6c2da92 100644
--- a/libscience/tests/CMakeLists.txt
+++ b/libscience/tests/CMakeLists.txt
@@ -5,24 +5,27 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
set(elementparsertest_SRCS xmlreadingtest.cpp)
-kde4_add_executable(elementparsertest NOGUI ${elementparsertest_SRCS})
+add_executable(elementparsertest ${elementparsertest_SRCS})
-target_link_libraries(elementparsertest science ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY})
+target_link_libraries(elementparsertest science Qt5::Core Qt5::Xml)
+ecm_mark_nongui_executable(elementparsertest)
########### next target ###############
set(isotopeparsertest_SRCS isotopereadingtest.cpp)
-kde4_add_executable(isotopeparsertest NOGUI ${isotopeparsertest_SRCS})
+add_executable(isotopeparsertest ${isotopeparsertest_SRCS})
+ecm_mark_nongui_executable(isotopeparsertest)
-target_link_libraries(isotopeparsertest science ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY})
+target_link_libraries(isotopeparsertest science Qt5::Core Qt5::Xml)
########### next target ###############
set(spectrumtest_SRCS spectrumreadingtests.cpp)
-kde4_add_executable(spectrumtest NOGUI ${spectrumtest_SRCS})
+add_executable(spectrumtest ${spectrumtest_SRCS})
+ecm_mark_nongui_executable(spectrumtest)
-target_link_libraries(spectrumtest science ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY})
+target_link_libraries(spectrumtest science Qt5::Core Qt5::Xml)