Fixed CMake warnings

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6568 30fe4595-0a0c-4342-8851-515496e4dcbd

CMakeLists.txt

@@ -1,5 +1,17 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
 
+IF(POLICY CMP0003)
+   CMAKE_POLICY(SET CMP0003 NEW)
+ENDIF(POLICY CMP0003)
+
+IF(POLICY CMP0056)
+   CMAKE_POLICY(SET CMP0056 NEW)
+ENDIF(POLICY CMP0056)
+
+IF(POLICY CMP0066)
+  CMAKE_POLICY(SET CMP0066 NEW)
+ENDIF(POLICY CMP0066)
+
 # Speed Dreams project
 PROJECT(speed-dreams-2)
 

cmake/internaldeps.cmake

@@ -198,6 +198,9 @@ ENDMACRO(ADD_SDLIB_INCLUDEDIR)
 # SD libraries macro.
 MACRO(ADD_SDLIB_LIBRARY TARGET)
 
+#MESSAGE(STATUS "ADD_SDLIB_LIBRARY : TARGET = ${TARGET}")
+#MESSAGE(STATUS "ADD_SDLIB_LIBRARY : ARGN = ${ARGN}")
+
   SET(SDLIB_OPTIONAL FALSE)
   SET(SDLIB_STATIC FALSE)
   SET(SDLIB_TARGET_SUFFIX "")
@@ -234,153 +237,8 @@ MACRO(ADD_SDLIB_LIBRARY TARGET)
     
     IF(NOT SDLIB_IGNORE)
 
