Merge remote-tracking branch 'project-template/master'

.gitignore

 build
+.project

cmake/FindPROJECT_NAME.cmake.in.in

@@ -15,12 +15,12 @@
 
 # Since this file is already part of the installation to be found, the configuration can be hard-coded at
 # installation time
-set(@PROJECT_NAME@_VERSION @@PROJECT_NAME@_SOVERSION@)
+set(@PROJECT_NAME@_VERSION "@@PROJECT_NAME@_SOVERSION@")
 set(@PROJECT_NAME@_INCLUDE_DIRS @@PROJECT_NAME@_INCLUDE_DIRS@)
 set(@PROJECT_NAME@_LIBRARY_DIRS @@PROJECT_NAME@_LIBRARY_DIRS@)
 set(@PROJECT_NAME@_LIBRARIES @@PROJECT_NAME@_LIBRARIES@)
-set(@PROJECT_NAME@_CXX_FLAGS @@PROJECT_NAME@_CXX_FLAGS@)
-set(@PROJECT_NAME@_LINKER_FLAGS @@PROJECT_NAME@_LINKER_FLAGS@)
+set(@PROJECT_NAME@_CXX_FLAGS "@@PROJECT_NAME@_CXX_FLAGS@")
+set(@PROJECT_NAME@_LINKER_FLAGS "@@PROJECT_NAME@_LINKER_FLAGS@")
 
 # Use a macro provided by CMake to check if all the listed arguments are valid and set @PROJECT_NAME@_FOUND accordingly.
 # This is mainly important to check the version.

cmake/PROJECT_NAME-config.in.in

 #!/bin/sh
 
 print_usage(){
-    echo "usage: $0 [--cppflags] [--ldflags] [--version]" 1>&2
+    echo -n "usage: $0 [--version] [--cppflags] [--ldflags]" 1>&2
+    if [ -n "@@PROJECT_NAME@_MEXFLAGS@" ]; then
+      echo " [--mexflags]" 1>&2
+      echo -n " The mexflags are only for use with MATLABs mex." 1>&2
+    fi
+    echo ""
 }
 
 if  [ $# -eq 0 ]; then
@@ -9,20 +14,23 @@ if  [ $# -eq 0 ]; then
     exit 1
 fi
 
-#The variables are all prepared in CMAKE and also provided by 
+#The variables are all prepared in CMAKE and also provided by
 #Find@PROJECT_NAME@.cmake, so dependent applications can create consistent
 #Makefiles.
 while [ $# -gt 0 ]; do
     case "$1" in
       --cppflags)
-        OUTPUT="${OUTPUT}@@PROJECT_NAME@_CPPFLAGS_MAKEFILE@"
+        OUTPUT="${OUTPUT}@@PROJECT_NAME@_CXX_FLAGS_MAKEFILE@"
         shift;;
       --ldflags)
-        OUTPUT="${OUTPUT}@@PROJECT_NAME@_LDFLAGS_MAKEFILE@"
+        OUTPUT="${OUTPUT}@@PROJECT_NAME@_LINKER_FLAGS_MAKEFILE@"
         shift;;
       --version)
         OUTPUT="${OUTPUT}@@PROJECT_NAME@_SOVERSION@"
         shift;;
+      --mexflags)
+        OUTPUT="${OUTPUT}@@PROJECT_NAME@_MEXFLAGS@"
+        shift;;
       *)
         echo "invalid option: $1" 1>&2
         print_usage

cmake/create_cmake_config_files.cmake

@@ -10,6 +10,7 @@
 #   ${PROJECT_NAME}_LIBRARIES - list of libraries needed when linking against this project
 #   ${PROJECT_NAME}_CXX_FLAGS - list of additional C++ compiler flags needed when compiling against this project
 #   ${PROJECT_NAME}_LINKER_FLAGS - list of additional linker flags needed when linking against this project
+#   ${PROJECT_NAME}_MEXFLAGS - (optional) mex compiler flags
 #
 #######################################################################################################################
 
@@ -34,19 +35,23 @@ foreach(LIBRARY ${LIST})
 endforeach()
 
 # force the lists to be space separated (may be sometimes semicolon separated)
+string(REPLACE ";" " " ${PROJECT_NAME}_SOVERSION ${${PROJECT_NAME}_SOVERSION})
 string(REPLACE ";" " " ${PROJECT_NAME}_INCLUDE_DIRS ${${PROJECT_NAME}_INCLUDE_DIRS})
 string(REPLACE ";" " " ${PROJECT_NAME}_LIBRARY_DIRS ${${PROJECT_NAME}_LIBRARY_DIRS})
 string(REPLACE ";" " " ${PROJECT_NAME}_LIBRARIES ${${PROJECT_NAME}_LIBRARIES})
+string(REPLACE ";" " " ${PROJECT_NAME}_CXX_FLAGS ${${PROJECT_NAME}_CXX_FLAGS})
+string(REPLACE ";" " " ${PROJECT_NAME}_LINKER_FLAGS ${${PROJECT_NAME}_LINKER_FLAGS})
+string(REPLACE ";" " " ${PROJECT_NAME}_MEXFLAGS ${${PROJECT_NAME}_MEXFLAGS})
 
 # we have nested @-statements, so we have to parse twice:
 
 # create the cmake Find package script
-configure_file(cmake/FindPROJECT_NAME.cmake.in.in "${PROJECT_BINARY_DIR}/cmake/Find${PROJECT_NAME}.cmake.in")
-configure_file(${PROJECT_BINARY_DIR}/cmake/Find${PROJECT_NAME}.cmake.in "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake")
+configure_file(cmake/FindPROJECT_NAME.cmake.in.in "${PROJECT_BINARY_DIR}/cmake/Find${PROJECT_NAME}.cmake.in" @ONLY)
+configure_file(${PROJECT_BINARY_DIR}/cmake/Find${PROJECT_NAME}.cmake.in "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake" @ONLY)
 
 # create the shell script for standard make files
-configure_file(cmake/PROJECT_NAME-config.in.in "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config.in")
-configure_file(${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config.in "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config")
+configure_file(cmake/PROJECT_NAME-config.in.in "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config.in" @ONLY)
+configure_file(${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config.in "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config" @ONLY)
 
 # install the script
 install(FILES "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake"