From 281de9e2972e8d8c723c58b317cabe9f0570f1c6 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 13 May 2009 09:41:59 +0000 Subject: [PATCH] install .txx as well --- appli/creaNewProject/NewProject/CMakeLists.txt.in | 2 +- .../NewProject/lib/template_lib/CMakeLists.txt | 8 +++----- cmake/CREAMacro_FindAndUseLibraries.cmake | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/appli/creaNewProject/NewProject/CMakeLists.txt.in b/appli/creaNewProject/NewProject/CMakeLists.txt.in index ecd080e..262312d 100644 --- a/appli/creaNewProject/NewProject/CMakeLists.txt.in +++ b/appli/creaNewProject/NewProject/CMakeLists.txt.in @@ -12,7 +12,7 @@ SET(PROJECT_BUILD_VERSION 0) #================================== #================================== -# Find crea +# Find crea (mandatory, to use macros) SET(CREA_VERBOSE_CMAKE TRUE) FIND_PACKAGE(crea REQUIRED) IF (crea_FOUND) diff --git a/appli/creaNewProject/NewProject/lib/template_lib/CMakeLists.txt b/appli/creaNewProject/NewProject/lib/template_lib/CMakeLists.txt index a41e67d..a604b1d 100644 --- a/appli/creaNewProject/NewProject/lib/template_lib/CMakeLists.txt +++ b/appli/creaNewProject/NewProject/lib/template_lib/CMakeLists.txt @@ -5,7 +5,7 @@ SET ( LIBRARY_NAME MyLib ) #---------------------------------------------------------------------------- # CREATES A USER OPTION IN CMAKE -OPTION ( BUILD_${LIBRARY_NAME} "Build ${LIBRARY_NAME} library ?" ON)) +OPTION ( BUILD_${LIBRARY_NAME} "Build ${LIBRARY_NAME} library ?" ON) #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- @@ -18,8 +18,8 @@ IF ( BUILD_${LIBRARY_NAME} ) #---------------------------------------------------------------------------- # LIBRARY HEADERS (TO BE INSTALLED) - # EITHER LIST ALL .h IN CURRENT DIR USING NEXT LINE: - FILE(GLOB ${LIBRARY_NAME}_HEADERS "*.h") + # EITHER LIST ALL .h, *.txx IN CURRENT DIR USING NEXT LINE: + FILE(GLOB ${LIBRARY_NAME}_HEADERS "*.h" "*.txx") # OR MANUALLY LIST YOUR HEADERS WITH NEXT COMMAND # SET ( ${LIBRARY_NAME}_HEADERS # @@ -48,12 +48,10 @@ IF ( BUILD_${LIBRARY_NAME} ) ) #---------------------------------------------------------------------------- - #---------------------------------------------------------------------------- # MACRO WHICH DOES ALL THE JOB : BUILD AND INSTALL CREA_ADD_LIBRARY( ${LIBRARY_NAME} ) #---------------------------------------------------------------------------- - #--------------------------------------------------------------------------- ENDIF ( BUILD_${LIBRARY_NAME} ) diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index 43f8ead..07a3eaf 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -257,7 +257,6 @@ IF(USE_TTH) ENDIF(USE_TTH) #----------------------------------------------------------------------------- - #----------------------------------------------------------------------------- IF(USE_BOOST) IF(NOT Boost_FOUND) -- 2.45.1