This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 07799a5eeba70a130b6b98c27fee06dd70cf21e4 (commit)
via 0c3126ff0c103afa871b151cda169d6b7b11911c (commit)
via 3d61ae6eb62738274b779bd0639673b97015b63c (commit)
from 2131259bf00f7ed3575ff0cf3d862dc2a731096a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07799a5eeba70a130b6b98c27fee06dd70cf21e4
commit 07799a5eeba70a130b6b98c27fee06dd70cf21e4
Merge: 2131259 0c3126f
Author: Peter Kuemmel <syntheti...@gmx.net>
AuthorDate: Fri Jul 6 03:59:02 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 6 03:59:02 2012 -0400
Merge topic 'BuildTypeFlag' into next
0c3126f remove test, it's not worth the build server hassle
3d61ae6 Ninja: remove int/size_t warning
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c3126ff0c103afa871b151cda169d6b7b11911c
commit 0c3126ff0c103afa871b151cda169d6b7b11911c
Author: Peter Kuemmel <syntheti...@gmx.net>
AuthorDate: Fri Jul 6 09:48:34 2012 +0200
Commit: Peter Kuemmel <syntheti...@gmx.net>
CommitDate: Fri Jul 6 09:49:22 2012 +0200
remove test, it's not worth the build server hassle
diff --git a/Tests/BuildTypeFlags/CMakeLists.txt
b/Tests/BuildTypeFlags/CMakeLists.txt
deleted file mode 100644
index 4e77162..0000000
--- a/Tests/BuildTypeFlags/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(BuildTypeFlags C)
-
-enable_testing()
-include(CTest)
-
-if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE Debug)
-endif()
-
-message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-
-set(CMAKE_C_FLAGS)
-set(CMAKE_C_FLAGS_DEBUG
- "${CMAKE_C_FLAGS_DEBUG} -DFLAG=\\\"${CMAKE_BUILD_TYPE}\\\"")
-set(CMAKE_C_FLAGS_MINSIZEREL
- "${CMAKE_C_FLAGS_MINSIZEREL} -DFLAG=\\\"${CMAKE_BUILD_TYPE}\\\"")
-set(CMAKE_C_FLAGS_RELEASE
- "${CMAKE_C_FLAGS_RELEASE} -DFLAG=\\\"${CMAKE_BUILD_TYPE}\\\"")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO
- "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DFLAG=\\\"${CMAKE_BUILD_TYPE}\\\"")
-
-add_library(lib STATIC lib.c)
-add_library(lib_shared SHARED lib.c)
-
-add_executable(flags flags.c)
-target_link_libraries(flags lib)
-
-add_test(NAME flags_set COMMAND flags)
-
-set_tests_properties(flags_set PROPERTIES
- PASS_REGULAR_EXPRESSION " ${CMAKE_BUILD_TYPE}")
diff --git a/Tests/BuildTypeFlags/flags.c b/Tests/BuildTypeFlags/flags.c
deleted file mode 100644
index 25d3479..0000000
--- a/Tests/BuildTypeFlags/flags.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "lib.h"
-
-#ifndef FLAG
-#define FLAG "not given"
-#endif
-
-int main(int argc, char* argv[])
-{
- printf("Flag: %s -> %s\n", argv[0], FLAG);
- lib();
- return EXIT_SUCCESS;
-}
diff --git a/Tests/BuildTypeFlags/lib.c b/Tests/BuildTypeFlags/lib.c
deleted file mode 100644
index 5936a06..0000000
--- a/Tests/BuildTypeFlags/lib.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "lib.h"
-
-#ifndef FLAG
-#define FLAG "not given"
-#endif
-
-void lib()
-{
- printf("Lib: %s\n", FLAG);
-}
diff --git a/Tests/BuildTypeFlags/lib.h b/Tests/BuildTypeFlags/lib.h
deleted file mode 100644
index d538ac2..0000000
--- a/Tests/BuildTypeFlags/lib.h
+++ /dev/null
@@ -1 +0,0 @@
-void lib();
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1677165..9deb8ac 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -625,16 +625,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BuildDepends")
- ADD_TEST(BuildTypeFlags ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/BuildTypeFlags"
- "${CMake_BINARY_DIR}/Tests/BuildTypeFlags"
- --build-generator ${CMAKE_TEST_GENERATOR}
- --build-project BuildTypeFlags
- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
- )
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BuildTypeFlags")
-
SET(SimpleInstallInstallDir
"${CMake_BINARY_DIR}/Tests/SimpleInstall/InstallDirectory")
ADD_TEST(SimpleInstall ${CMAKE_CTEST_COMMAND}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d61ae6eb62738274b779bd0639673b97015b63c
commit 3d61ae6eb62738274b779bd0639673b97015b63c
Author: Peter Kuemmel <syntheti...@gmx.net>
AuthorDate: Fri Jul 6 09:46:00 2012 +0200
Commit: Peter Kuemmel <syntheti...@gmx.net>
CommitDate: Fri Jul 6 09:46:00 2012 +0200
Ninja: remove int/size_t warning
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 23f42e4..b405905 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -558,7 +558,7 @@ void cmGlobalNinjaGenerator::AddRule(const std::string&
name,
restat,
generator);
- this->RuleCmdLength[name] = command.size();
+ this->RuleCmdLength[name] = (int) command.size();
}
bool cmGlobalNinjaGenerator::HasRule(const std::string &name)
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalNinjaGenerator.cxx | 2 +-
Tests/BuildTypeFlags/CMakeLists.txt | 33 ---------------------------------
Tests/BuildTypeFlags/flags.c | 15 ---------------
Tests/BuildTypeFlags/lib.c | 13 -------------
Tests/BuildTypeFlags/lib.h | 1 -
Tests/CMakeLists.txt | 10 ----------
6 files changed, 1 insertions(+), 73 deletions(-)
delete mode 100644 Tests/BuildTypeFlags/CMakeLists.txt
delete mode 100644 Tests/BuildTypeFlags/flags.c
delete mode 100644 Tests/BuildTypeFlags/lib.c
delete mode 100644 Tests/BuildTypeFlags/lib.h
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