-      SET(SDLIB_FOUND_LIB TRUE)
-      SET(SDLIB_EXTRA_LIBRARY "")
-
-      #Use IF(TARGET ${SDLIB_LIB}) from CMake 2.6
-	  IF(CMAKE_MAJOR_VERSION GREATER 2)
-		cmake_policy(SET CMP0026 OLD)
-		cmake_policy(SET CMP0045 OLD)
-	  ENDIF()
-	  
-      GET_TARGET_PROPERTY(SDLIB_TARGET_LOCATION ${SDLIB_LIB}${SDLIB_TARGET_SUFFIX} LOCATION)
-      IF(NOT SDLIB_TARGET_LOCATION STREQUAL "NOTFOUND")
-        SET(SDLIB_LIBRARIES ${SDLIB_LIBRARIES} ${SDLIB_LIB}${SDLIB_TARGET_SUFFIX})
-      ELSE(NOT SDLIB_TARGET_LOCATION STREQUAL "NOTFOUND")
-        MESSAGE(WARNING "Warning: didn't found target ${SDLIB_LIB}")
-        IF(SDLIB_LIB STREQUAL "portability")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/portability)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_PORTABILITY_LIBRARY portability${SDLIB_TARGET_SUFFIX} PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib
-                       PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_PORTABILITY_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "tgf")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/tgf)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_TGF_LIBRARY tgf${SDLIB_TARGET_SUFFIX} PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib
-                       PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_TGF_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "tgfclient")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/tgfclient)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_TGFCLIENT_LIBRARY tgfclient PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_TGFCLIENT_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "tgfdata")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/tgfdata)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_TGFDATA_LIBRARY tgfdata PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_TGFDATA_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "txml")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/txml)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_TXML_LIBRARY txml${SDLIB_TARGET_SUFFIX} PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib
-                       PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_TXML_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "robottools")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/robottools)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_ROBOTTOOLS_LIBRARY robottools PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_ROBOTTOOLS_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "learning")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/learning)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_LEARNING_LIBRARY learning PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_LEARNING_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "networking")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/modules/networking)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_NETWORKING_LIBRARY networking PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_NETWORKING_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "csnetworking")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/modules/csnetworking)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_CSNETWORKING_LIBRARY csnetworking PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_CSNETWORKING_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "standardgame")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/modules/racing/standardgame)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_STANDARDGAME_LIBRARY standardgame PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_STANDARDGAME_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "legacymenu")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/modules/userinterface/legacymenu)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_LEGACYMENU_LIBRARY legacymenu ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_LEGACYMENU_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "ssggraph")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/modules/graphic/ssggraph)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_SSGGRAPH_LIBRARY ssggraph PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_SSGGRAPH_LIBRARY)
-		ELSEIF(SDLIB_LIB STREQUAL "osggraph")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/modules/graphic/osggraph)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_OSGGRAPH_LIBRARY osggraph PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_OSGGRAPH_LIBRARY)
-        ELSEIF(SDLIB_LIB STREQUAL "track")
-          IF(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/modules/track)
-          ELSE(IN_SOURCETREE)
-            SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
-          ENDIF(IN_SOURCETREE)
-          FIND_LIBRARY(SDLIB_TRACK_LIBRARY track PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-          SET(SDLIB_EXTRA_LIBRARY SDLIB_TRACK_LIBRARY)
-        ELSE(SDLIB_LIB STREQUAL "tgf")
-          SET(SDLIB_FOUND_LIB FALSE)
-          IF(NOT SDLIB_LIB STREQUAL "OPTIONAL" AND NOT SDLIB_LIB STREQUAL "STATIC")
-            MESSAGE(WARNING ": ${SDLIB_LIB} is not a Speed Dreams library")
-          ENDIF(NOT SDLIB_LIB STREQUAL "OPTIONAL" AND NOT SDLIB_LIB STREQUAL "STATIC")
-        ENDIF(SDLIB_LIB STREQUAL "portability")
-
-        IF(SDLIB_FOUND_LIB)
-          IF(${SDLIB_EXTRA_LIBRARY})
-            SET(SDLIB_LIBRARIES ${SDLIB_LIBRARIES} ${${SDLIB_EXTRA_LIBRARY}})
-          ELSE(${SDLIB_EXTRA_LIBRARY})
-            IF(NOT SDLIB_OPTIONAL AND NOT SDLIB_LIB STREQUAL "OPTIONAL" AND NOT SDLIB_LIB STREQUAL "STATIC")
-              MESSAGE(FATAL_ERROR "Cannot find ${SDLIB_LIB} library shared object")
-            ENDIF(NOT SDLIB_OPTIONAL AND NOT SDLIB_LIB STREQUAL "OPTIONAL" AND NOT SDLIB_LIB STREQUAL "STATIC")
-          ENDIF(${SDLIB_EXTRA_LIBRARY})
-        ENDIF(SDLIB_FOUND_LIB)
-
-      ENDIF(NOT SDLIB_TARGET_LOCATION STREQUAL "NOTFOUND")
+      SET(SDLIB_LIBRARIES ${SDLIB_LIBRARIES} ${SDLIB_LIB}${SDLIB_TARGET_SUFFIX})
+      #MESSAGE(STATUS "ADD_SDLIB_LIBRARY : SDLIB_LIBRARIES = ${SDLIB_LIBRARIES}")
 
     ENDIF(NOT SDLIB_IGNORE)
 

cmake/macros.cmake

@@ -222,6 +222,8 @@ ENDMACRO(SD_ADD_EXECUTABLE TARGET_NAME)
 # * TARGET_TYPE type arg is mandatory (no default).
 MACRO(SD_ADD_LIBRARY TARGET_NAME TARGET_TYPE)
 
+#MESSAGE(STATUS "SD_ADD_LIBRARY : TARGET_NAME = ${TARGET_NAME} TARGET_TYPE = ${TARGET_TYPE} ARGN = ${ARGN}")
+
   # Standard ADD_EXECUTABLE command.
   IF(${TARGET_TYPE} STREQUAL "ROBOT")
     ADD_LIBRARY(${TARGET_NAME} MODULE ${ARGN})
@@ -231,7 +233,6 @@ MACRO(SD_ADD_LIBRARY TARGET_NAME TARGET_TYPE)
 
   # Determine target location (for running in build-tree without installing).
   IF(${TARGET_TYPE} STREQUAL "SHARED")
-
     IF(WIN32)
       SET(_TGT_DIR "${CMAKE_BINARY_DIR}/${SD_BINDIR}")
     ELSE()
@@ -239,20 +240,9 @@ MACRO(SD_ADD_LIBRARY TARGET_NAME TARGET_TYPE)
     ENDIF()
 
   ELSEIF(${TARGET_TYPE} STREQUAL "MODULE")
-    IF(CMAKE_MAJOR_VERSION GREATER 2)
-		cmake_policy(SET CMP0026 OLD)
-		cmake_policy(SET CMP0045 OLD)
-	ENDIF()
-	
-    GET_TARGET_PROPERTY(_TGT_LOC ${TARGET_NAME} LOCATION)
+    SET(_TGT_LOC ${CMAKE_CURRENT_SOURCE_DIR})
     GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_LOC} PATH)
-    GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_TYPE} PATH)
-    IF(MSVC)
-      # Take care of the build config-specific Debug/Release/... folder.
-      GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_TYPE} PATH)
-    ENDIF()
     GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_TYPE} NAME)
-
     SET(_TGT_DIR "${CMAKE_BINARY_DIR}/${SD_LIBDIR}/modules/${_TGT_TYPE}")
 
   ELSEIF(${TARGET_TYPE} STREQUAL "ROBOT")
@@ -280,6 +270,8 @@ MACRO(SD_ADD_LIBRARY TARGET_NAME TARGET_TYPE)
     ENDFOREACH()
 
   ENDIF(MSVC)
+  
+  #MESSAGE(STATUS "SD_ADD_LIBRARY : _TGT_DIR = ${_TGT_DIR}")
 
   # No prefix for module and robot DLLs.
   IF(${TARGET_TYPE} STREQUAL "MODULE" OR ${TARGET_TYPE} STREQUAL "ROBOT")