summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-10-05 23:36:07 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-10-05 23:36:07 +0200
commit241486117535a540ac16894a3a08244c293eb680 (patch)
tree0c6f58745992527a513ee647e8a425dcab82b619 /src
parentfbe19c49c5965577856f7c4b40581a796275817e (diff)
parentec32b1df35f49e8f785bd2de0306719825b2be57 (diff)
downloadcolobot-241486117535a540ac16894a3a08244c293eb680.tar.gz
colobot-241486117535a540ac16894a3a08244c293eb680.tar.bz2
colobot-241486117535a540ac16894a3a08244c293eb680.zip
Merge branch 'dev' of github.com:colobot/colobot into dev
Diffstat (limited to 'src')
-rw-r--r--src/common/test/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
index 7936862..ccbb739 100644
--- a/src/common/test/CMakeLists.txt
+++ b/src/common/test/CMakeLists.txt
@@ -14,7 +14,7 @@ ${GTEST_DIR}/include
add_executable(image_test ../image.cpp image_test.cpp)
target_link_libraries(image_test ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${PNG_LIBRARIES})
-add_executable(profile_test ../profile.cpp ../logger.cpp profile_test.cpp)
-target_link_libraries(profile_test gtest ${Boost_LIBRARIES})
+#add_executable(profile_test ../profile.cpp ../logger.cpp profile_test.cpp)
+#target_link_libraries(profile_test gtest ${Boost_LIBRARIES})
-add_test(profile_test ./profile_test)
+#add_test(profile_test ./profile_test)