fix up osx lib paths, prepare for coverage build

.travis.yml

@@ -7,13 +7,15 @@ matrix:
 # Don't build using gcc on mac
   - os: osx
     compiler: gcc
-# Don't try to do Coverity builds on mac
+# Don't try to do Coverity or coverage builds on mac
   - os: osx
     env: COVERITY=1
-# Only do coverity build on Linux when the compiler is gcc
+	env: COVERAGE=1
+# Only do coverity or coverage build on Linux when the compiler is gcc
   - os: linux
     compiler: clang
     env: COVERITY=1
+	env: COVERAGE=1
 # Don't build with clang on Linux
   - os: linux
     compiler: clang
@@ -24,68 +26,31 @@ compiler:
 before_script: 
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:boost-latest/ppa -y; fi
-- echo $CXX
-- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then wget http://llvm.org/apt/precise/pool/main/l/llvm-toolchain-3.5/clang-3.5_3.5~svn215019-1~exp1_amd64.deb; fi
-- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then sudo dpkg -i clang-3.5_3.5~svn215019-1~exp1_amd64.deb; fi
-- echo $CXX
-- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then export CXX=clang3.5; fi
-
-- echo $CXX
-#- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then sudo apt-get install --allow-unauthenticated clang-3.4; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
-- echo $CXX
-#- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then export CXX="clang++-3.4"; fi
-#- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then export CXX="clang++-3.4"; fi
-
 - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo apt-get install gcc-4.9; fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo apt-get install g++-4.9; fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 20; fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 20; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.9 90; fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo update-alternatives --config gcc; fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo update-alternatives --config g++; fi
-
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install boost1.55; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libvorbis-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libalut-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libfreetype6-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libfreeimage-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install zlib1g-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libzzip-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libois-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libglu-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libqt4-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/ogre-build_1.9.0-1_amd64.deb; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo dpkg -i ogre-build_1.9.0-1_amd64.deb; fi
-
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
-#- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew doctor; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated wget || brew upgrade wget; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install qt; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreDependencies_OSX_libc._20130610.zip; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/NVIDIA_Cg.tgz; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreSDK.zip; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then unzip OgreSDK.zip >> OgreSDK_extract.log; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo tar xfzC NVIDIA_Cg.tgz /; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then unzip OgreDependencies_OSX_libc._20130610.zip >> extract.log; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" && "$COVERAGE" == 1 ]]; then wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" && "$COVERAGE" == 1 ]]; then tar xf lcov_1.11.orig.tar.gz; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" && "$COVERAGE" == 1 ]]; then sudo make -C lcov-1.11/ install; fi
+- if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./CIBuid/linux/dependencies.sh; fi
+- if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./CIBuid/osx/dependencies.sh; fi
 - $CXX --version
 
 before_install: 
 script: 
-
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cp OgreSDK/lib/macosx/Release/Ogre.framework/Versions/1.9.0/Ogre OgreSDK/lib/macosx/Release/Ogre.framework/Ogre; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cp OgreSDK/lib/macosx/Release/OgreOverlay.framework/Versions/1.9.0/OgreOverlay OgreSDK/lib/macosx/Release/OgreOverlay.framework/OgreOverlay; fi
-
 - mkdir build_qgears
 - cd build_qgears
-
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_HOME=/Users/travis/build/q-gears/q-gears/OgreSDK; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_SDK=/Users/travis/build/q-gears/q-gears/OgreSDK; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OIS_HOME=/Users/travis/build/q-gears/q-gears/Dependencies; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -G"Unix Makefiles" ..; fi
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake ..; fi
-
+- if [ "$TRAVIS_OS_NAME" == "linux" ]; then- cmake -G"Unix Makefiles" ..; fi
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then- cmake -G"Unix Makefiles" .. -DBOOST_ROOT=${PWD}/../boost/1.55.0_1; fi
 - if [[ "${COVERITY_SCAN_BRANCH}" != 1 ]]; then make -j2; fi
-- if [[ "${COVERITY_SCAN_BRANCH}" != 1 ]]; then cpack -C Release; fi
+- if [[ "${COVERITY_SCAN_BRANCH}" != 1 && "$TRAVIS_OS_NAME" == "osx" ]]; then ../CIBuid/osx/fix_lib_paths.sh ./bin_release; fi
+- if [[ "${COVERITY_SCAN_BRANCH}" != 1 && "${COVERAGE}" !=1 ]]; then cpack -C Release; fi
+
 language: cpp
 after_success: 
 - hash=`git rev-parse HEAD`
@@ -122,14 +87,19 @@ after_success:
 - chmod 700 ~/.ssh
 - md5sum ~/.ssh/id_rsa
 
-- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then ssh -o StrictHostKeyChecking=no paul@itscovarr.com mkdir -p /var/www/storage/qgears/$hash/linux/; fi
-- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then scp -o StrictHostKeyChecking=no ~/build/q-gears/q-gears/build_qgears/*.deb paul@itscovarr.com:/var/www/storage/qgears/$hash/linux/; fi
-- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then scp -o StrictHostKeyChecking=no ~/build/q-gears/q-gears/build_qgears/*.tar.gz paul@itscovarr.com:/var/www/storage/qgears/$hash/linux/; fi
-
-- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "$TRAVIS_OS_NAME" == "osx" ]]; then ssh -o StrictHostKeyChecking=no paul@itscovarr.com mkdir -p /var/www/storage/qgears/$hash/mac/; fi
-- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "$TRAVIS_OS_NAME" == "osx" ]]; then scp -o StrictHostKeyChecking=no ~/build/q-gears/q-gears/build_qgears/*.dmg paul@itscovarr.com:/var/www/storage/qgears/$hash/mac/; fi
+- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "${COVERAGE}" !=1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then ssh -o StrictHostKeyChecking=no paul@itscovarr.com mkdir -p /var/www/storage/qgears/$hash/linux/; fi
+- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "${COVERAGE}" !=1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then scp -o StrictHostKeyChecking=no ~/build/q-gears/q-gears/build_qgears/*.deb paul@itscovarr.com:/var/www/storage/qgears/$hash/linux/; fi
+- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "${COVERAGE}" !=1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then scp -o StrictHostKeyChecking=no ~/build/q-gears/q-gears/build_qgears/*.tar.gz paul@itscovarr.com:/var/www/storage/qgears/$hash/linux/; fi
 
+- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "${COVERAGE}" !=1 && "$TRAVIS_OS_NAME" == "osx" ]]; then ssh -o StrictHostKeyChecking=no paul@itscovarr.com mkdir -p /var/www/storage/qgears/$hash/mac/; fi
+- if [[ "$TRAVIS_PULL_REQUEST" == 'false' && "${COVERITY_SCAN_BRANCH}" != 1 && "${COVERAGE}" !=1 && "$TRAVIS_OS_NAME" == "osx" ]]; then scp -o StrictHostKeyChecking=no ~/build/q-gears/q-gears/build_qgears/*.dmg paul@itscovarr.com:/var/www/storage/qgears/$hash/mac/; fi
 
+after_success:
+  - if [ "$CXX" == "g++" && "${COVERAGE}" == 1 && "$TRAVIS_OS_NAME" == "linux" ]; then lcov --directory . --capture --output-file coverage.info; fi
+  - if [ "$CXX" == "g++" && "${COVERAGE}" == 1 && "$TRAVIS_OS_NAME" == "linux" ]; then lcov --remove coverage.info '*/googlemock/*' '/usr/*' --output-file coverage.info; fi
+  - if [ "$CXX" == "g++" && "${COVERAGE}" == 1 && "$TRAVIS_OS_NAME" == "linux" ]; then lcov --list coverage.info; fi
+  - if [ "$CXX" == "g++" && "${COVERAGE}" == 1 && "$TRAVIS_OS_NAME" == "linux" ]; then coveralls-lcov coverage.info; fi
+  
 notifications: 
   on_failure: always
   irc: irc.esper.net#qhimm.com
@@ -145,6 +115,7 @@ addons:
     build_command: "make -j4"
     branch_pattern: coverity_scan
 env: 
+  - COVERAGE=1
   global: 
   - secure: "PUtlviIMOxgXYfBiAW+tsDHQPq+XfftHy2Te1qFvkzkqfGtHQMiCM5an1tZW8LuuYLhuRo+piG+XsK5A8THW4At+hsQZFRPK4b952aHGTQNimTPFr3COccKOlGsLDJD+iKEBJbME1u/Kml9IvwVFBLoL6UtjEWPUJ3jVOitfnoA="
   - secure: pc5w4v8EzEtKD+iSZaao9Qq7FoPz2a65cpubHQjD36IN7g4gNaUcv2i/9cgqWk8+au7jKbJg0lFnkXRA/ldzBd30xsXubKWSmvcKt2dQRNJkKVBWsKW2ZiAtID/uibu5kwxdGn1zi4uO+WXygmu/fWSvOkToq87NsGrQYGU+Ahs=

CIBuild/linux/dependencies.sh

@@ -0,0 +1,12 @@
+sudo apt-get install boost1.55
+sudo apt-get install libvorbis-dev
+sudo apt-get install libalut-dev
+sudo apt-get install libfreetype6-dev
+sudo apt-get install libfreeimage-dev
+sudo apt-get install zlib1g-dev
+sudo apt-get install libzzip-dev
+sudo apt-get install libois-dev
+sudo apt-get install libglu-dev
+sudo apt-get install libqt4-dev
+wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/ogre-build_1.9.0-1_amd64.deb
+sudo dpkg -i ogre-build_1.9.0-1_amd64.deb

CIBuild/osx/dependencies.sh

@@ -0,0 +1,17 @@
+brew update
+# brew doctor
+# brew outdated wget || brew upgrade wget
+brew install qt
+wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreDependencies_OSX_libc._20130610.zip
+wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/NVIDIA_Cg.tgz
+wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreSDK.zip
+unzip OgreSDK.zip >> OgreSDK_extract.log
+sudo tar xfzC NVIDIA_Cg.tgz /
+unzip OgreDependencies_OSX_libc._20130610.zip >> extract.log
+export OGRE_HOME=${PWD}/../OgreSDK
+export OGRE_SDK=${PWD}/../OgreSDK
+export OIS_HOME=${PWD}/../Dependencies
+
+# Overwrite broken symlink with actual file
+cp ${OGRE_SDK}/lib/macosx/Release/Ogre.framework/Versions/1.9.0/Ogre ${OGRE_SDK}/lib/macosx/Release/Ogre.framework/Ogre
+cp ${OGRE_SDK}/lib/macosx/Release/OgreOverlay.framework/Versions/1.9.0/OgreOverlay ${OGRE_SDK}/lib/macosx/Release/OgreOverlay.framework/OgreOverlay

CIBuild/osx/fix_lib_paths.sh

@@ -0,0 +1,46 @@
+# fix permissions on anything already there
+for file in $1/*
+do
+    chmod +rwx "$file" 
+done
+
+# Copy required dylibs
+cp "${OGRE_SDK}/lib/macosx/Release/Ogre.framework/Ogre" ./bin_release
+cp "${OGRE_SDK}/lib/macosx/Release/RenderSystem_GL.framework/Versions/1.9.0/RenderSystem_GL" ./bin_release/
+cp "${OGRE_SDK}/lib/macosx/Release/OgreOverlay.framework/Versions/1.9.0/OgreOverlay" ./bin_release/
+cp ${PWD}/../boost/1.55.0_1/lib/libboost_thread-mt.dylib ./bin_release/
+cp ${PWD}/../boost/1.55.0_1/lib/libboost_date_time-mt.dylib ./bin_release/
+cp ${PWD}/../boost/1.55.0_1/lib/libboost_system-mt.dylib ./bin_release/
+cp ${PWD}/../boost/1.55.0_1/lib/libboost_atomic-mt.dylib ./bin_release/
+cp ${PWD}/../boost/1.55.0_1/lib/libboost_chrono-mt.dylib ./bin_release/
+cp ${PWD}/../boost/1.55.0_1/lib/libboost_program_options-mt.dylib ./bin_release/
+cp ${PWD}/../boost/1.55.0_1/lib/libboost_filesystem-mt.dylib ./bin_release/
+cp ${PWD}/../boost/1.55.0_1/lib/libboost_unit_test_framework-mt.dylib ./bin_release/
+cp /usr/local/lib/QtCore.framework/Versions/4/QtCore ./bin_release/
+cp /usr/local/lib/QtGui.framework/Versions/4/QtGui ./bin_release/
+
+# fix permissions on anything we just copied
+for file in $1/*
+do
+    chmod +rwx "$file" 
+done
+
+# Update dylib paths in all binaries
+for file in $1/*
+do
+   install_name_tool "$file" -change @executable_path/../Frameworks/Ogre.framework/Versions/1.9.0/Ogre @executable_path/Ogre
+   install_name_tool "$file" -change @executable_path/../Frameworks/OgreOverlay.framework/Versions/1.9.0/OgreOverlay @executable_path/OgreOverlay
+   install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_thread-mt.dylib @executable_path/libboost_thread-mt.dylib
+   install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_date_time-mt.dylib @executable_path/libboost_date_time-mt.dylib
+   install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_system-mt.dylib @executable_path/libboost_system-mt.dylib
+   install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_atomic-mt.dylib @executable_path/libboost_atomic-mt.dylib
+   install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_chrono-mt.dylib @executable_path/libboost_chrono-mt.dylib
+   install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_program_options-mt.dylib @executable_path/libboost_program_options-mt.dylib
+   install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_filesystem-mt.dylib @executable_path/libboost_filesystem-mt.dylib
+   install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_unit_test_framework-mt.dylib @executable_path/libboost_unit_test_framework-mt.dylib
+   install_name_tool "$file" -change @@HOMEBREW_PREFIX@@/lib/libboost_chrono-mt.dylib @executable_path/libboost_chrono-mt.dylib
+   install_name_tool "$file" -change ${PWD}/bin_release/liblua.dylib  @executable_path/liblua.dylib
+   install_name_tool "$file" -change /usr/local/lib/QtCore.framework/Versions/4/QtCore @executable_path/QtCore
+   install_name_tool "$file" -change /usr/local/lib/QtGui.framework/Versions/4/QtGui @executable_path/QtGui
+   otool "$file" -L
+done

CMakeLists.txt

@@ -9,6 +9,14 @@ set(QGears_VERSION_MAJOR 0)
 set(QGears_VERSION_MINOR 22)
 set(QGears_VERSION_PATCH 0)
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin_release)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin_release)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin_release)
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin_debug)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin_debug)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin_debug)
+
 # Enable Visual Studio solution "folders"
 SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) 
 

Tests/FinalFantasy7/CMakeLists.txt

@@ -19,7 +19,7 @@ SET_PROPERTY(TARGET TestFF7FLevelFileSerializer PROPERTY FOLDER "tests")
 
 
 target_link_libraries(TestFF7FLevelFileSerializer ${LIBRARIES})
-add_test(TestFF7FLevelFileSerializer TestFF7FLevelFileSerializer)
+add_test(NAME TestFF7FLevelFileSerializer COMMAND TestFF7FLevelFileSerializer)
 
 
 add_executable(TestFF7ModelListFileSerializer
@@ -29,7 +29,7 @@ SET_PROPERTY(TARGET TestFF7ModelListFileSerializer PROPERTY FOLDER "tests")
 
 
 target_link_libraries(TestFF7ModelListFileSerializer ${LIBRARIES})
-add_test(TestFF7ModelListFileSerializer TestFF7ModelListFileSerializer)
+add_test(NAME TestFF7ModelListFileSerializer COMMAND TestFF7ModelListFileSerializer)
 
 
 add_executable(TestFF7WalkmeshFileSerializer
@@ -38,4 +38,4 @@ add_executable(TestFF7WalkmeshFileSerializer
 SET_PROPERTY(TARGET TestFF7WalkmeshFileSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestFF7WalkmeshFileSerializer ${LIBRARIES})
-add_test(TestFF7WalkmeshFileSerializer TestFF7WalkmeshFileSerializer)
+add_test(NAME TestFF7WalkmeshFileSerializer COMMAND TestFF7WalkmeshFileSerializer)

Tests/QGearsMain/CMakeLists.txt

@@ -16,7 +16,7 @@ add_executable(TestQGearsAFileSerializer
 SET_PROPERTY(TARGET TestQGearsAFileSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestQGearsAFileSerializer ${LIBRARIES})
-add_test(TestQGearsAFileSerializer TestQGearsAFileSerializer)
+add_test(NAME TestQGearsAFileSerializer COMMAND TestQGearsAFileSerializer)
 
 
 add_executable(TestQGearsMapFileXMLSerializer
@@ -25,7 +25,7 @@ add_executable(TestQGearsMapFileXMLSerializer
 SET_PROPERTY(TARGET TestQGearsMapFileXMLSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestQGearsMapFileXMLSerializer ${LIBRARIES})
-add_test(TestQGearsMapFileXMLSerializer TestQGearsMapFileXMLSerializer)
+add_test(NAME TestQGearsMapFileXMLSerializer COMMAND TestQGearsMapFileXMLSerializer)
 
 # field walk mesh
 add_executable(TestQGearsWalkmeshFileXMLSerializer
@@ -34,7 +34,7 @@ add_executable(TestQGearsWalkmeshFileXMLSerializer
 SET_PROPERTY(TARGET TestQGearsWalkmeshFileXMLSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestQGearsWalkmeshFileXMLSerializer ${LIBRARIES})
-add_test(TestQGearsWalkmeshFileXMLSerializer TestQGearsWalkmeshFileXMLSerializer)
+add_test(NAME TestQGearsWalkmeshFileXMLSerializer COMMAND TestQGearsWalkmeshFileXMLSerializer)
 
 # LGP archive
 add_executable(TestQGearsLGPArchive
@@ -43,7 +43,7 @@ add_executable(TestQGearsLGPArchive
 SET_PROPERTY(TARGET TestQGearsLGPArchive PROPERTY FOLDER "tests")
 
 target_link_libraries(TestQGearsLGPArchive ${LIBRARIES})
-add_test(TestQGearsLGPArchive TestQGearsLGPArchive)
+add_test(NAME TestQGearsLGPArchive COMMAND TestQGearsLGPArchive)
 
 # HRC archive
 add_executable(TestQGearsHRCSerializer
@@ -52,7 +52,7 @@ add_executable(TestQGearsHRCSerializer
 SET_PROPERTY(TARGET TestQGearsHRCSerializer PROPERTY FOLDER "tests")
 
 target_link_libraries(TestQGearsHRCSerializer ${LIBRARIES})
-add_test(TestQGearsHRCSerializer TestQGearsHRCSerializer)
+add_test(NAME TestQGearsHRCSerializer COMMAND TestQGearsHRCSerializer)
 
 # world map
 add_executable(TestMapSerializer