Re: [CMake] Wrap CACHE variables
Have you considered having a superbuild and using ExternalProject_Add to build the dependencies? http://www.cmake.org/cmake/help/v3.1/module/ExternalProject.html Excellent examples of using ExternalProject for a superbuild live in the OpenChemistry and Slicer projects. https://github.com/OpenChemistry/openchemistry https://github.com/Slicer/Slicer HTH, David C. On Sat, Jan 10, 2015 at 2:46 AM, Dario Oliveri oliveridari...@gmail.com wrote: How can I wrap cache variables from CMake scripts? Let's say I have a CMake project, it depends on any third part library (says SFML or SDL), that project expose a plenty of CACHE variables so that configuring them for each build manually is a pain. How can I configure from MY project THOSE variables so that the final user/builder does not have to setup that garbage stuff? (say my project has only 3 cache variables build_win32, build_max, build_linux, I know how to setup corresponding flags in dependencies, so why I can't do that via script? having several dependencies could lead to hundreds of Cache variables, configuring a cross platform build becomes unmaintainable and error prone, also not every user would be able to do that because require knowing details about dependencies) The assumption is that a project will not use pre-built binaries for dependencies but will instead include and in-build them (this has plenty advantages, including ability to re-run unit tests also for dependencies, catch misconfigurations in build system early, ability to really support every compiler without having to redownload stuff or compile it manually, this is the true power of CMAKE, just missing 1 detail to go): add_subdirectory(FOLDER_TO_SDL folder_to_my_bin_dir/SDL) -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, master, updated. v3.1.0-636-gbc04555
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 bc04b54734fa20a69d87d64ae9152639654d (commit) via 72a0d6df6dfa7c81a5a81c6f5b85b964815ffbc1 (commit) from 427d9324983ddd02d5afff780c6b23ab5081c8df (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=bc04b54734fa20a69d87d64ae9152639654d commit bc04b54734fa20a69d87d64ae9152639654d Merge: 427d932 72a0d6d Author: Brad King brad.k...@kitware.com AuthorDate: Sat Jan 10 12:14:59 2015 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Sat Jan 10 12:14:59 2015 -0500 Merge topic 'doc-CXX_STANDARD-14' 72a0d6df Help: Document valid 14 value for CXX_STANDARD. (#15339) --- Summary of changes: Help/prop_tgt/CXX_STANDARD.rst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-634-g427d932
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 427d9324983ddd02d5afff780c6b23ab5081c8df (commit) via 7a2c3f0c0ec5b542c89456826adeb56c3cbd7df0 (commit) from ccd004666750248ba0fc5193ebefd45f93c12693 (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=427d9324983ddd02d5afff780c6b23ab5081c8df commit 427d9324983ddd02d5afff780c6b23ab5081c8df Merge: ccd0046 7a2c3f0 Author: Brad King brad.k...@kitware.com AuthorDate: Sat Jan 10 12:14:56 2015 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Sat Jan 10 12:14:56 2015 -0500 Merge topic 'doc-if-variable-not-defined' 7a2c3f0c Help: Clarify if(variable) documentation (#15335) --- Summary of changes: Help/command/if.rst |9 + 1 file changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1641-g5b47c32
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 5b47c32a9d7a67fadd904a4f41c4838eb79a04c2 (commit) via bc04b54734fa20a69d87d64ae9152639654d (commit) via 427d9324983ddd02d5afff780c6b23ab5081c8df (commit) via ccd004666750248ba0fc5193ebefd45f93c12693 (commit) from 7276bd8fc3bf055c27e34751c3df052a3ba42a8e (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=5b47c32a9d7a67fadd904a4f41c4838eb79a04c2 commit 5b47c32a9d7a67fadd904a4f41c4838eb79a04c2 Merge: 7276bd8 bc04555 Author: Brad King brad.k...@kitware.com AuthorDate: Sat Jan 10 12:15:12 2015 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Sat Jan 10 12:15:12 2015 -0500 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1637-g7276bd8
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 7276bd8fc3bf055c27e34751c3df052a3ba42a8e (commit)
via e5b914209742a70c72c6cf8a8e6e1e005d8830f2 (commit)
via 54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3 (commit)
from d388bda78fb01e6a8cebad0464cd7b9eefd91eef (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=7276bd8fc3bf055c27e34751c3df052a3ba42a8e
commit 7276bd8fc3bf055c27e34751c3df052a3ba42a8e
Merge: d388bda e5b9142
Author: Brad King brad.k...@kitware.com
AuthorDate: Sat Jan 10 12:09:27 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 10 12:09:27 2015 -0500
Merge topic 'update-kwsys' into next
e5b91420 Merge branch 'upstream-kwsys' into update-kwsys
54d83cae KWSys 2015-01-09 (425fa73e)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5b914209742a70c72c6cf8a8e6e1e005d8830f2
commit e5b914209742a70c72c6cf8a8e6e1e005d8830f2
Merge: 4aa9c64 54d83ca
Author: Brad King brad.k...@kitware.com
AuthorDate: Sat Jan 10 12:09:04 2015 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Sat Jan 10 12:09:04 2015 -0500
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3
commit 54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Fri Jan 9 15:37:34 2015 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Sat Jan 10 12:09:01 2015 -0500
KWSys 2015-01-09 (425fa73e)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 425fa73e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 5a15cb3b..425fa73e
Ben Boeckel (1):
425fa73e Add missing malloc return value casts
Simon Gomizelj (1):
2f0165f1 Terminal: Add xterm-termite to VT100 color support whitelist
Stephen Kelly (3):
e4fe1d1a SystemTools: Refactor selection of Windows directory APIs
af86ac7d SystemTools: Fix build with SunCC/stlport.
d30c9b03 Workaround SolarisStudio bug with libstdc++.
Change-Id: Ib8fbe15d1ee072ac8d8506d92c8883056b224a89
diff --git a/EncodingC.c b/EncodingC.c
index cda78e2..ba2cec2 100644
--- a/EncodingC.c
+++ b/EncodingC.c
@@ -44,7 +44,7 @@ wchar_t* kwsysEncoding_DupToWide(const char* str)
size_t length = kwsysEncoding_mbstowcs(NULL, str, 0) + 1;
if(length 0)
{
-ret = malloc((length)*sizeof(wchar_t));
+ret = (wchar_t*)malloc((length)*sizeof(wchar_t));
ret[0] = 0;
kwsysEncoding_mbstowcs(ret, str, length);
}
@@ -71,7 +71,7 @@ char* kwsysEncoding_DupToNarrow(const wchar_t* str)
size_t length = kwsysEncoding_wcstombs(0, str, 0) + 1;
if(length 0)
{
-ret = malloc(length);
+ret = (char*)malloc(length);
ret[0] = 0;
kwsysEncoding_wcstombs(ret, str, length);
}
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index ca9d424..1be6d02 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -547,7 +547,7 @@ int kwsysProcess_SetPipeFile(kwsysProcess* cp, int prPipe,
const char* file)
}
if(file)
{
-*pfile = malloc(strlen(file)+1);
+*pfile = (char*)malloc(strlen(file)+1);
if(!*pfile)
{
return 0;
@@ -1468,7 +1468,7 @@ static int kwsysProcessInitialize(kwsysProcess* cp)
cp-RealWorkingDirectoryLength = 4096;
#endif
cp-RealWorkingDirectory =
- malloc((size_t)(cp-RealWorkingDirectoryLength));
+ (char*)malloc((size_t)(cp-RealWorkingDirectoryLength));
if(!cp-RealWorkingDirectory)
{
return 0;
diff --git a/SystemTools.cxx b/SystemTools.cxx
index e4c82d8..c2b6097 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -16,6 +16,14 @@
# define _XOPEN_SOURCE_EXTENDED
#endif
+#if defined(_WIN32) (defined(_MSC_VER) || defined(__WATCOMC__) ||
defined(__BORLANDC__) || defined(__MINGW32__))
+# define KWSYS_WINDOWS_DIRS
+#else
+# if defined(__SUNPRO_CC)
+#include fcntl.h
+# endif
+#endif
+
#include kwsysPrivate.h
#include KWSYS_HEADER(RegularExpression.hxx)
#include KWSYS_HEADER(SystemTools.hxx)
@@ -205,8 +213,7 @@ static time_t windows_filetime_to_posix_time(const
FILETIME ft)
}
#endif
-#if defined(_WIN32) (defined(_MSC_VER) || defined(__WATCOMC__) ||
defined(__BORLANDC__) || defined(__MINGW32__))
-
+#ifdef KWSYS_WINDOWS_DIRS
#include wctype.h
inline int Mkdir(const kwsys_stl::string dir)
diff --git a/Terminal.c b/Terminal.c
index e13003f..d13f79a 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -175,6 +175,7 @@ static const char*
[CMake] NSIS startup menu and icons
I have created an NSIS section for my CMakeLists.txt and I am trying to
pack and install my application (mrViewer).
The package builds correctly and runs just fine, but the mrViewer icon
is missing in desktop and in the menu entry and the startup menu has a
mrViewer entry that leads nowhere instead of running my program.
I am sure it is a path issue somewhere but I don't know how to debug it,
so I am asking for help here.
I have the following:
add_executable( mrViewer WIN32 ${SOURCES} )
target_link_libraries( mrViewer ${LIBRARIES} )
install( TARGETS mrViewer
RUNTIME DESTINATION ${mrViewerPackageName}/bin
LIBRARY DESTINATION ${mrViewerPackageName}/lib )
set(CPACK_NSIS_MUI_ICON
${PROJECT_SOURCE_DIR}/mrViewer/src/icons/viewer.ico)
set(CPACK_NSIS_MUI_UNICON
${PROJECT_SOURCE_DIR}/mrViewer/src/icons/viewer.ico)
if (CMAKE_BUILD_ARCH EQUAL 32)
set(CPACK_NSIS_INSTALL_ROOT $PROGRAMFILES)
elseif (CMAKE_BUILD_ARCH EQUAL 64)
set(CPACK_NSIS_INSTALL_ROOT $PROGRAMFILES64)
endif (CMAKE_BUILD_ARCH EQUAL 32)
SET( CPACK_NSIS_MODIFY_PATH ON )
SET( CPACK_CREATE_DESKTOP_LINKS ON )
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${mrViewerPackageName})
set(CPACK_PACKAGE_VERSION_MAJOR ${mrViewerVersionMajor})
set(CPACK_PACKAGE_VERSION_MINOR ${mrViewerVersionMinor})
set(CPACK_PACKAGE_VERSION_PATCH ${mrViewerVersionPatch})
set(CPACK_PACKAGE_CONTACT http://mrviewer.sourceforge.net)
# set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.txt)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
mrViewer provides professional flipbook, audio and video playback.)
set(CPACK_PACKAGE_EXECUTABLES mrViewer mrViewer )
set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${mrViewerPackageName} )
set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE.txt)
set(CPACK_PACKAGE_FILE_NAME ${mrViewerPackageName})
set(CPACK_NSIS_INSTALLED_ICON_NAME binmrViewer.exe)
And find attached the resulting project.nsi file.
; CPack install script designed for a nmake build
;
; You must define these values
!define VERSION 0.1.1
!define PATCH 1
!define INST_DIR
F:/code/applications/mrViewer/BUILD/Windows-6.1-64/Release/tmp/_CPack_Packages/win64/NSIS/mrViewer-2.6.7-Windows-64
;
;Variables
Var MUI_TEMP
Var STARTMENU_FOLDER
Var SV_ALLUSERS
Var START_MENU
Var DO_NOT_ADD_TO_PATH
Var ADD_TO_PATH_ALL_USERS
Var ADD_TO_PATH_CURRENT_USER
Var INSTALL_DESKTOP
Var IS_DEFAULT_INSTALLDIR
;
;Include Modern UI
!include MUI.nsh
;Default installation folder
InstallDir $PROGRAMFILES64\mrViewer-2.6.7-Windows-64
;
;General
;Name and file
Name mrViewer-2.6.7-Windows-64
OutFile
F:/code/applications/mrViewer/BUILD/Windows-6.1-64/Release/tmp/_CPack_Packages/win64/NSIS/mrViewer-2.6.7-Windows-64.exe
;Set compression
SetCompressor lzma
;Require administrator access
RequestExecutionLevel admin
!include Sections.nsh
;--- Component support macros: ---
; The code for the add/remove functionality is from:
; http://nsis.sourceforge.net/Add/Remove_Functionality
; It has been modified slightly and extended to provide
; inter-component dependencies.
Var AR_SecFlags
Var AR_RegFlags
; Loads the selected flag for the section named SecName into the
; variable VarName.
!macro LoadSectionSelectedIntoVar SecName VarName
SectionGetFlags ${${SecName}} $${VarName}
IntOp $${VarName} $${VarName} ${SF_SELECTED} ;Turn off all other bits
!macroend
; Loads the value of a variable... can we get around this?
!macro LoadVar VarName
IntOp $R0 0 + $${VarName}
!macroend
; Sets the value of a variable
!macro StoreVar VarName IntValue
IntOp $${VarName} 0 + ${IntValue}
!macroend
!macro InitSection SecName
; This macro reads component installed flag from the registry and
;changes checked state of the section on the components page.
;Input: section index constant name specified in Section command.
ClearErrors
;Reading component status from registry
ReadRegDWORD $AR_RegFlags HKLM
Software\Microsoft\Windows\CurrentVersion\Uninstall\mrViewer-2.6.7-Windows-64\Components\${SecName}
Installed
IfErrors default_${SecName}
;Status will stay default if registry value not found
;(component was never installed)
IntOp $AR_RegFlags $AR_RegFlags ${SF_SELECTED} ;Turn off all other bits
SectionGetFlags ${${SecName}} $AR_SecFlags ;Reading default section flags
IntOp $AR_SecFlags $AR_SecFlags 0xFFFE ;Turn lowest (enabled) bit off
IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags ;Change lowest bit
; Note whether this component was installed before
!insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags
IntOp $R0 $AR_RegFlags $AR_RegFlags
;Writing modified flags
SectionSetFlags ${${SecName}} $AR_SecFlags
default_${SecName}:
!insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
!macroend
!macro FinishSection SecName
; This macro
Re: [CMake] NSIS builder creating invalid exe
On 09/01/15 19:22, Bill Hoffman wrote: On 1/9/2015 12:43 PM, Gonzalo Garramuño wrote: I updated my CMakeLists.txt to create an NSIS installer under a Nmake Makefile. The packaging works without errors when run with 'nmake package'. However, the resulting exe file when run, returns: Bad file number. The problem happens on both builds for win32 and win64. The NSIS installer is 3.0a1 and cmake v3.0.1. Try running it from explorer and not the command line. It might be asking to raise permissions since it is an installer. -Bill Yes, that was it. Thanks for pointing out a problem with mingw bash. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.1.0-1629-g761bc9f
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 761bc9f27850eb9425d8d222a3312007cdc24908 (commit) via 4729547a5b2596d6997e9b9131751995dbc4695d (commit) from b5061d40e11d93a449736ffa0b363a36bea97898 (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=761bc9f27850eb9425d8d222a3312007cdc24908 commit 761bc9f27850eb9425d8d222a3312007cdc24908 Merge: b5061d4 4729547 Author: Brad King brad.k...@kitware.com AuthorDate: Sat Jan 10 12:05:08 2015 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Sat Jan 10 12:05:08 2015 -0500 Merge topic 'linux-XL-fortran' into next 4729547a XL: Fix link flags for executables on Linux with XL compilers http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4729547a5b2596d6997e9b9131751995dbc4695d commit 4729547a5b2596d6997e9b9131751995dbc4695d Author: Brad King brad.k...@kitware.com AuthorDate: Sat Jan 10 12:00:56 2015 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Sat Jan 10 12:03:19 2015 -0500 XL: Fix link flags for executables on Linux with XL compilers Use -Wl,-export-dynamic with XL to match the -rdynamic flag used with GNU-like compilers. diff --git a/Modules/Platform/Linux-XL-C.cmake b/Modules/Platform/Linux-XL-C.cmake index f1c584c..d595e44 100644 --- a/Modules/Platform/Linux-XL-C.cmake +++ b/Modules/Platform/Linux-XL-C.cmake @@ -1 +1,2 @@ set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS -qmkshrobj) +set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS -Wl,-export-dynamic) diff --git a/Modules/Platform/Linux-XL-CXX.cmake b/Modules/Platform/Linux-XL-CXX.cmake index abd3fa4..5ceb255 100644 --- a/Modules/Platform/Linux-XL-CXX.cmake +++ b/Modules/Platform/Linux-XL-CXX.cmake @@ -1 +1,2 @@ set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS -qmkshrobj) +set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS -Wl,-export-dynamic) diff --git a/Modules/Platform/Linux-XL-Fortran.cmake b/Modules/Platform/Linux-XL-Fortran.cmake index cdd1f70..a878991 100644 --- a/Modules/Platform/Linux-XL-Fortran.cmake +++ b/Modules/Platform/Linux-XL-Fortran.cmake @@ -1 +1,2 @@ set(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS -qmkshrobj) +set(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS -Wl,-export-dynamic) --- Summary of changes: Modules/Platform/Linux-XL-C.cmake |1 + Modules/Platform/Linux-XL-CXX.cmake |1 + Modules/Platform/Linux-XL-Fortran.cmake |1 + 3 files changed, 3 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1631-g8504583
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 85045836c29eaa58efdb4c01aeb62d3b44290cac (commit) via d11a8f8c13225e05ec0bcbca4f174f795fe35a44 (commit) from 761bc9f27850eb9425d8d222a3312007cdc24908 (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=85045836c29eaa58efdb4c01aeb62d3b44290cac commit 85045836c29eaa58efdb4c01aeb62d3b44290cac Merge: 761bc9f d11a8f8 Author: Brad King brad.k...@kitware.com AuthorDate: Sat Jan 10 12:07:16 2015 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Sat Jan 10 12:07:16 2015 -0500 Merge topic 'add-xz-support' into next d11a8f8c cmSystsemTools: Remove unused gzip arg during bootstrap http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d11a8f8c13225e05ec0bcbca4f174f795fe35a44 commit d11a8f8c13225e05ec0bcbca4f174f795fe35a44 Author: Brad King brad.k...@kitware.com AuthorDate: Sat Jan 10 12:07:05 2015 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Sat Jan 10 12:07:05 2015 -0500 cmSystsemTools: Remove unused gzip arg during bootstrap diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 0271665..963ca77 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1539,7 +1539,6 @@ bool cmSystemTools::CreateTar(const char* outFileName, #else (void)outFileName; (void)files; - (void)gzip; (void)verbose; return false; #endif --- Summary of changes: Source/cmSystemTools.cxx |1 - 1 file changed, 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1634-gd388bda
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 d388bda78fb01e6a8cebad0464cd7b9eefd91eef (commit)
via 97f178f061a21fdc060d85982c68b8be5a088858 (commit)
via 56616160de37c1a2cc5fbcf4c9714db3ca1e5422 (commit)
from 85045836c29eaa58efdb4c01aeb62d3b44290cac (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=d388bda78fb01e6a8cebad0464cd7b9eefd91eef
commit d388bda78fb01e6a8cebad0464cd7b9eefd91eef
Merge: 8504583 97f178f
Author: Brad King brad.k...@kitware.com
AuthorDate: Sat Jan 10 12:08:19 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 10 12:08:19 2015 -0500
Merge topic 'update-kwsys' into next
97f178f0 Merge branch 'upstream-kwsys' into update-kwsys
56616160 KWSys 2015-01-09 (425fa73e)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97f178f061a21fdc060d85982c68b8be5a088858
commit 97f178f061a21fdc060d85982c68b8be5a088858
Merge: 6c3e3c1 5661616
Author: Brad King brad.k...@kitware.com
AuthorDate: Sat Jan 10 12:07:56 2015 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Sat Jan 10 12:07:56 2015 -0500
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56616160de37c1a2cc5fbcf4c9714db3ca1e5422
commit 56616160de37c1a2cc5fbcf4c9714db3ca1e5422
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Fri Jan 9 15:37:34 2015 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Sat Jan 10 12:07:51 2015 -0500
KWSys 2015-01-09 (425fa73e)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 425fa73e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' d30c9b03..425fa73e
Ben Boeckel (1):
425fa73e Add missing malloc return value casts
Change-Id: I3295bc4241b746364c728445114b3a627095838c
diff --git a/EncodingC.c b/EncodingC.c
index cda78e2..ba2cec2 100644
--- a/EncodingC.c
+++ b/EncodingC.c
@@ -44,7 +44,7 @@ wchar_t* kwsysEncoding_DupToWide(const char* str)
size_t length = kwsysEncoding_mbstowcs(NULL, str, 0) + 1;
if(length 0)
{
-ret = malloc((length)*sizeof(wchar_t));
+ret = (wchar_t*)malloc((length)*sizeof(wchar_t));
ret[0] = 0;
kwsysEncoding_mbstowcs(ret, str, length);
}
@@ -71,7 +71,7 @@ char* kwsysEncoding_DupToNarrow(const wchar_t* str)
size_t length = kwsysEncoding_wcstombs(0, str, 0) + 1;
if(length 0)
{
-ret = malloc(length);
+ret = (char*)malloc(length);
ret[0] = 0;
kwsysEncoding_wcstombs(ret, str, length);
}
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index ca9d424..1be6d02 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -547,7 +547,7 @@ int kwsysProcess_SetPipeFile(kwsysProcess* cp, int prPipe,
const char* file)
}
if(file)
{
-*pfile = malloc(strlen(file)+1);
+*pfile = (char*)malloc(strlen(file)+1);
if(!*pfile)
{
return 0;
@@ -1468,7 +1468,7 @@ static int kwsysProcessInitialize(kwsysProcess* cp)
cp-RealWorkingDirectoryLength = 4096;
#endif
cp-RealWorkingDirectory =
- malloc((size_t)(cp-RealWorkingDirectoryLength));
+ (char*)malloc((size_t)(cp-RealWorkingDirectoryLength));
if(!cp-RealWorkingDirectory)
{
return 0;
---
Summary of changes:
Source/kwsys/EncodingC.c |4 ++--
Source/kwsys/ProcessUNIX.c |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1645-g0144470
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 0144470b71bd9c1d0ec138ebda9cb28d8b762009 (commit)
via 6eabe4d0f9dd6622c7dafb5d6e8838c227f721d1 (commit)
from f1fa6eb9c12d28f0d5e6afa23e012856238cfc6b (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=0144470b71bd9c1d0ec138ebda9cb28d8b762009
commit 0144470b71bd9c1d0ec138ebda9cb28d8b762009
Merge: f1fa6eb 6eabe4d
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sat Jan 10 12:45:59 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 10 12:45:59 2015 -0500
Merge topic 'Apple-compiler-selection' into next
6eabe4d0 Apple: Resolve compiler in /usr/bin to that reported by Xcode
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6eabe4d0f9dd6622c7dafb5d6e8838c227f721d1
commit 6eabe4d0f9dd6622c7dafb5d6e8838c227f721d1
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sat Jan 3 17:36:34 2015 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Sat Jan 10 18:45:03 2015 +0100
Apple: Resolve compiler in /usr/bin to that reported by Xcode
The compiler in the PATH on mac is a stub for a different delegate
depending on the environment. Rather than requiring xcode-select to
change the used Xcode globally, users should be able to choose the
compiler per-session. That is possible with the DEVELOPER_DIR
environment variable.
However, the environment can change between running CMake and invoking
the build. In such cases, CMake prefers to record the relevant paths
from the environment and use them when invoking the build. That is not
currently done for the compilers on APPLE, so the compiler used is not
the one reported when running cmake:
$ DEVELOPER_DIR=/Applications/Xcode2.app/Contents/Developer/ cc --version
Apple LLVM version 6.0 (clang-600.0.51) (based on LLVM 3.5svn)
Target: x86_64-apple-darwin13.4.0
Thread model: posix
$ DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer/ cc --version
Apple LLVM version 5.1 (clang-503.0.38) (based on LLVM 3.4svn)
Target: x86_64-apple-darwin13.4.0
Thread model: posix
Update that now by querying Xcode for the correct compiler path before
falling back to whatever is delegated to by the compilers in /usr/bin.
diff --git a/Modules/CMakeDetermineCompiler.cmake
b/Modules/CMakeDetermineCompiler.cmake
index 0ab3af6..01e91f2 100644
--- a/Modules/CMakeDetermineCompiler.cmake
+++ b/Modules/CMakeDetermineCompiler.cmake
@@ -71,13 +71,15 @@ macro(_cmake_find_compiler lang)
unset(_languages)
# Look for a make tool provided by Xcode
- if(CMAKE_${lang}_COMPILER STREQUAL CMAKE_${lang}_COMPILER-NOTFOUND AND
CMAKE_HOST_APPLE)
+ if(CMAKE_HOST_APPLE
+ AND (CMAKE_${lang}_COMPILER STREQUAL CMAKE_${lang}_COMPILER-NOTFOUND
+OR CMAKE_${lang}_COMPILER MATCHES ^/usr/bin))
foreach(comp ${CMAKE_${lang}_COMPILER_LIST})
execute_process(COMMAND xcrun --find ${comp}
OUTPUT_VARIABLE _xcrun_out OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_VARIABLE _xcrun_err)
if(_xcrun_out)
-set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE
${_xcrun_out})
+set(CMAKE_${lang}_COMPILER ${_xcrun_out} CACHE PATH ${lang}
compiler)
break()
endif()
endforeach()
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1647-g57e8b86
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 57e8b86866517c1fdc75b93fdc03b791247f95dd (commit)
via 147278046f9f2200de276c84f61cde9ec0a5b2c4 (commit)
from 0144470b71bd9c1d0ec138ebda9cb28d8b762009 (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=57e8b86866517c1fdc75b93fdc03b791247f95dd
commit 57e8b86866517c1fdc75b93fdc03b791247f95dd
Merge: 0144470 1472780
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sat Jan 10 12:47:24 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 10 12:47:24 2015 -0500
Merge topic 'Apple-GNU-compiler-features' into next
14727804 Record compile features for GNU on Apple.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=147278046f9f2200de276c84f61cde9ec0a5b2c4
commit 147278046f9f2200de276c84f61cde9ec0a5b2c4
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Jan 9 20:18:25 2015 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Sat Jan 10 18:46:59 2015 +0100
Record compile features for GNU on Apple.
Tested with GNU 4.8 binary (bottle) from homebrew, and assumed to work
with the others.
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 9018450..db9089d 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -23,7 +23,7 @@ macro(cmake_record_c_compile_features)
record_compiler_features(C ${std_version} ${list})
endmacro()
- if (UNIX AND NOT APPLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7)
+ if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7)
_get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION}
CMAKE_C11_COMPILE_FEATURES)
if (_result EQUAL 0)
_get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION}
CMAKE_C99_COMPILE_FEATURES)
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index a91c901..4a26963 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -39,10 +39,10 @@ macro(cmake_record_cxx_compile_features)
endmacro()
set(_result 0)
- if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+ if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
_get_gcc_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION}
CMAKE_CXX14_COMPILE_FEATURES)
endif()
- if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
+ if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
if (_result EQUAL 0)
_get_gcc_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION}
CMAKE_CXX11_COMPILE_FEATURES)
endif()
---
Summary of changes:
Modules/Compiler/GNU-C.cmake |2 +-
Modules/Compiler/GNU-CXX.cmake |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1649-gc7fb8d3
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 c7fb8d364b6915cd603573fdfb4670c88d728050 (commit)
via c453fb77986632531d7835e4a4e7433edc004206 (commit)
from 57e8b86866517c1fdc75b93fdc03b791247f95dd (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=c7fb8d364b6915cd603573fdfb4670c88d728050
commit c7fb8d364b6915cd603573fdfb4670c88d728050
Merge: 57e8b86 c453fb7
Author: Brad King brad.k...@kitware.com
AuthorDate: Sat Jan 10 12:57:41 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 10 12:57:41 2015 -0500
Merge topic 'feature_record_msvc' into next
c453fb77 fixup! Features: Properly evaluate if the compiler supports
cxx_final.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c453fb77986632531d7835e4a4e7433edc004206
commit c453fb77986632531d7835e4a4e7433edc004206
Author: Brad King brad.k...@kitware.com
AuthorDate: Sat Jan 10 12:53:52 2015 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Sat Jan 10 12:54:49 2015 -0500
fixup! Features: Properly evaluate if the compiler supports cxx_final.
Always reference the source file with a consistent name.
diff --git a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
index b544b99..4de8e88 100644
--- a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
+++ b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake
@@ -11,7 +11,7 @@ add_custom_command(OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_res
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp
${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.cpp
)
-add_library(empty ${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.cpp)
+add_library(empty
${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_result}.cpp)
if (HAVE_FINAL)
target_compile_features(empty PRIVATE cxx_final)
endif()
---
Summary of changes:
Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[cmake-developers] [PATCH] Document find_package CMAKE_FIND_PACKAGE_NAME variable
Signed-off-by: Gregor Jasny gja...@googlemail.com --- Help/command/find_package.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 190d05c..7f518a6 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -312,6 +312,8 @@ When loading a find module or package configuration file ``find_package`` defines variables to provide information about the call arguments (and restores their original state before returning): +``CMAKE_FIND_PACKAGE_NAME`` + the ``package`` name which is searched for ``package_FIND_REQUIRED`` true if ``REQUIRED`` option was given ``package_FIND_QUIETLY`` -- 1.9.3 (Apple Git-50) -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Extracting target metadata, IDE integration
Aleix Pol wrote: I'll attach it in this e-mail, to make sure it reaches. PS: there's no changes system for cmake like reviewboard, is there? Nope, review is communicated on the mailing list, but if you want you can push the patch on a branch in a public repo. It could be more convenient. Thanks, Steve. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Which binaries should be required in FindLATEX?
Hi Brad,
concerning FindLATEX again:
Applied:
FindLATEX: Add components handling
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07a3f9ad
The link does not work and I couldn't find the commit in next. Can you
double check whether you pushed it?
with minor documentation tweaks and one logic fix:
-# set(LATEX_MAKEINDEX_FOUND TRUE)
+ set(LATEX_MAKEINDEX_FOUND TRUE)
that looked left from local testing.
Sorry, you are right. Thanks for the heads-up. I attached the right
patch this time.
Additionally I attached patches to add more LaTeX-related component we
should test. This includes Biber (BibTeX replacement), xindy (makeindex
replacement), pdftops, htlatex (compiler to HTML), XeLaTeX and LuaLaTeX.
Bye
Christoph
From b140186f9e712705d7c33bf71dd9c2dc592b871e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= gruen...@dune-project.org
Date: Sun, 28 Dec 2014 09:58:53 +0100
Subject: [PATCH 1/4] FindLATEX: Add components handling
---
Modules/FindLATEX.cmake | 78 +
1 file changed, 72 insertions(+), 6 deletions(-)
diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake
index a935f00..a6c8937 100644
--- a/Modules/FindLATEX.cmake
+++ b/Modules/FindLATEX.cmake
@@ -6,17 +6,42 @@
#
# This module finds an installed Latex and determines the location
# of the compiler. Additionally the module looks for Latex-related
-# software like BibTeX. This code sets the following variables:
+# software like BibTeX.
+#
+# This module sets the following result variables:
#
# ::
#
+# LATEX_FOUND: whether found Latex and requested components
+# LATEX_component_FOUND: whether found component
# LATEX_COMPILER: path to the LaTeX compiler
# PDFLATEX_COMPILER:path to the PdfLaTeX compiler
# BIBTEX_COMPILER: path to the BibTeX compiler
# MAKEINDEX_COMPILER: path to the MakeIndex compiler
# DVIPS_CONVERTER: path to the DVIPS converter
+# DVIPDF_CONVERTER: path to the DVIPDF converter
# PS2PDF_CONVERTER: path to the PS2PDF converter
# LATEX2HTML_CONVERTER: path to the LaTeX2Html converter
+#
+# Possible components are:
+#
+# ::
+#
+# PDFLATEX
+# BIBTEX
+# MAKEINDEX
+# DVIPS
+# DVIPDF
+# PS2PDF
+# LATEX2HTML
+#
+# Example Usages:
+#
+# ::
+#
+# find_package(LATEX)
+# find_package(LATEX COMPONENTS PDFLATEX)
+# find_package(LATEX COMPONENTS BIBTEX PS2PDF)
#=
# Copyright 2002-2014 Kitware, Inc.
@@ -32,9 +57,7 @@
# License text for the above reference.)
if (WIN32)
-
# Try to find the MikTex binary path (look for its package manager).
-
find_path(MIKTEX_BINARY_PATH mpm.exe
[HKEY_LOCAL_MACHINE\\SOFTWARE\\MiK\\MiKTeX\\CurrentVersion\\MiKTeX;Install Root]/miktex/bin
DOC
@@ -43,7 +66,6 @@ if (WIN32)
mark_as_advanced(MIKTEX_BINARY_PATH)
# Try to find the GhostScript binary path (look for gswin32).
-
get_filename_component(GHOSTSCRIPT_BINARY_PATH_FROM_REGISTERY_8_00
[HKEY_LOCAL_MACHINE\\SOFTWARE\\AFPL Ghostscript\\8.00;GS_DLL] PATH
)
@@ -64,45 +86,76 @@ if (WIN32)
DOC Path to the GhostScript library directory.
)
mark_as_advanced(GHOSTSCRIPT_LIBRARY_PATH)
-
endif ()
+# try to find Latex and the related programs
find_program(LATEX_COMPILER
NAMES latex
PATHS ${MIKTEX_BINARY_PATH}
/usr/bin
)
+# find pdflatex
find_program(PDFLATEX_COMPILER
NAMES pdflatex
PATHS ${MIKTEX_BINARY_PATH}
/usr/bin
)
+if (PDFLATEX_COMPILER)
+ set(LATEX_PDFLATEX_FOUND TRUE)
+else()
+ set(LATEX_PDFLATEX_FOUND FALSE)
+endif()
+# find bibtex
find_program(BIBTEX_COMPILER
NAMES bibtex
PATHS ${MIKTEX_BINARY_PATH}
/usr/bin
)
+if (BIBTEX_COMPILER)
+ set(LATEX_BIBTEX_FOUND TRUE)
+else()
+ set(LATEX_BIBTEX_FOUND FALSE)
+endif()
+# find makeindex
find_program(MAKEINDEX_COMPILER
NAMES makeindex
PATHS ${MIKTEX_BINARY_PATH}
/usr/bin
)
+if (MAKEINDEX_COMPILER)
+ set(LATEX_MAKEINDEX_FOUND TRUE)
+else()
+ set(LATEX_MAKEINDEX_FOUND FALSE)
+endif()
+# find dvips
find_program(DVIPS_CONVERTER
NAMES dvips
PATHS ${MIKTEX_BINARY_PATH}
/usr/bin
)
+if (DVIPS_CONVERTER)
+ set(LATEX_DVIPS_FOUND TRUE)
+else()
+ set(LATEX_DVIPS_FOUND FALSE)
+endif()
+# find dvipdf
find_program(DVIPDF_CONVERTER
NAMES dvipdfm dvipdft dvipdf
PATHS ${MIKTEX_BINARY_PATH}
/usr/bin
)
+if (DVIPDF_CONVERTER)
+ set(LATEX_DVIPDF_FOUND TRUE)
+else()
+ set(LATEX_DVIPDF_FOUND FALSE)
+endif()
+# find ps2pdf
if (WIN32)
find_program(PS2PDF_CONVERTER
NAMES ps2pdf14.bat ps2pdf14 ps2pdf
@@ -114,12 +167,23 @@ else ()
NAMES ps2pdf14 ps2pdf
)
endif ()
+if (PS2PDF_CONVERTER)
+ set(LATEX_PS2PDF_FOUND TRUE)
+else()
+ set(LATEX_PS2PDF_FOUND FALSE)
+endif()
+# find latex2html
find_program(LATEX2HTML_CONVERTER
NAMES latex2html
PATHS ${MIKTEX_BINARY_PATH}
/usr/bin
)
+if
[Cmake-commits] CMake branch, next, updated. v3.1.0-1643-gf1fa6eb
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 f1fa6eb9c12d28f0d5e6afa23e012856238cfc6b (commit)
via aedba1fa998a01fb483062fd393c10145219e7c4 (commit)
from 5b47c32a9d7a67fadd904a4f41c4838eb79a04c2 (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=f1fa6eb9c12d28f0d5e6afa23e012856238cfc6b
commit f1fa6eb9c12d28f0d5e6afa23e012856238cfc6b
Merge: 5b47c32 aedba1f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sat Jan 10 12:44:57 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 10 12:44:57 2015 -0500
Merge topic 'Apple-compiler-selection' into next
aedba1fa Apple: Prefer the compiler reported by Xcode to that in path.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aedba1fa998a01fb483062fd393c10145219e7c4
commit aedba1fa998a01fb483062fd393c10145219e7c4
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Sat Jan 3 17:36:34 2015 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Sat Jan 10 18:44:35 2015 +0100
Apple: Prefer the compiler reported by Xcode to that in path.
The compiler in the PATH on mac is a stub for a different delegate
depending on the environment. Rather than requiring xcode-select to
change the used Xcode globally, users should be able to choose the
compiler per-session. That is possible with the DEVELOPER_DIR
environment variable.
However, the environment can change between running CMake and invoking
the build. In such cases, CMake prefers to record the relevant paths
from the environment and use them when invoking the build. That is not
currently done for the compilers on APPLE, so the compiler used is not
the one reported when running cmake:
$ DEVELOPER_DIR=/Applications/Xcode2.app/Contents/Developer/ cc --version
Apple LLVM version 6.0 (clang-600.0.51) (based on LLVM 3.5svn)
Target: x86_64-apple-darwin13.4.0
Thread model: posix
$ DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer/ cc --version
Apple LLVM version 5.1 (clang-503.0.38) (based on LLVM 3.4svn)
Target: x86_64-apple-darwin13.4.0
Thread model: posix
Update that now by querying Xcode for the correct compiler path if
it is found in /usr/bin. We can't simply query xcrun first and use
the regular search as a fallback, because compilers in the PATH
in /usr/local for example should be preferred if present.
diff --git a/Modules/CMakeDetermineCompiler.cmake
b/Modules/CMakeDetermineCompiler.cmake
index f509ef3..01e91f2 100644
--- a/Modules/CMakeDetermineCompiler.cmake
+++ b/Modules/CMakeDetermineCompiler.cmake
@@ -41,8 +41,39 @@ macro(_cmake_find_compiler lang)
endif()
endif()
+ # Look for directories containing compilers of reference languages.
+ set(_${lang}_COMPILER_HINTS)
+ foreach(l ${_languages})
+if(CMAKE_${l}_COMPILER AND IS_ABSOLUTE ${CMAKE_${l}_COMPILER})
+ get_filename_component(_hint ${CMAKE_${l}_COMPILER} PATH)
+ if(IS_DIRECTORY ${_hint})
+list(APPEND _${lang}_COMPILER_HINTS ${_hint})
+ endif()
+ unset(_hint)
+endif()
+ endforeach()
+
+ # Find the compiler.
+ if(_${lang}_COMPILER_HINTS)
+# Prefer directories containing compilers of reference languages.
+list(REMOVE_DUPLICATES _${lang}_COMPILER_HINTS)
+find_program(CMAKE_${lang}_COMPILER
+ NAMES ${CMAKE_${lang}_COMPILER_LIST}
+ PATHS ${_${lang}_COMPILER_HINTS}
+ NO_DEFAULT_PATH
+ DOC ${lang} compiler)
+ endif()
+ find_program(CMAKE_${lang}_COMPILER NAMES ${CMAKE_${lang}_COMPILER_LIST} DOC
${lang} compiler)
+ if(CMAKE_${lang}_COMPILER_INIT AND NOT CMAKE_${lang}_COMPILER)
+set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE
${CMAKE_${lang}_COMPILER_INIT})
+ endif()
+ unset(_${lang}_COMPILER_HINTS)
+ unset(_languages)
+
# Look for a make tool provided by Xcode
- if(CMAKE_HOST_APPLE)
+ if(CMAKE_HOST_APPLE
+ AND (CMAKE_${lang}_COMPILER STREQUAL CMAKE_${lang}_COMPILER-NOTFOUND
+OR CMAKE_${lang}_COMPILER MATCHES ^/usr/bin))
foreach(comp ${CMAKE_${lang}_COMPILER_LIST})
execute_process(COMMAND xcrun --find ${comp}
OUTPUT_VARIABLE _xcrun_out OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -53,37 +84,6 @@ macro(_cmake_find_compiler lang)
endif()
endforeach()
endif()
-
- if(NOT CMAKE_${lang}_COMPILER)
-# Look for directories containing compilers of reference languages.
-set(_${lang}_COMPILER_HINTS)
-foreach(l ${_languages})
- if(CMAKE_${l}_COMPILER AND IS_ABSOLUTE ${CMAKE_${l}_COMPILER})
-
[Cmake-commits] CMake branch, master, updated. v3.1.0-637-g7e5e8a3
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 7e5e8a37b56dd7c858d54c49e7fa6697cc72395b (commit) from bc04b54734fa20a69d87d64ae9152639654d (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=7e5e8a37b56dd7c858d54c49e7fa6697cc72395b commit 7e5e8a37b56dd7c858d54c49e7fa6697cc72395b Author: Kitware Robot kwro...@kitware.com AuthorDate: Sun Jan 11 00:01:09 2015 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sun Jan 11 00:01:09 2015 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index bfd2569..5de792a 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 1) -set(CMake_VERSION_PATCH 20150110) +set(CMake_VERSION_PATCH 20150111) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
