kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid failure of CPackComponents test on dash16 and dash17 since makensis was installed on those machines to increase coverage. Do not add install rules with absolute paths when makensis is going to be used to build an installer.

Browse Source
This commit is contained in:
David Cole 2009-10-28 14:40:01 -04:00
parent 285c731f0e
commit 640389f3a4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/CPackComponents/CMakeLists.txt
View File

@ -16,8 +16,16 @@ target_link_libraries(mylibapp mylib)
# On Linux, enable using an absolute install path to verify that # On Linux, enable using an absolute install path to verify that
# CMAKE_INSTALL_PREFIX and CPACK_SET_DESTDIR interact properly. # CMAKE_INSTALL_PREFIX and CPACK_SET_DESTDIR interact properly.
#
# But only use absolute paths if not targeting an NSIS installer
# as indicated by CPACK_BINARY_NSIS. (If we allow this, the test
# fails on Linux machines with makensis installed when we are not
# cross-compiling...)
#
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set(mylib_install_to_absolute_path ON) if(NOT CPACK_BINARY_NSIS)
set(mylib_install_to_absolute_path ON)
endif()
endif() endif()
if(mylib_install_to_absolute_path) if(mylib_install_to_absolute_path)