--- a/libcommon/CMakeLists.txt	Thu Dec 08 20:19:02 2016 +0100
+++ b/libcommon/CMakeLists.txt	Fri Dec 09 13:28:45 2016 +0100
@@ -16,28 +16,30 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+project(libcommon)
+
 set(
     HEADERS
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/duktape.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/game.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/id.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources_loader.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources_locator.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/util.hpp
+    ${libcommon_SOURCE_DIR}/malikania/duktape.hpp
+    ${libcommon_SOURCE_DIR}/malikania/game.hpp
+    ${libcommon_SOURCE_DIR}/malikania/id.hpp
+    ${libcommon_SOURCE_DIR}/malikania/resources_loader.hpp
+    ${libcommon_SOURCE_DIR}/malikania/resources_locator.hpp
+    ${libcommon_SOURCE_DIR}/malikania/util.hpp
 )
 
 set(
     SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources_loader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources_locator.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/util.cpp
+    ${libcommon_SOURCE_DIR}/malikania/resources_loader.cpp
+    ${libcommon_SOURCE_DIR}/malikania/resources_locator.cpp
+    ${libcommon_SOURCE_DIR}/malikania/util.cpp
 )
 
-if (WITH_BACKEND_SDL)
+if (WITH_BACKEND MATCHES "SDL")
     find_package(SDL2 REQUIRED)
 
-    list(APPEND HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/sdl_util.hpp)
-    list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/sdl_util.cpp)
+    list(APPEND HEADERS ${libcommon_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/sdl_util.hpp)
+    list(APPEND SOURCES ${libcommon_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/sdl_util.cpp)
     list(APPEND INCLUDES ${SDL2_INCLUDE_DIRS})
     list(APPEND LIBRARIES ${SDL2_LIBRARIES})
 endif ()
@@ -46,20 +48,17 @@
     list(APPEND LIBRARIES ws2_32)
 endif ()
 
-malikania_create_library(
+malikania_define_library(
     PROJECT libcommon
     TARGET libcommon
     SOURCES ${HEADERS} ${SOURCES}
     FLAGS "MALIKANIA_COMMON_BUILD"
     PUBLIC_INCLUDES
-        ${CMAKE_CURRENT_SOURCE_DIR}
         ${INCLUDES}
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/malikania>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        $<BUILD_INTERFACE:${libcommon_SOURCE_DIR}/malikania>
+        $<BUILD_INTERFACE:${libcommon_SOURCE_DIR}>
     LIBRARIES
         json
         ${Boost_LIBRARIES}
         ${LIBRARIES}
 )
-
-set_target_properties(libcommon PROPERTIES PREFIX "")