[Cmake-commits] CMake branch, master, updated. v2.8.11.2-859-ge5538f3
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 e5538f323eede6a46fad5f8a5fe04fd5f5ab23ce (commit) from 475635ec0f3eeae9f6db0f9daa8a9c4cd8b3f989 (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=e5538f323eede6a46fad5f8a5fe04fd5f5ab23ce commit e5538f323eede6a46fad5f8a5fe04fd5f5ab23ce Author: Kitware Robot AuthorDate: Tue Sep 24 00:01:07 2013 -0400 Commit: Kitware Robot CommitDate: Tue Sep 24 00:01:07 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8a1128f..8709521 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 11) -set(CMake_VERSION_TWEAK 20130923) +set(CMake_VERSION_TWEAK 20130924) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.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
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4287-g4030ef5
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 4030ef52205582fe55509bd02f818f32ee2044d7 (commit)
via e63cf5f0999da8242c6e32698521d7e2eb12497b (commit)
from c63c08bede9efbd08efa8a26dc55caf40a825e8c (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=4030ef52205582fe55509bd02f818f32ee2044d7
commit 4030ef52205582fe55509bd02f818f32ee2044d7
Merge: c63c08b e63cf5f
Author: Brad King
AuthorDate: Mon Sep 23 17:17:17 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 23 17:17:17 2013 -0400
Merge topic 'wince-corelibc' into next
e63cf5f MSVC: Fix version test for linking corelibc on Windows CE (#14420)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e63cf5f0999da8242c6e32698521d7e2eb12497b
commit e63cf5f0999da8242c6e32698521d7e2eb12497b
Author: Patrick Gansterer
AuthorDate: Mon Sep 23 19:38:13 2013 +0200
Commit: Brad King
CommitDate: Mon Sep 23 17:11:47 2013 -0400
MSVC: Fix version test for linking corelibc on Windows CE (#14420)
In commit 8fcf0ab0 (Add support for new Windows CE compiler, 2013-08-04)
we made corelibc conditional on the MSVC version, but the version value
was incorrect. Update it to use corelibc for VS 2008 and below.
diff --git a/Modules/Platform/Windows-MSVC.cmake
b/Modules/Platform/Windows-MSVC.cmake
index 8cb7fd5..d9881f2 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -144,7 +144,7 @@ if(WINCE)
set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib ole32.lib oleaut32.lib
uuid.lib commctrl.lib")
set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}
/NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib")
- if (MSVC_VERSION LESS 1500)
+ if (MSVC_VERSION LESS 1600)
set(CMAKE_C_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}
corelibc.lib")
endif ()
else()
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4285-gc63c08b
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 c63c08bede9efbd08efa8a26dc55caf40a825e8c (commit)
via 016cd6dd7224c48aec5121f6ca7fd0f958f7e0ab (commit)
from 8ba55f66ad4c31747d8ca9f084699a74fb43828f (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=c63c08bede9efbd08efa8a26dc55caf40a825e8c
commit c63c08bede9efbd08efa8a26dc55caf40a825e8c
Merge: 8ba55f6 016cd6d
Author: Patrick Gansterer
AuthorDate: Mon Sep 23 16:43:09 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 23 16:43:09 2013 -0400
Merge topic 'corelibc' into next
016cd6d Use corelibc.lib only for VS2005 and VS2008 when building for
Windows CE
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=016cd6dd7224c48aec5121f6ca7fd0f958f7e0ab
commit 016cd6dd7224c48aec5121f6ca7fd0f958f7e0ab
Author: Patrick Gansterer
AuthorDate: Mon Sep 23 22:42:45 2013 +0200
Commit: Patrick Gansterer
CommitDate: Mon Sep 23 22:42:45 2013 +0200
Use corelibc.lib only for VS2005 and VS2008 when building for Windows CE
Fix the previous commit by checking for the correct version number of
MSVC instead of adding the library unconditionally.
diff --git a/Modules/Platform/Windows-MSVC.cmake
b/Modules/Platform/Windows-MSVC.cmake
index ab11b1f..d9881f2 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -141,10 +141,10 @@ if(WINCE)
set(_RTC1 "")
set(_FLAGS_CXX " /GR /EHsc")
- set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib corelibc.lib ole32.lib
oleaut32.lib uuid.lib commctrl.lib")
+ set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib ole32.lib oleaut32.lib
uuid.lib commctrl.lib")
set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}
/NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib")
- if (MSVC_VERSION LESS 1500)
+ if (MSVC_VERSION LESS 1600)
set(CMAKE_C_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}
corelibc.lib")
endif ()
else()
---
Summary of changes:
Modules/Platform/Windows-MSVC.cmake |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4283-g8ba55f6
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 8ba55f66ad4c31747d8ca9f084699a74fb43828f (commit)
via 200d3976ed23e309982a14651d5cf20a9c3d8c81 (commit)
via 475635ec0f3eeae9f6db0f9daa8a9c4cd8b3f989 (commit)
from b5fa10ffc7edabe103808def52ee0efe39fafa6b (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=8ba55f66ad4c31747d8ca9f084699a74fb43828f
commit 8ba55f66ad4c31747d8ca9f084699a74fb43828f
Merge: b5fa10f 200d397
Author: Patrick Gansterer
AuthorDate: Mon Sep 23 16:09:23 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 23 16:09:23 2013 -0400
Merge topic 'corelibc' into next
200d397 Add corelibc.lib to Windows CE CMAKE_C_STANDARD_LIBRARIES
475635e CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=200d3976ed23e309982a14651d5cf20a9c3d8c81
commit 200d3976ed23e309982a14651d5cf20a9c3d8c81
Author: Patrick Gansterer
AuthorDate: Mon Sep 23 19:38:13 2013 +0200
Commit: Patrick Gansterer
CommitDate: Mon Sep 23 19:38:13 2013 +0200
Add corelibc.lib to Windows CE CMAKE_C_STANDARD_LIBRARIES
The Windwos CE linker need the corelibc.lib library too to
link properly against the C Run-Time for Windwos CE (CRT).
diff --git a/Modules/Platform/Windows-MSVC.cmake
b/Modules/Platform/Windows-MSVC.cmake
index 8cb7fd5..ab11b1f 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -141,7 +141,7 @@ if(WINCE)
set(_RTC1 "")
set(_FLAGS_CXX " /GR /EHsc")
- set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib ole32.lib oleaut32.lib
uuid.lib commctrl.lib")
+ set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib corelibc.lib ole32.lib
oleaut32.lib uuid.lib commctrl.lib")
set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}
/NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib")
if (MSVC_VERSION LESS 1500)
---
Summary of changes:
Modules/Platform/Windows-MSVC.cmake |2 +-
Source/CMakeVersion.cmake |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4280-gb5fa10f
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 b5fa10ffc7edabe103808def52ee0efe39fafa6b (commit) via d4fd8fef47915c9bb1604b5b070f2ab15252c88e (commit) from 503b63ed9bb8edf3c357e65081b0ee3f2397900e (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=b5fa10ffc7edabe103808def52ee0efe39fafa6b commit b5fa10ffc7edabe103808def52ee0efe39fafa6b Merge: 503b63e d4fd8fe Author: Bill Hoffman AuthorDate: Mon Sep 23 12:47:11 2013 -0400 Commit: CMake Topic Stage CommitDate: Mon Sep 23 12:47:11 2013 -0400 Merge topic 'add_cache_options_to_ccmake' into next d4fd8fe Use size_type instead of unsigned int to avoid warndings. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4fd8fef47915c9bb1604b5b070f2ab15252c88e commit d4fd8fef47915c9bb1604b5b070f2ab15252c88e Author: Bill Hoffman AuthorDate: Mon Sep 23 12:46:24 2013 -0400 Commit: Bill Hoffman CommitDate: Mon Sep 23 12:46:24 2013 -0400 Use size_type instead of unsigned int to avoid warndings. diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h index be7d413..b52ac9d 100644 --- a/Source/CursesDialog/cmCursesOptionsWidget.h +++ b/Source/CursesDialog/cmCursesOptionsWidget.h @@ -33,7 +33,7 @@ protected: cmCursesOptionsWidget(const cmCursesOptionsWidget& from); void operator=(const cmCursesOptionsWidget&); std::vector Options; - unsigned int CurrentOption; + std::vector::size_type CurrentOption; }; #endif // __cmCursesOptionsWidget_h --- Summary of changes: Source/CursesDialog/cmCursesOptionsWidget.h |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
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4278-g503b63e
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 503b63ed9bb8edf3c357e65081b0ee3f2397900e (commit)
via 27d4a6a082a54904c344b1f2b29727053959289a (commit)
via e8014c6127b928d3596a85f550fbb0b6f8d34d04 (commit)
via b64a82121ff06b0a9dd9a9b464de8ae420efe9b2 (commit)
from adcf418e07466d89c6501d553ed9e4aeaccde2f7 (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=503b63ed9bb8edf3c357e65081b0ee3f2397900e
commit 503b63ed9bb8edf3c357e65081b0ee3f2397900e
Merge: adcf418 27d4a6a
Author: Daniele E. Domenichelli
AuthorDate: Mon Sep 23 10:04:29 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 23 10:04:29 2013 -0400
Merge topic 'FindGTK2-targets' into next
27d4a6a FindGTK2: pangocairo test should link to libm (for cos() method)
e8014c6 FindGTK2: Do not add tests if the relative targets do not exist
b64a821 FindGTK2: Refactor _GTK2_ADJUST_LIB_VARS into _GTK2_ADD_TARGET
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27d4a6a082a54904c344b1f2b29727053959289a
commit 27d4a6a082a54904c344b1f2b29727053959289a
Author: Daniele E. Domenichelli
AuthorDate: Mon Sep 23 15:37:29 2013 +0200
Commit: Daniele E. Domenichelli
CommitDate: Mon Sep 23 15:56:10 2013 +0200
FindGTK2: pangocairo test should link to libm (for cos() method)
diff --git a/Tests/FindGTK2/pangocairo/CMakeLists.txt
b/Tests/FindGTK2/pangocairo/CMakeLists.txt
index 68c85a4..9ac5ef0 100644
--- a/Tests/FindGTK2/pangocairo/CMakeLists.txt
+++ b/Tests/FindGTK2/pangocairo/CMakeLists.txt
@@ -7,4 +7,4 @@ find_package(GTK2 COMPONENTS gtk REQUIRED)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable(pangocairo WIN32 main.c)
-target_link_libraries(pangocairo GTK2::pangocairo)
+target_link_libraries(pangocairo GTK2::pangocairo m)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8014c6127b928d3596a85f550fbb0b6f8d34d04
commit e8014c6127b928d3596a85f550fbb0b6f8d34d04
Author: Daniele E. Domenichelli
AuthorDate: Mon Sep 23 15:36:21 2013 +0200
Commit: Daniele E. Domenichelli
CommitDate: Mon Sep 23 15:56:10 2013 +0200
FindGTK2: Do not add tests if the relative targets do not exist
diff --git a/Tests/FindGTK2/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
index 01f73e1..8d6b9e4 100644
--- a/Tests/FindGTK2/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -1,6 +1,36 @@
find_package(GTK2 COMPONENTS gtk glade gtkmm glademm QUIET)
-if(GTK2_GLIB_FOUND)
+
+# Test GTK2 components
+if(GTK2_GTK_FOUND)
+ add_test(GTK2Components.gtk ${CMAKE_CTEST_COMMAND}
+--build-and-test
+"${CMake_SOURCE_DIR}/Tests/FindGTK2/gtk"
+"${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
+ ${build_generator_args}
+--build-target gtk-all-libs
+--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
+--force-new-ctest-process
+--test-command ${CMAKE_CTEST_COMMAND} -V
+)
+endif()
+
+if(GTK2_GTKMM_FOUND)
+ add_test(GTK2Components.gtkmm ${CMAKE_CTEST_COMMAND}
+--build-and-test
+"${CMake_SOURCE_DIR}/Tests/FindGTK2/gtkmm"
+"${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
+ ${build_generator_args}
+--build-target gtkmm-all-libs
+--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
+--force-new-ctest-process
+--test-command ${CMAKE_CTEST_COMMAND} -V
+)
+endif()
+
+
+# Test GTK2 targets
+if(GTK2_GLIB_FOUND AND TARGET GTK2::glib)
add_test(GTK2Targets.glib ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/glib"
@@ -13,7 +43,7 @@ if(GTK2_GLIB_FOUND)
)
endif()
-if(GTK2_GOBJECT_FOUND)
+if(GTK2_GOBJECT_FOUND AND TARGET GTK2::gobject)
add_test(GTK2Targets.gobject ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gobject"
@@ -26,7 +56,7 @@ if(GTK2_GOBJECT_FOUND)
)
endif()
-if(GTK2_GIO_FOUND)
+if(GTK2_GIO_FOUND AND TARGET GTK2::gio)
add_test(GTK2Targets.gio ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gio"
@@ -39,7 +69,7 @@ if(GTK2_GIO_FOUND)
)
endif()
-if(GTK2_GMODULE_FOUND)
+if(GTK2_GMODULE_FOUND AND TARGET GTK2::gmodule)
add_test(GTK2Targets.gmodule ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gmodule"
@@ -52,7 +82,7 @@ if(GTK2_GMODULE_FOUND)
)
endif()
-if(GTK2_GTHREAD_FOUND)
+if(GTK2_GTHREAD_FOUND AND TARGET GTK2::gthread)
add_test(GTK2Targets.gthread ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gthread"
@@ -65,7 +95,7 @@ if(GTK2_GTHREAD_FOUND)
)
endif()
-if(GTK
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4274-gadcf418
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 adcf418e07466d89c6501d553ed9e4aeaccde2f7 (commit)
via 69aff17d384e1ebb9afb828ad8ad094d503b9dee (commit)
via fe5e1930206e6f704ec42f09e998c88f8ee9ef3b (commit)
via ee6b7a8a181fcbf27f432320dd9bdf6d35c46b4e (commit)
from 45bb6fa409c8165d4b0e3153203d87bab5152731 (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=adcf418e07466d89c6501d553ed9e4aeaccde2f7
commit adcf418e07466d89c6501d553ed9e4aeaccde2f7
Merge: 45bb6fa 69aff17
Author: Brad King
AuthorDate: Mon Sep 23 09:10:17 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 23 09:10:17 2013 -0400
Merge topic 'UseJava-jar-manifest' into next
69aff17 UseJava: Add support for the jar 'm' (Manifest) option
fe5e193 CMake Nightly Date Stamp
ee6b7a8 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69aff17d384e1ebb9afb828ad8ad094d503b9dee
commit 69aff17d384e1ebb9afb828ad8ad094d503b9dee
Author: Simon Levermann
AuthorDate: Mon Sep 23 02:57:14 2013 +0200
Commit: Simon Levermann
CommitDate: Mon Sep 23 14:54:33 2013 +0200
UseJava: Add support for the jar 'm' (Manifest) option
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index c0fd07c..c9635b5 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -49,6 +49,11 @@
#
# add_jar(example ENTRY_POINT com/examples/MyProject/Main)
#
+# To define a custom manifest for the jar, you can set it with the manifest
+# named argument:
+#
+# add_jar(example MANIFEST /path/to/manifest)
+#
# To add a VERSION to the target output name you can set it using
# the VERSION named argument to add_jar. This will create a jar file with the
# name shibboleet-1.0.0.jar and will create a symlink shibboleet.jar
@@ -246,7 +251,7 @@ function(add_jar _TARGET_NAME)
cmake_parse_arguments(_add_jar
""
- "VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT"
+ "VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT;MANIFEST"
"SOURCES;INCLUDE_JARS"
${ARGN}
)
@@ -262,6 +267,11 @@ function(add_jar _TARGET_NAME)
set(_ENTRY_POINT_VALUE ${_add_jar_ENTRY_POINT})
endif ()
+if (_add_jar_MANIFEST)
+set(_MANIFEST_OPTION m)
+set(_MANIFEST_VALUE ${_add_jar_MANIFEST})
+endif ()
+
if (LIBRARY_OUTPUT_PATH)
set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH})
else ()
@@ -405,7 +415,7 @@ function(add_jar _TARGET_NAME)
add_custom_command(
OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
COMMAND ${Java_JAR_EXECUTABLE}
--cf${_ENTRY_POINT_OPTION} ${_JAVA_JAR_OUTPUT_PATH}
${_ENTRY_POINT_VALUE}
+-cf${_ENTRY_POINT_OPTION}${_MANIFEST_OPTION}
${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE} ${_MANIFEST_VALUE}
${_JAVA_RESOURCE_FILES} @java_class_filelist
COMMAND ${CMAKE_COMMAND}
-D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR}
@@ -425,7 +435,7 @@ function(add_jar _TARGET_NAME)
add_custom_command(
OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
COMMAND ${Java_JAR_EXECUTABLE}
--cf${_ENTRY_POINT_OPTION} ${_JAVA_JAR_OUTPUT_PATH}
${_ENTRY_POINT_VALUE}
+-cf${_ENTRY_POINT_OPTION}${_MANIFEST_OPTION}
${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE} ${_MANIFEST_VALUE}
${_JAVA_RESOURCE_FILES} @java_class_filelist
COMMAND ${CMAKE_COMMAND}
-D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR}
---
Summary of changes:
Modules/UseJava.cmake | 16 +---
Source/CMakeVersion.cmake |2 +-
2 files changed, 14 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
