summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-07-12 19:59:55 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-07-12 19:59:55 (GMT)
commit344bdb69e2234a21684d2d194f4934a173e4e6ce (patch)
tree4f29ce59b6172f48cb51b33df7d836f487289749 /Tests
parent4b39302407a83e93a22dbabd784ec44e113d86bc (diff)
parentd54618f36e8df26906b433577051ca818b0765d2 (diff)
downloadCMake-344bdb69e2234a21684d2d194f4934a173e4e6ce.zip
CMake-344bdb69e2234a21684d2d194f4934a173e4e6ce.tar.gz
CMake-344bdb69e2234a21684d2d194f4934a173e4e6ce.tar.bz2
Merge topic 'fix-CustomCommand-main'
d54618f Tests/CustomCommand: Do not use 'main' in a library
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CustomCommand/GeneratedHeader/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CustomCommand/GeneratedHeader/main.cpp b/Tests/CustomCommand/GeneratedHeader/main.cpp
index 1b3e85f..0b43ffe 100644
--- a/Tests/CustomCommand/GeneratedHeader/main.cpp
+++ b/Tests/CustomCommand/GeneratedHeader/main.cpp
@@ -1,5 +1,5 @@
#include "generated.h"
-int main()
+int mainGeneratedHeader()
{
return 0;
}