Mercurial > malikania

changeset 57:9ccc36ba4725

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CMake: use full path for a better vera++ integration
author David Demelier <markand@malikania.fr>
date Fri, 16 Dec 2016 14:54:29 +0100
parents b94bc48d16b8
children d232469b4410
files client/CMakeLists.txt client/main.cpp server/CMakeLists.txt tests/libclient/animation/CMakeLists.txt tests/libclient/color/CMakeLists.txt tests/libclient/font/CMakeLists.txt tests/libclient/font/main.cpp tests/libclient/image/CMakeLists.txt tests/libclient/js-animation/CMakeLists.txt tests/libclient/js-color/CMakeLists.txt tests/libclient/js-font/CMakeLists.txt tests/libclient/js-image/CMakeLists.txt tests/libclient/js-line/CMakeLists.txt tests/libclient/js-point/CMakeLists.txt tests/libclient/js-rectangle/CMakeLists.txt tests/libclient/js-size/CMakeLists.txt tests/libclient/js-sprite/CMakeLists.txt tests/libclient/js-window/CMakeLists.txt tests/libclient/line/CMakeLists.txt tests/libclient/point/CMakeLists.txt tests/libclient/rectangle/CMakeLists.txt tests/libclient/size/CMakeLists.txt tests/libclient/sprite/CMakeLists.txt tests/libcommon/js-elapsed-timer/CMakeLists.txt tests/libcommon/util/CMakeLists.txt tests/libserver/id/CMakeLists.txt tools/bcc/CMakeLists.txt
diffstat 27 files changed, 34 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/client/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/client/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -20,7 +20,7 @@
 
 set(
     SOURCES
-    main.cpp
+    ${mlk-client_SOURCE_DIR}/main.cpp
 )
 
 malikania_define_executable(
--- a/client/main.cpp	Fri Dec 16 14:53:37 2016 +0100
+++ b/client/main.cpp	Fri Dec 16 14:54:29 2016 +0100
@@ -50,4 +50,3 @@
         std::this_thread::sleep_for(std::chrono::milliseconds(50));
     }
 }
-
--- a/server/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/server/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -20,6 +20,8 @@
 
 malikania_define_executable(
     TARGET mlk-server
-    SOURCES main.cpp
-    LIBRARIES libmlk-server
+    SOURCES
+        ${mlk-server_SOURCE_DIR}/main.cpp
+    LIBRARIES
+        libmlk-server
 )
--- a/tests/libclient/animation/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/animation/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,7 +19,7 @@
 malikania_create_test(
     NAME animation
     LIBRARIES libclient
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     RESOURCES
         resources/animations/margins.json
         resources/images/margins.png
--- a/tests/libclient/color/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/color/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME color
     LIBRARIES libclient
-    SOURCES main.cpp
-)
\ No newline at end of file
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
--- a/tests/libclient/font/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/font/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,7 +19,7 @@
 malikania_create_test(
     NAME font
     LIBRARIES libclient
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     RESOURCES
         resources/DejaVuSans.ttf
 )
--- a/tests/libclient/font/main.cpp	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/font/main.cpp	Fri Dec 16 14:54:29 2016 +0100
@@ -76,7 +76,6 @@
     std::this_thread::sleep_for(1s);
 }
 
-
 BOOST_AUTO_TEST_CASE(bottomleft)
 {
     auto dim = m_font.clip("bottom left");
--- a/tests/libclient/image/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/image/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,7 +19,7 @@
 malikania_create_test(
     NAME image
     LIBRARIES libclient
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     RESOURCES
         resources/images/100x10.png
         resources/images/10x100.png
--- a/tests/libclient/js-animation/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-animation/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,7 +19,7 @@
 malikania_create_test(
     NAME js-animation
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     RESOURCES
         resources/animations/margins.json
         resources/images/margins.png
--- a/tests/libclient/js-color/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-color/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME js-color
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/js-font/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-font/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,7 +19,7 @@
 malikania_create_test(
     NAME js-font
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     RESOURCES
         resources/DejaVuSans.ttf
 )
--- a/tests/libclient/js-image/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-image/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,7 +19,7 @@
 malikania_create_test(
     NAME js-image
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     RESOURCES
         resources/images/smiley.png
 )
--- a/tests/libclient/js-line/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-line/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME js-line
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/js-point/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-point/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME js-point
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/js-rectangle/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-rectangle/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME js-rectangle
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/js-size/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-size/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME js-size
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/js-sprite/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-sprite/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,7 +19,7 @@
 malikania_create_test(
     NAME js-sprite
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     RESOURCES
         resources/images/margins.png
         resources/sprites/margins.json
--- a/tests/libclient/js-window/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/js-window/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME js-window
     LIBRARIES libclient-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/line/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/line/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME line
     LIBRARIES libclient
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/point/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/point/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME point
     LIBRARIES libclient
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/rectangle/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/rectangle/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME rectangle
     LIBRARIES libclient
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/size/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/size/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME size
     LIBRARIES libclient
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libclient/sprite/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libclient/sprite/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,7 +19,7 @@
 malikania_create_test(
     NAME sprite
     LIBRARIES libclient
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     RESOURCES
         resources/images/mokodemo.png
         resources/images/margins.png
--- a/tests/libcommon/js-elapsed-timer/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libcommon/js-elapsed-timer/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,6 +19,6 @@
 malikania_create_test(
     NAME js-elapsed-timer
     LIBRARIES libcommon-js
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
 
--- a/tests/libcommon/util/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libcommon/util/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME util
     LIBRARIES libcommon
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tests/libserver/id/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tests/libserver/id/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -19,5 +19,5 @@
 malikania_create_test(
     NAME id
     LIBRARIES libcommon
-    SOURCES main.cpp
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
--- a/tools/bcc/CMakeLists.txt	Fri Dec 16 14:53:37 2016 +0100
+++ b/tools/bcc/CMakeLists.txt	Fri Dec 16 14:54:29 2016 +0100
@@ -17,4 +17,9 @@
 #
 
 project(mlk-bcc)
-add_executable(mlk-bcc main.cpp)
+
+malikania_define_executable(
+    TARGET mlk-bcc
+    SOURCES ${mlk-bcc_SOURCE_DIR}/main.cpp
+)
+