summaryrefslogtreecommitdiffstats
path: root/katomic
diff options
context:
space:
mode:
authorAlexander Golubev <[email protected]>2016-02-25 06:23:55 +0300
committerSlávek Banko <[email protected]>2016-03-14 23:04:46 +0100
commit22eaaf46994712a7ea19be99d49c5ceb889470bd (patch)
tree6813293435ece498f1d90a99adfa5e9a49c875fe /katomic
parentfa5d2dca53e1046fe38ac7cf0210d45ad5cc5107 (diff)
downloadtdegames-22eaaf46994712a7ea19be99d49c5ceb889470bd.tar.gz
tdegames-22eaaf46994712a7ea19be99d49c5ceb889470bd.zip
Initial cmake conversion
(cherry picked from commit c70db62d3671e524d23ac974d296eb218159b000)
Diffstat (limited to 'katomic')
-rw-r--r--katomic/CMakeLists.txt57
-rw-r--r--katomic/molek.cpp5
2 files changed, 62 insertions, 0 deletions
diff --git a/katomic/CMakeLists.txt b/katomic/CMakeLists.txt
new file mode 100644
index 00000000..61988b67
--- /dev/null
+++ b/katomic/CMakeLists.txt
@@ -0,0 +1,57 @@
+#################################################
+#
+# (C) 2016 Alexander Golubev
+# fatzer2 (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/libtdegames
+ ${CMAKE_SOURCE_DIR}/libtdegames/highscore
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
+
+##### katomic (executable) ######################
+
+tde_add_executable( katomic AUTOMOC
+ SOURCES feld.cpp molek.cpp main.cpp toplevel.cpp configbox.cpp gamewidget.cpp
+ LINK tdecore-shared tdeui-shared tdeio-shared tdegames-shared
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons #####################################
+
+tde_install_icons( katomic )
+
+
+##### other data ################################
+
+install( DIRECTORY levels
+ DESTINATION ${DATA_INSTALL_DIR}/katomic
+)
+
+install( FILES abilder.png molek.png
+ DESTINATION ${DATA_INSTALL_DIR}/katomic/pics
+)
+
+install( FILES katomicui.rc
+ DESTINATION ${DATA_INSTALL_DIR}/katomic
+)
+
+install( FILES katomic.desktop
+ DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
diff --git a/katomic/molek.cpp b/katomic/molek.cpp
index 46132502..711ece5f 100644
--- a/katomic/molek.cpp
+++ b/katomic/molek.cpp
@@ -67,7 +67,12 @@ void Molek::load (const KSimpleConfig& config)
if (value.isNull())
value = "";
+#ifdef HAVE_STRLCPY
strlcpy(current.conn, value.ascii(), sizeof(current.conn));
+#else
+ strncpy(current.conn, value.ascii(), sizeof(current.conn));
+ current.conn[sizeof(current.conn)-1] = 0;
+#endif
kdWarning( atoms.find(current) != atoms.end() )
<< "OOOPS, duplicate atom definition in " << key << endl;
atoms.append(current);