[Cmake-commits] CMake branch, master, updated. v2.8.11.2-755-g4bc8b7a
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 4bc8b7abab976530d9675cff13ef1dc7c2139d00 (commit) from 93eec2ecd1fab2b21e506397880d882b884cbea3 (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=4bc8b7abab976530d9675cff13ef1dc7c2139d00 commit 4bc8b7abab976530d9675cff13ef1dc7c2139d00 Author: Kitware Robot AuthorDate: Sat Aug 10 00:01:09 2013 -0400 Commit: Kitware Robot CommitDate: Sat Aug 10 00:01:09 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e9a4dd0..43ca5c4 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 20130809) +set(CMake_VERSION_TWEAK 20130810) #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-3833-gc32a4f4
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 c32a4f4658a3dfbe8afc5e5fa50064a33058cc80 (commit)
via 796c618cccf9bc1887ff3ca297d3f69fce0fcb75 (commit)
from d05a8d19e5cb3983cc215eb6b375f929b8716b13 (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=c32a4f4658a3dfbe8afc5e5fa50064a33058cc80
commit c32a4f4658a3dfbe8afc5e5fa50064a33058cc80
Merge: d05a8d1 796c618
Author: Rolf Eike Beer
AuthorDate: Fri Aug 9 14:35:15 2013 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 9 14:35:15 2013 -0400
Merge topic 'no-duplicate-find-tests' into next
796c618 blacklist tests with their own test in Tests/Module from
AllFindModules test
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=796c618cccf9bc1887ff3ca297d3f69fce0fcb75
commit 796c618cccf9bc1887ff3ca297d3f69fce0fcb75
Author: Rolf Eike Beer
AuthorDate: Fri Aug 9 20:34:29 2013 +0200
Commit: Rolf Eike Beer
CommitDate: Fri Aug 9 20:34:29 2013 +0200
blacklist tests with their own test in Tests/Module from AllFindModules test
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 739593c..691728a 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -22,11 +22,18 @@ endmacro()
set(DESIRED_QT_VERSION 4)
set(NO_QT4_MODULES "Qt3" "KDE3")
+# ignore everything that has it's own test in Tests/Module/
+file(GLOB OWN_TEST_MODULES RELATIVE
"${CMAKE_CURRENT_SOURCE_DIR}/../../Module/"
"${CMAKE_CURRENT_SOURCE_DIR}/../../Module/Find*")
+foreach(FIND_MODULE IN LISTS OWN_TEST_MODULES)
+string(REGEX REPLACE "^Find" "" _MOD_NAME "${FIND_MODULE}")
+list(APPEND NO_FIND_MODULES "${_MOD_NAME}")
+endforeach()
+
# These modules are named Find*.cmake, but are nothing that works in
# find_package().
-set(NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage")
+list(APPEND NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage")
-foreach(FIND_MODULE ${FIND_MODULES})
+foreach(FIND_MODULE IN LISTS FIND_MODULES)
string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME
"${FIND_MODULE}")
list(FIND NO_QT4_MODULES ${MODULE_NAME} NO_QT4_INDEX)
---
Summary of changes:
Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 11 +--
1 files changed, 9 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-3831-gd05a8d1
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 d05a8d19e5cb3983cc215eb6b375f929b8716b13 (commit)
via d0bfc5b46eaf5afdc31c757012a4eb3b82a0a962 (commit)
from caec09261ace95094b47ffbf775984d58fd6837b (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=d05a8d19e5cb3983cc215eb6b375f929b8716b13
commit d05a8d19e5cb3983cc215eb6b375f929b8716b13
Merge: caec092 d0bfc5b
Author: Rolf Eike Beer
AuthorDate: Fri Aug 9 14:33:21 2013 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 9 14:33:21 2013 -0400
Merge topic 'cxx11' into next
d0bfc5b CXXFeatures: blacklist Borland and Watcom for C++11 compiler flag
detection
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0bfc5b46eaf5afdc31c757012a4eb3b82a0a962
commit d0bfc5b46eaf5afdc31c757012a4eb3b82a0a962
Author: Rolf Eike Beer
AuthorDate: Fri Aug 9 20:27:53 2013 +0200
Commit: Rolf Eike Beer
CommitDate: Fri Aug 9 20:29:07 2013 +0200
CXXFeatures: blacklist Borland and Watcom for C++11 compiler flag detection
These compilers do not have a C++11 flag, but check_cxx_compiler_flag()
can't detect because they either will not always complain (Borland) or will
hang (Watcom).
diff --git a/Modules/FindCXXFeatures.cmake b/Modules/FindCXXFeatures.cmake
index 6b35291..558 100644
--- a/Modules/FindCXXFeatures.cmake
+++ b/Modules/FindCXXFeatures.cmake
@@ -50,6 +50,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "XL")
if (_HAS_CXX0X_FLAG)
set(CXX11_COMPILER_FLAGS "-qlanglvl=extended0x")
endif ()
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "(Borland|Watcom)")
+# No C++11 flag for those compilers, but check_cxx_compiler_flag()
+# can't detect because they either will not always complain (Borland)
+# or will hang (Watcom).
else ()
check_cxx_compiler_flag("-std=c++11" _HAS_CXX11_FLAG)
if (_HAS_CXX11_FLAG)
---
Summary of changes:
Modules/FindCXXFeatures.cmake |4
1 files changed, 4 insertions(+), 0 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-3829-gcaec092
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 caec09261ace95094b47ffbf775984d58fd6837b (commit)
via d3466549b9e4d34784a640719dee88829feacc43 (commit)
via 44e7ca4a82336d41d45ba39d553d1b767901b581 (commit)
via a59c96d21880bad01a9fbd926e6d52e36c28ce76 (commit)
via 7316bc897124c8c77eb4f0a24966dae83993a8ca (commit)
from fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62 (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=caec09261ace95094b47ffbf775984d58fd6837b
commit caec09261ace95094b47ffbf775984d58fd6837b
Merge: fdc4d43 d346654
Author: Daniele E. Domenichelli
AuthorDate: Fri Aug 9 10:58:41 2013 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 9 10:58:41 2013 -0400
Merge topic 'FindGTK2-targets' into next
d346654 FindGTK2: Add unit tests for all targets in gtk and gtkmm modules
44e7ca4 FindGTK2: Add check to ensure that target exists
a59c96d FindGTK2: Fix gmodule, glibmm, pangoft2, and pangoxft targets
7316bc8 FindGTK2: Link freetype libs to targets including freetype includes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3466549b9e4d34784a640719dee88829feacc43
commit d3466549b9e4d34784a640719dee88829feacc43
Author: Daniele E. Domenichelli
AuthorDate: Fri Aug 9 16:39:26 2013 +0200
Commit: Daniele E. Domenichelli
CommitDate: Fri Aug 9 16:53:22 2013 +0200
FindGTK2: Add unit tests for all targets in gtk and gtkmm modules
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d6d328b..993a826 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1069,34 +1069,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
endif()
endif()
- if(NOT GTK2_FOUND)
-find_package(GTK2 COMPONENTS gtk glade gtkmm glademm QUIET)
- endif()
-
- if(GTK2_GTK_FOUND)
- add_test(GTK2Gtk ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Gtk"
- "${CMake_BINARY_DIR}/Tests/GTK2Gtk"
- ${build_generator_args}
- --build-project GTK2Gtk
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Gtk"
- --force-new-ctest-process
- --test-command ${CMAKE_CTEST_COMMAND} -V
- )
- endif()
-
- if(GTK2_GTKMM_FOUND)
- add_test(GTK2GtkMM ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2GtkMM"
- "${CMake_BINARY_DIR}/Tests/GTK2GtkMM"
-${build_generator_args}
- --build-project GTK2GtkMM
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2GtkMM"
- --force-new-ctest-process
- --test-command ${CMAKE_CTEST_COMMAND} -V
- )
+ find_package(GTK2 QUIET)
+ if(GTK2_FOUND)
+add_subdirectory(GTK2Targets)
endif()
add_test(ExternalProject ${CMAKE_CTEST_COMMAND}
diff --git a/Tests/GTK2GtkMM/CMakeLists.txt b/Tests/GTK2GtkMM/CMakeLists.txt
deleted file mode 100644
index 017f884..000
--- a/Tests/GTK2GtkMM/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(GTK2GtkMM)
-
-find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-add_executable(GTK2GtkMM WIN32 main.cpp helloworld.cpp helloworld.h)
-target_link_libraries(GTK2GtkMM GTK2::gtkmm)
diff --git a/Tests/GTK2Targets/CMakeLists.txt b/Tests/GTK2Targets/CMakeLists.txt
new file mode 100644
index 000..ada25ec
--- /dev/null
+++ b/Tests/GTK2Targets/CMakeLists.txt
@@ -0,0 +1,287 @@
+find_package(GTK2 COMPONENTS gtk glade gtkmm glademm QUIET)
+
+if(GTK2_GLIB_FOUND)
+ add_test(GTK2Targets.glib ${CMAKE_CTEST_COMMAND}
+--build-and-test
+"${CMake_SOURCE_DIR}/Tests/GTK2Targets/glib"
+"${CMake_BINARY_DIR}/Tests/GTK2Targets/glib"
+${build_generator_args}
+--build-project glib
+--build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/glib"
+--force-new-ctest-process
+--test-command ${CMAKE_CTEST_COMMAND} -V
+)
+endif()
+
+if(GTK2_GOBJECT_FOUND)
+ add_test(GTK2Targets.gobject ${CMAKE_CTEST_COMMAND}
+--build-and-test
+"${CMake_SOURCE_DIR}/Tests/GTK2Targets/gobject"
+"${CMake_BINARY_DIR}/Tests/GTK2Targets/gobject"
+${build_generator_args}
+--build-project gobject
+--build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gobject"
+--force-new-ctest-process
+--test-command ${CMAKE_CTEST_COMMAND} -V
+)
+endif()
+
+if(GTK2_GIO_FOUND)
+ add_test(GTK2Targets.gio ${CMAKE_CTEST_COMMAND}
+--build-and-test
+"${CMake_SOURCE_DIR}/Tests/GTK2Targets/gio"
+"${CMake_BINARY_DIR}/Tests/GTK2Targets/gio"
+${build_generator_args}
+--build-project gio
+--build-exe-dir "${
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3824-gfdc4d43
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 fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62 (commit)
via 1e18051f687836052479b70f28c520a5e0626dd7 (commit)
via 87d1044a9ddda419b9779c54ab112d66b736 (commit)
via 53265aa79904ec0b753776fe86656a1117cce74a (commit)
from ffc7a0bb79fdf71c89bc6f10089406abda259379 (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=fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62
commit fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62
Merge: ffc7a0b 1e18051
Author: Daniele E. Domenichelli
AuthorDate: Fri Aug 9 10:56:30 2013 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 9 10:56:30 2013 -0400
Merge topic 'FindGTK2-quiet' into next
1e18051 FindGTK2: Search for modules quietly when needed
87d FindGTK2: Find freetype quietly
53265aa FindGTK2: Mark GTK_*_INCLUDE_DIR as advanced
diff --cc Modules/FindGTK2.cmake
index d5b0f35,8ad0b51..05b13fd
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@@ -241,9 -240,10 +241,10 @@@ function(_GTK2_FIND_INCLUDE_DIR _var _h
PATH_SUFFIXES
${_suffixes}
)
+ mark_as_advanced(GTK2_${_var}_INCLUDE_DIR)
-if(${_var}_INCLUDE_DIR)
-set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}_INCLUDE_DIR}
PARENT_SCOPE)
+if(GTK2_${_var}_INCLUDE_DIR)
+set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS}
${GTK2_${_var}_INCLUDE_DIR} PARENT_SCOPE)
endif()
endfunction()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e18051f687836052479b70f28c520a5e0626dd7
commit 1e18051f687836052479b70f28c520a5e0626dd7
Author: Daniele E. Domenichelli
AuthorDate: Fri Aug 9 15:37:52 2013 +0200
Commit: Daniele E. Domenichelli
CommitDate: Fri Aug 9 16:55:08 2013 +0200
FindGTK2: Search for modules quietly when needed
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 6147361..8ad0b51 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -587,6 +587,8 @@
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
string(TOUPPER ${_GTK2_component} _COMPONENT_UPPER)
+set(GTK2_${_COMPONENT_UPPER}_FIND_QUIETLY GTK2_FIND_QUIETLY)
+
if(_GTK2_component STREQUAL "gtk")
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or
all of the gtk libraries were not found."
GTK2_GTK_LIBRARY
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87d1044a9ddda419b9779c54ab112d66b736
commit 87d1044a9ddda419b9779c54ab112d66b736
Author: Daniele E. Domenichelli
AuthorDate: Fri Aug 9 10:55:48 2013 +0200
Commit: Daniele E. Domenichelli
CommitDate: Fri Aug 9 16:55:08 2013 +0200
FindGTK2: Find freetype quietly
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index b604657..6147361 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -450,7 +450,7 @@ endif()
# Find all components
#
-find_package(Freetype)
+find_package(Freetype QUIET)
list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
list(APPEND GTK2_LIBRARIES ${FREETYPE_LIBRARIES})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53265aa79904ec0b753776fe86656a1117cce74a
commit 53265aa79904ec0b753776fe86656a1117cce74a
Author: Daniele E. Domenichelli
AuthorDate: Fri Aug 9 11:07:07 2013 +0200
Commit: Daniele E. Domenichelli
CommitDate: Fri Aug 9 16:55:08 2013 +0200
FindGTK2: Mark GTK_*_INCLUDE_DIR as advanced
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 77aac6d..b604657 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -240,6 +240,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
PATH_SUFFIXES
${_suffixes}
)
+mark_as_advanced(GTK2_${_var}_INCLUDE_DIR)
if(${_var}_INCLUDE_DIR)
set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}_INCLUDE_DIR}
PARENT_SCOPE)
---
Summary of changes:
Modules/FindGTK2.cmake |5 -
1 files changed, 4 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-3820-gffc7a0b
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 ffc7a0bb79fdf71c89bc6f10089406abda259379 (commit) via 93eec2ecd1fab2b21e506397880d882b884cbea3 (commit) from 205a5daeaa29f232d9adb6e87a55315483bae653 (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=ffc7a0bb79fdf71c89bc6f10089406abda259379 commit ffc7a0bb79fdf71c89bc6f10089406abda259379 Merge: 205a5da 93eec2e Author: Brad King AuthorDate: Fri Aug 9 10:51:56 2013 -0400 Commit: Brad King CommitDate: Fri Aug 9 10:51:56 2013 -0400 Merge branch 'master' into next --- 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, master, updated. v2.8.11.2-754-g93eec2e
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 93eec2ecd1fab2b21e506397880d882b884cbea3 (commit) via b33c9844fa2c3a6fc7e69688d028bb260582561c (commit) from 702f630db8c7e2225b3be9550a4619a47feba1f6 (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=93eec2ecd1fab2b21e506397880d882b884cbea3 commit 93eec2ecd1fab2b21e506397880d882b884cbea3 Merge: 702f630 b33c984 Author: Brad King AuthorDate: Fri Aug 9 10:52:08 2013 -0400 Commit: CMake Topic Stage CommitDate: Fri Aug 9 10:52:08 2013 -0400 Merge topic 'revert-COMPILER_TARGET-feature' b33c984 Revert "Add compiler target compile options." --- Summary of changes: Modules/CMakeDetermineCompilerABI.cmake |3 --- Modules/Compiler/Clang.cmake|1 - Modules/Platform/QNX.cmake |3 --- Source/cmLocalGenerator.cxx | 14 -- 4 files changed, 0 insertions(+), 21 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-3818-g205a5da
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 205a5daeaa29f232d9adb6e87a55315483bae653 (commit)
via b33c9844fa2c3a6fc7e69688d028bb260582561c (commit)
via 702f630db8c7e2225b3be9550a4619a47feba1f6 (commit)
from a9d330e09a9f17fcac63ed0af3ac14b2fbf2d453 (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=205a5daeaa29f232d9adb6e87a55315483bae653
commit 205a5daeaa29f232d9adb6e87a55315483bae653
Merge: a9d330e b33c984
Author: Stephen Kelly
AuthorDate: Fri Aug 9 08:29:31 2013 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 9 08:29:31 2013 -0400
Merge topic 'revert-COMPILER_TARGET-feature' into next
b33c984 Revert "Add compiler target compile options."
702f630 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b33c9844fa2c3a6fc7e69688d028bb260582561c
commit b33c9844fa2c3a6fc7e69688d028bb260582561c
Author: Stephen Kelly
AuthorDate: Fri Aug 9 14:28:43 2013 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 9 14:28:43 2013 +0200
Revert "Add compiler target compile options."
This reverts commit 2d9ec1dadfdd10043a98d425abb25d0aef117699.
diff --git a/Modules/CMakeDetermineCompilerABI.cmake
b/Modules/CMakeDetermineCompilerABI.cmake
index e9ae995..5d35ce3 100644
--- a/Modules/CMakeDetermineCompilerABI.cmake
+++ b/Modules/CMakeDetermineCompilerABI.cmake
@@ -28,9 +28,6 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
if(DEFINED CMAKE_${lang}_VERBOSE_FLAG)
set(CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG}")
endif()
-if(CMAKE_${lang}_COMPILER_TARGET)
- set(CMAKE_FLAGS "${CMAKE_FLAGS}
-DCMAKE_${lang}_COMPILER_TARGET=${CMAKE_${lang}_COMPILER_TARGET}")
-endif()
try_compile(CMAKE_${lang}_ABI_COMPILED
${CMAKE_BINARY_DIR} ${src}
CMAKE_FLAGS "${CMAKE_FLAGS}"
diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake
index 66b00bd..ec4562a 100644
--- a/Modules/Compiler/Clang.cmake
+++ b/Modules/Compiler/Clang.cmake
@@ -25,5 +25,4 @@ macro(__compiler_clang lang)
set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
- set(CMAKE_${lang}_COMPILE_OPTION_TARGET "-target ")
endmacro()
diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake
index 315f721..2598411 100644
--- a/Modules/Platform/QNX.cmake
+++ b/Modules/Platform/QNX.cmake
@@ -13,9 +13,6 @@ set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-#
http://www.qnx.com/developers/docs/6.4.0/neutrino/utilities/q/qcc.html#examples
-set(CMAKE_C_COMPILE_OPTION_TARGET "-V")
-set(CMAKE_CXX_COMPILE_OPTION_TARGET "-V")
# Shared libraries with no builtin soname may not be linked safely by
# specifying the file path.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b515727..9c04109 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1038,20 +1038,11 @@ cmLocalGenerator::ExpandRuleVariable(std::string const&
variable,
// If this is the compiler then look for the extra variable
// _COMPILER_ARG1 which must be the first argument to the compiler
const char* compilerArg1 = 0;
- const char* compilerTarget = 0;
- const char* compilerOptionTarget = 0;
if(actualReplace == "CMAKE_${LANG}_COMPILER")
{
std::string arg1 = actualReplace + "_ARG1";
cmSystemTools::ReplaceString(arg1, "${LANG}", lang);
compilerArg1 = this->Makefile->GetDefinition(arg1.c_str());
-compilerTarget
- = this->Makefile->GetDefinition(
-(std::string("CMAKE_") + lang + "_COMPILER_TARGET").c_str());
-compilerOptionTarget
- = this->Makefile->GetDefinition(
-(std::string("CMAKE_") + lang +
- "_COMPILE_OPTION_TARGET").c_str());
}
if(actualReplace.find("${LANG}") != actualReplace.npos)
{
@@ -1072,11 +1063,6 @@ cmLocalGenerator::ExpandRuleVariable(std::string const&
variable,
ret += " ";
ret += compilerArg1;
}
- if (compilerTarget && compilerOptionTarget)
-{
-ret += compilerOptionTarget;
-ret += compilerTarget;
-}
return ret;
}
return replace;
-
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3815-ga9d330e
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 a9d330e09a9f17fcac63ed0af3ac14b2fbf2d453 (commit)
via 3bca16bfa1c5784c81b2c07c1910cd9a88519424 (commit)
from 25b877751e27d13a59534580cd934eb5263f9617 (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=a9d330e09a9f17fcac63ed0af3ac14b2fbf2d453
commit a9d330e09a9f17fcac63ed0af3ac14b2fbf2d453
Merge: 25b8777 3bca16b
Author: Stephen Kelly
AuthorDate: Fri Aug 9 08:27:59 2013 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 9 08:27:59 2013 -0400
Merge topic 'fix-COMPILER_TARGET-with-arg1' into next
3bca16b Revert "Fix CMAKE__COMPILER_TARGET with
CMAKE__COMPILER_ARG1"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bca16bfa1c5784c81b2c07c1910cd9a88519424
commit 3bca16bfa1c5784c81b2c07c1910cd9a88519424
Author: Stephen Kelly
AuthorDate: Fri Aug 9 14:27:24 2013 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 9 14:27:24 2013 +0200
Revert "Fix CMAKE__COMPILER_TARGET with CMAKE__COMPILER_ARG1"
This reverts commit dbfdf2fb06445fcc3caf7b3b5fe8d877cdcd4034.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 5b69724..b515727 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1074,7 +1074,6 @@ cmLocalGenerator::ExpandRuleVariable(std::string const&
variable,
}
if (compilerTarget && compilerOptionTarget)
{
-ret += " ";
ret += compilerOptionTarget;
ret += compilerTarget;
}
---
Summary of changes:
Source/cmLocalGenerator.cxx |1 -
1 files changed, 0 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
