From c61d0bb6382921ecaf79983e0a1bbc619b53141f Mon Sep 17 00:00:00 2001 From: Jens Olav Nygaard Date: Tue, 22 Oct 2013 12:58:16 +0200 Subject: [PATCH] - 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 | 23 +-- TiniaConfig.cmake.in | 2 +- cmake/Modules/FindTinia.cmake | 293 ---------------------------------- sample_project/CMakeLists.txt | 3 +- 4 files changed, 15 insertions(+), 306 deletions(-) delete mode 100644 cmake/Modules/FindTinia.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index d0fba17..f4e5011 100644 --- a/CMakeLists.txt +++ b/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}) diff --git a/TiniaConfig.cmake.in b/TiniaConfig.cmake.in index 8b58a69..ebbf7da 100644 --- a/TiniaConfig.cmake.in +++ b/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@") diff --git a/cmake/Modules/FindTinia.cmake b/cmake/Modules/FindTinia.cmake deleted file mode 100644 index 9425d66..0000000 --- a/cmake/Modules/FindTinia.cmake +++ /dev/null @@ -1,293 +0,0 @@ -SET( Tinia_FIND_DESKTOP FALSE ) -SET( Tinia_FIND_SERVER FALSE) -MESSAGE("WARNING FindTinia.cmake is deprecated. Please use the config files") -IF( NOT Tinia_FIND_COMPONENTS OR NOT "${Tinia_FIND_COMPONENTS}" STREQUAL "" ) - FOREACH(component ${Tinia_FIND_COMPONENTS}) - IF( component STREQUAL "Desktop" ) - SET( Tinia_FIND_DESKTOP TRUE ) - ELSEIF(component STREQUAL "Server" ) - SET( Tinia_FIND_SERVER TRUE ) - ELSE() - MESSAGE( "Unknown component ${component}" ) - ENDIF() -ENDFOREACH() -ELSE() - #MESSAGE( "No components" ) -ENDIF() - -include(FindPackageHandleStandardArgs) -# Yes, we really DO want to find the libraries Tinia links against, in -# order to ensure that the user doesn't need to worry about which libraries -# are required -set(BOOST_USE_STATIC_LIBS ON) -set(Boost_USE_MULTITHREADED ON) -set(Boost_USE_STATIC_RUNTIME OFF) -FIND_PACKAGE( Boost 1.46 COMPONENTS filesystem unit_test_framework prg_exec_monitor thread date_time system ) - -IF(Tinia_FIND_DESKTOP) - FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL QtXML QtScript QtNetwork REQUIRED) - INCLUDE(${QT_USE_FILE}) - SET(QT_USE_QTOPENGL TRUE) - SET(QT_USE_QTNETWORK TRUE) - SET(QT_USE_QTXML TRUE) - SET(QT_USE_QTSCRIPT TRUE) - ADD_DEFINITIONS(${QT_DEFINITIONS}) - ADD_DEFINITIONS(-DQT_SHARED) -ENDIF() - -FIND_PACKAGE( OpenGL REQUIRED ) -FIND_PACKAGE( GLEW REQUIRED ) -FIND_PACKAGE( GLM REQUIRED ) -FIND_PACKAGE( LibXml2 ) - -IF(Tinia_FIND_SERVER) - FIND_PATH( APACHE_INCLUDE_DIR httpd.h - HINTS "/usr/include/apache2" "/usr/include/httpd/" - ) - - FIND_LIBRARY( RT - NAMES rt - PATHS "/usr/lib/x86_64-linux-gnu/" "/usr/lib/" - ) - - FIND_LIBRARY(LIB_APR - NAMES apr-1 - PATHS "/usr/lib/" - ) - - FIND_PATH(APR_INCLUDE_DIR "apr.h" -HINTS "/usr/include/apr-1.0" - "/usr/include/apr-1" - "apr-1/" - "apr-1.0") - -ENDIF() - - -FIND_PATH( TINIA_INCLUDE_DIR tinia/model/ExposedModel.hpp - "/usr/local/include/" - "/work/projects/tinia/include/" - "$ENV{HOME}/include/" - "$ENV{HOME}/install/include/" - "$ENV{HOME}/projects/tinia/include" - "${TINIA_ROOT}/include/" - "../tinia/include/" - "$ENV{PROGRAMFILES(x86)}/SINTEF/tinia/include" - ) - - -FIND_LIBRARY( tinia_RenderList_LIBRARY renderlist - "/usr/local/lib/" - "/work/projects/tinia/" - "/work/projects/tinia/src/renderlist" - "$ENV{HOME}/projects/tinia/build/src/renderlist" - "$ENV{HOME}/lib/" - "$ENV{HOME}/install/lib/" - "${TINIA_ROOT}/lib/" - "${TINIA_ROOT}/lib/Release/" - "${TINIA_ROOT}/lib/Debug/" - "../tinia/build/" - "$ENV{PROGRAMFILES(x86)}/SINTEF/tinia/lib" - ) - - -FIND_LIBRARY( tinia_RenderListGL_LIBRARY renderlistgl - "/usr/local/lib/" - "/work/projects/tinia/" - "/work/projects/tinia/src/renderlistgl/" - "$ENV{HOME}/projects/tinia/build/src/renderlistgl/" - "$ENV{HOME}/lib/" - "$ENV{HOME}/install/lib/" - "${TINIA_ROOT}/lib/" - "${TINIA_ROOT}/lib/Release/" - "${TINIA_ROOT}/lib/Debug/" - "../tinia/build/" - "$ENV{PROGRAMFILES(x86)}/SINTEF/tinia/lib" - ) - - -FIND_LIBRARY( tinia_model_LIBRARY model - "/usr/local/lib/" - "/work/projects/tinia/" - "/work/projects/tinia/src/model" - "$ENV{HOME}/projects/tinia/build/src/model" - "$ENV{HOME}/lib/" - "$ENV{HOME}/install/lib/" - "${TINIA_ROOT}/lib/" - "${TINIA_ROOT}/lib/Release/" - "${TINIA_ROOT}/lib/Debug/" - "../tinia/build/" - "$ENV{PROGRAMFILES(x86)}/SINTEF/tinia/lib" - ) - - -FIND_LIBRARY( tinia_jobcontroller_LIBRARY jobcontroller - "/usr/local/lib/" - "/work/projects/tinia/" - "/work/projects/tinia/src/jobcontroller" - "$ENV{HOME}/projects/tinia/build/src/jobcontroller" - "$ENV{HOME}/lib/" - "$ENV{HOME}/install/lib/" - "${TINIA_ROOT}/lib/" - "${TINIA_ROOT}/lib/Release/" - "${TINIA_ROOT}/lib/Debug/" - "../tinia/build/" - "$ENV{PROGRAMFILES(x86)}/SINTEF/tinia/lib" - ) - - -IF( Tinia_FIND_DESKTOP ) - - FIND_LIBRARY( tinia_javascript_LIBRARY tinia_javascript - "/usr/local/lib/" - "/work/projects/tinia/" - "/work/projects/tinia/src/qtcontroller" - "$ENV{HOME}/projects/tinia/build/src/qtcontroller" - "$ENV{HOME}/lib/" - "$ENV{HOME}/install/lib/" - "${TINIA_ROOT}/lib/" - "${TINIA_ROOT}/lib/Release/" - "${TINIA_ROOT}/lib/Debug/" - "../tinia/build/" - "$ENV{PROGRAMFILES(x86)}/SINTEF/tinia/lib" - ) - FIND_LIBRARY( tinia_qtcontroller_LIBRARY qtcontroller - "/usr/local/lib/" - "/work/projects/tinia/" - "/work/projects/tinia/src/qtcontroller" - "$ENV{HOME}/projects/tinia/build/src/qtcontroller" - "$ENV{HOME}/lib/" - "$ENV{HOME}/install/lib/" - "${TINIA_ROOT}/lib/" - "${TINIA_ROOT}/lib/Release/" - "${TINIA_ROOT}/lib/Debug/" - "../tinia/build/" - "$ENV{PROGRAMFILES(x86)}/SINTEF/tinia/lib" - ) - -ENDIF() - -FIND_LIBRARY( tinia_modelxml_LIBRARY modelxml - "/usr/local/lib/" - "/work/projects/tinia/" - "/work/projects/tinia/src/modelxml" - "$ENV{HOME}/projects/tinia/build/src/modelxml" - "$ENV{HOME}/lib/" - "$ENV{HOME}/install/lib/" - "${TINIA_ROOT}/lib/" - "${TINIA_ROOT}/lib/Release/" - "${TINIA_ROOT}/lib/Debug/" - "../tinia/build/" - "$ENV{PROGRAMFILES(x86)}/SINTEF/tinia/lib" - ) - -IF( Tinia_FIND_SERVER ) - - FIND_LIBRARY( tinia_trell_LIBRARY trell - "/usr/local/lib/" - "/work/projects/tinia/" - "/work/projects/tinia/src/trell" - "$ENV{HOME}/projects/tinia/build/src/trell" - "$ENV{HOME}/lib/" - "$ENV{HOME}/install/lib/" - "${TINIA_ROOT}/lib/" - "${TINIA_ROOT}/lib/Release/" - "${TINIA_ROOT}/lib/Debug/" - "../tinia/build/" - "$ENV{PROGRAMFILES(x86)}/SINTEF/tinia/lib" - ) - -ENDIF() - -IF( Tinia_FIND_DESKTOP ) - IF(NOT Tinia_FIND_SERVER) - find_package_handle_standard_args(Tinia DEFAULT_MSG - tinia_jobcontroller_LIBRARY - tinia_qtcontroller_LIBRARY - tinia_model_LIBRARY - TINIA_INCLUDE_DIR - tinia_RenderList_LIBRARY - tinia_RenderListGL_LIBRARY - tinia_modelxml_LIBRARY - tinia_javascript_LIBRARY) - ELSE() - find_package_handle_standard_args(Tinia DEFAULT_MSG - tinia_jobcontroller_LIBRARY - tinia_qtcontroller_LIBRARY - tinia_model_LIBRARY - TINIA_INCLUDE_DIR - tinia_RenderList_LIBRARY - tinia_RenderListGL_LIBRARY - tinia_trell_LIBRARY - tinia_modelxml_LIBRARY) - ENDIF() -ELSEIF(Tinia_FIND_SERVER) - - find_package_handle_standard_args(Tinia DEFAULT_MSG - tinia_jobcontroller_LIBRARY - tinia_model_LIBRARY - TINIA_INCLUDE_DIR - tinia_RenderList_LIBRARY - tinia_RenderListGL_LIBRARY - tinia_trell_LIBRARY - tinia_modelxml_LIBRARY) -ENDIF() - -SET(TINIA_INCLUDE_DIRS - ${TINIA_INCLUDE_DIR} - ${GLEW_INCLUDE_DIR} - ${GLM_INCLUDE_DIR} - ${Boost_INCLUDE_DIRS} ) - - -SET(TINIA_LIBRARIES - ${Boost_LIBRARIES} - ${GLEW_LIBRARY} - ${tinia_model_LIBRARY} - ${tinia_jobcontroller_LIBRARY} - ${OPENGL_LIBRARIES} - ${tinia_RenderList_LIBRARY} - ${tinia_RenderListGL_LIBRARY} -) - -IF(Tinia_FIND_DESKTOP ) - SET(TINIA_LIBRARIES - ${TINIA_LIBRARIES} - ${QT_LIBRARIES} - ${QT_QTOPENGL_LIBRARIES} - ${tinia_qtcontroller_LIBRARY} - ${LIBXML2_LIBRARIES} - ${tinia_modelxml_LIBRARY} - #${tinia_javascript_LIBRARY} - ) - - SET(TINIA_INCLUDE_DIRS - ${TINIA_INCLUDE_DIRS} - ${QT_INCLUDE_DIR} - ${QT_QTOPENGL_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ) -ENDIF() - -IF(Tinia_FIND_SERVER) - SET(TINIA_LIBRARIES - ${TINIA_LIBRARIES} - # ${tinia_modelxml_LIBRARY} - ${tinia_trell_LIBRARY} - ${RT} - ${LIB_APR} - ) - - SET(TINIA_INCLUDE_DIRS - ${TINIA_INCLUDE_DIRS} - ${APACHE_INCLUDE_DIR} - ${APR_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ) -ENDIF() - -IF( NOT LIBXML2_FOUND ) - MESSAGE( "LibXml2 not found. \nYou can still build desktop projects, but lose the ability to use job as web-application or take it with you" ) -ELSE() - ADD_DEFINITIONS(-DTINIA_HAVE_LIBXML) -ENDIF() diff --git a/sample_project/CMakeLists.txt b/sample_project/CMakeLists.txt index 305901f..3a90e19 100644 --- a/sample_project/CMakeLists.txt +++ b/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)