[Cmake-commits] CMake branch, next, updated. v2.8.6-1541-g64c1dcc
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 64c1dcccf5c5dfb8a9c1c1bbdf30a205b13efd0d (commit)
via 32f8437bbfc7141ba4ff9c6dd4311e67c25c2ad2 (commit)
from caf1edba845d6a4da73356a662452595cd504873 (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=64c1dcccf5c5dfb8a9c1c1bbdf30a205b13efd0d
commit 64c1dcccf5c5dfb8a9c1c1bbdf30a205b13efd0d
Merge: caf1edb 32f8437
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Oct 10 09:51:58 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 10 09:51:58 2011 -0400
Merge topic 'ninja-generator-prep' into next
32f8437 Fix line-too-long style violations
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32f8437bbfc7141ba4ff9c6dd4311e67c25c2ad2
commit 32f8437bbfc7141ba4ff9c6dd4311e67c25c2ad2
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Oct 10 09:44:33 2011 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Oct 10 09:46:27 2011 -0400
Fix line-too-long style violations
Commit 8a0eb78f (Constify many getters of cmGlobalGenerator, 2011-03-26)
added const qualifiers to many cmGlobalGenerator methods but left the
resulting lines beyond our style's limit of 79 characters.
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 96a326c..9f140a9 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -220,7 +220,8 @@ public:
/** Get the manifest of all targets that will be built for each
configuration. This is valid during generation only. */
- cmTargetManifest const GetTargetManifest() const { return
this-TargetManifest; }
+ cmTargetManifest const GetTargetManifest() const
+ { return this-TargetManifest; }
/** Get the content of a directory. Directory listings are loaded
from disk at most once and cached. During the generation step
@@ -231,12 +232,12 @@ public:
void AddTarget(cmTargets::value_type v);
- virtual const char* GetAllTargetName() const { return ALL_BUILD;
}
+ virtual const char* GetAllTargetName() const { return ALL_BUILD; }
virtual const char* GetInstallTargetName() const { return INSTALL; }
virtual const char* GetInstallLocalTargetName() const { return 0; }
virtual const char* GetInstallStripTargetName() const { return 0; }
virtual const char* GetPreinstallTargetName()const { return 0; }
- virtual const char* GetTestTargetName() const { return RUN_TESTS;
}
+ virtual const char* GetTestTargetName()const { return RUN_TESTS; }
virtual const char* GetPackageTargetName() const { return PACKAGE; }
virtual const char* GetPackageSourceTargetName() const { return 0; }
virtual const char* GetEditCacheTargetName() const { return 0; }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h
b/Source/cmGlobalUnixMakefileGenerator3.h
index 7c6bbc2..481640b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -136,18 +136,18 @@ protected:
// does this generator need a requires step for any of its targets
bool NeedRequiresStep(cmTarget const);
- // Setup target names
- virtual const char* GetAllTargetName() const { return all; }
- virtual const char* GetInstallTargetName() const { return install; }
- virtual const char* GetInstallLocalTargetName() const { return
install/local; }
- virtual const char* GetInstallStripTargetName() const { return
install/strip; }
- virtual const char* GetPreinstallTargetName()const { return
preinstall; }
- virtual const char* GetTestTargetName() const { return test; }
- virtual const char* GetPackageTargetName() const { return package; }
- virtual const char* GetPackageSourceTargetName() const { return
package_source; }
- virtual const char* GetEditCacheTargetName() const { return
edit_cache; }
- virtual const char* GetRebuildCacheTargetName() const { return
rebuild_cache; }
- virtual const char* GetCleanTargetName() const { return clean; }
+ // Target name hooks for superclass.
+ const char* GetAllTargetName() const { return all; }
+ const char* GetInstallTargetName() const { return install; }
+ const char* GetInstallLocalTargetName() const { return install/local; }
+ const char* GetInstallStripTargetName() const { return install/strip; }
+ const char* GetPreinstallTargetName()const { return preinstall; }
+ const char* GetTestTargetName() const { return test; }
+ const char* GetPackageTargetName() const { return
[Cmake-commits] CMake branch, next, updated. v2.8.6-1547-g89af01e
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 89af01e7740440b8ac12a5f983dae93b34911482 (commit)
via 08271ec7d3184c8a53ae80be9ec0ac6438032cfa (commit)
via c83cfd7a01f2fb00ba7d545b0df667c0d43b296f (commit)
via 48171cefb5bc4a52953b08ade9459584fddc3d0d (commit)
via 783da62f2ea539fa5baf96bb28f7f6690f748229 (commit)
via 61c69d3fbbdb0390eb8f27e39a30a21d43ab4169 (commit)
from 64c1dcccf5c5dfb8a9c1c1bbdf30a205b13efd0d (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=89af01e7740440b8ac12a5f983dae93b34911482
commit 89af01e7740440b8ac12a5f983dae93b34911482
Merge: 64c1dcc 08271ec
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Oct 10 10:39:45 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 10 10:39:45 2011 -0400
Merge topic 'export-header-tests' into next
08271ec Build each library only once instead of once for each test.
c83cfd7 Remove unused define.
48171ce KWSys Nightly Date Stamp
783da62 KWSys Nightly Date Stamp
61c69d3 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08271ec7d3184c8a53ae80be9ec0ac6438032cfa
commit 08271ec7d3184c8a53ae80be9ec0ac6438032cfa
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sun Oct 9 17:41:47 2011 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Sun Oct 9 17:41:47 2011 +0200
Build each library only once instead of once for each test.
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 7a52c71..4a5b1cb 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -55,6 +55,29 @@ else()
endif()
endif()
+set(DEPS
+ libshared
+ libstatic
+ lib_shared_and_static
+)
+
+foreach(DEP ${DEPS})
+ try_compile(Result ${CMAKE_CURRENT_BINARY_DIR}/${DEP}_build
+${CMAKE_CURRENT_SOURCE_DIR}/${DEP}
+${DEP}
+OUTPUT_VARIABLE Out
+ )
+ if (NOT Result)
+message(OUTPUT: ${Out})
+ endif()
+endforeach()
+
+# The _do_build macro is called from a child scope, where
+# the current source and binary dir are different. Save them here
+# for use in the macro.
+set(TEST_TOP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(TEST_TOP_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
# We seem to get race conditions is writing this stuff to the same file at
least on MinGW
# So to write to separate source and build directories, we use a count to
differentiate.
@@ -67,8 +90,6 @@ macro(_do_build Include Library LibrarySource Source)
int main() { ${Source}; }\n
)
- file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../${LibrarySource} DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/test${COUNT})
-
if (${Library} STREQUAL static_variant)
set(CONDITIONAL_STATIC_DEFINE
add_definitions(-DLIBSHARED_AND_STATIC_STATIC_DEFINE)\n)
endif()
@@ -90,9 +111,10 @@ macro(_do_build Include Library LibrarySource Source)
add_definitions(${ERROR_FLAG})\n
endif()\n
-add_subdirectory(\${LibrarySource}\)\n
+
include(\${TEST_TOP_BINARY_DIR}/${LibrarySource}_build/Targets.cmake\)\n
-include_directories(\${LibrarySource}\
\\${CMAKE_CURRENT_BINARY_DIR}/${LibrarySource}\)\n
+include_directories(\${TEST_TOP_SOURCE_DIR}/${LibrarySource}\\n
+\${TEST_TOP_BINARY_DIR}/${LibrarySource}_build\)\n
${CONDITIONAL_STATIC_DEFINE}
diff --git
a/Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
index d19b6dc..be0387f 100644
--- a/Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
@@ -1,4 +1,13 @@
-project(shared_and_static)
+
+cmake_minimum_required(VERSION 2.8)
+
+project(lib_shared_and_static)
+
+include(GenerateExportHeader)
+
+add_compiler_export_flags()
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(lib_SRCS
libshared_and_static.cpp
@@ -10,3 +19,5 @@ add_library(static_variant ${lib_SRCS})
generate_export_header(shared_variant BASE_NAME libshared_and_static)
set_target_properties(static_variant PROPERTIES COMPILE_FLAGS
-DLIBSHARED_AND_STATIC_STATIC_DEFINE)
+
+export(TARGETS shared_variant static_variant FILE Targets.cmake)
diff --git a/Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt
index 8e4ee2b..e20adb1 100644
--- a/Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt
+++
[Cmake-commits] CMake branch, master, updated. v2.8.6-8-gfac6e2e
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, master has been updated via fac6e2ef4448a3dd42c149383468b9b681d3215f (commit) from d1f5a3bff9ebebf1e0df268e31f4853bfd46a8df (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=fac6e2ef4448a3dd42c149383468b9b681d3215f commit fac6e2ef4448a3dd42c149383468b9b681d3215f Author: KWSys Robot kwro...@kitware.com AuthorDate: Tue Oct 11 00:01:08 2011 -0400 Commit: KWSys Robot kwro...@kitware.com CommitDate: Tue Oct 11 00:09:47 2011 -0400 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index b22febf..434e6af 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2011) SET(KWSYS_DATE_STAMP_MONTH 10) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 10) +SET(KWSYS_DATE_STAMP_DAY 11) --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
