- Missing tinia_-prefixes inserted.

- TiniaTargets.cmake renamed to
  TiniaTargets(Debug|Release).cmake
- Modified comment in sample_project/CMakeLists.txt
  to reflect that FindTinia.cmake is deprecated.
- Removed cmake/Modules/FindTinia.cmake.

CMakeLists.txt

@@ -155,26 +155,26 @@ link_directories(
 )
 
 ADD_SUBDIRECTORY( "src/model" )
-SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} model)
+SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} tinia_model)
 IF(LIBXML2_FOUND)
   ADD_SUBDIRECTORY( "src/modelxml" )
-SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} modelxml)
+SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} tinia_modelxml)
 ENDIF()
 ADD_SUBDIRECTORY( "src/renderlist" )
-SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} renderlist)
+SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} tinia_renderlist)
 ADD_SUBDIRECTORY( "src/renderlistgl" )
-SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} renderlistgl)
+SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} tinia_renderlistgl)
 ADD_SUBDIRECTORY( "src/jobcontroller" )
-SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} jobcontroller)
+SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} tinia_jobcontroller)
 IF(Tinia_DESKTOP)
   ADD_SUBDIRECTORY( "js")
   SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} tinia_javascript)
   ADD_SUBDIRECTORY( "src/qtcontroller" )
-  SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} qtcontroller)
+  SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} tinia_qtcontroller)
 ENDIF()
 IF(Tinia_SERVER)
   ADD_SUBDIRECTORY( "src/trell" )
-SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} trell)
+SET(TINIA_LIBRARIES_FOR_CONFIG ${TINIA_LIBRARIES_FOR_CONFIG} tinia_trell)
   ADD_SUBDIRECTORY( "src/mod_trell" )
   ADD_SUBDIRECTORY( "src/trell_master" )
 ENDIF()
@@ -190,6 +190,7 @@ IF( Tinia_BUILD_UNIT_TESTS )
   IF(Tinia_DESKTOP)
     ADD_SUBDIRECTORY( "unittests/qtcontroller/" )
     IF(LIBXML2_FOUND)
+      # This has of course all dependencies of "sub-tests" combined.
       ADD_SUBDIRECTORY( "unittests/combined/" )
     ENDIF()
   ENDIF()
@@ -237,19 +238,19 @@ SET(CPACK_PACKAGE_VERSION ${version_number} )
 IF(Tinia_DESKTOP)
 	IF(Tinia_SERVER)
 		export(TARGETS tinia_model tinia_jobcontroller tinia_modelxml tinia_qtcontroller tinia_renderlist tinia_renderlistgl tinia_javascript tinia_trell
-				FILE "${PROJECT_BINARY_DIR}/TiniaTargets.cmake")
+				FILE "${PROJECT_BINARY_DIR}/TiniaTargets${CMAKE_BUILD_TYPE}.cmake")
 	ELSE()
 	   IF(LIBXML2_FOUND)
 			export(TARGETS tinia_model tinia_jobcontroller tinia_modelxml tinia_qtcontroller tinia_renderlist tinia_renderlistgl tinia_javascript
-				FILE "${PROJECT_BINARY_DIR}/TiniaTargets.cmake")
+				FILE "${PROJECT_BINARY_DIR}/TiniaTargets${CMAKE_BUILD_TYPE}.cmake")
 		ELSE()
 			export(TARGETS tinia_model tinia_jobcontroller tinia_qtcontroller tinia_renderlist tinia_renderlistgl
-					FILE "${PROJECT_BINARY_DIR}/TiniaTargets.cmake")
+					FILE "${PROJECT_BINARY_DIR}/TiniaTargets${CMAKE_BUILD_TYPE}.cmake")
 		ENDIF()
 	ENDIF()
 ELSE()
 	export(TARGETS tinia_model tinia_jobcontroller tinia_modelxml tinia_renderlist tinia_renderlistgl tinia_trell
-				FILE "${PROJECT_BINARY_DIR}/TiniaTargets.cmake")
+				FILE "${PROJECT_BINARY_DIR}/TiniaTargets${CMAKE_BUILD_TYPE}.cmake")
 ENDIF()
 
 set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" ${TINIA_EXTERNAL_INCLUDE_DIRS})

TiniaConfig.cmake.in

@@ -39,7 +39,7 @@ set(TINIA_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
 
 # Our library dependencies (contains definitions for IMPORTED targets)
 #if(NOT TARGET  AND NOT Tinia_BINARY_DIR)
-  include("${TINIA_CMAKE_DIR}/TiniaTargets.cmake")
+  include("${TINIA_CMAKE_DIR}/TiniaTargets${CMAKE_BUILD_TYPE}.cmake")
 #endif()
 
 SET(TINIA_APPS_DIR "@CONF_APPS_DIR@")

sample_project/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 # Set this to where you have your FindTinia.cmake.
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/Modules")
+#SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake/Modules")
 
 # It's smart to have different options for building a server of dekstop version
 IF(NOT WIN32)
@@ -17,6 +17,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
         SET(CMAKE_CXX_FLAGS "-std=c++0x")
 ENDIF()
 
+
 IF(${SERVER})
   IF(${DESKTOP})
     FIND_PACKAGE(Tinia COMPONENTS Desktop Server)