@@ -114,19 +114,19 @@ MACRO(CMAKE_SETUP_TESTING)
114
114
IF (NOT DART_ROOT)
115
115
SET (MAKEPROGRAM ${CMAKE_MAKE_PROGRAM} )
116
116
ENDIF (NOT DART_ROOT)
117
-
117
+
118
118
IF (BUILD_TESTING)
119
- SET (CMAKE_TEST_GENERATOR "" CACHE STRING
119
+ SET (CMAKE_TEST_GENERATOR "" CACHE STRING
120
120
"Generator used when running tests" )
121
- SET (CMAKE_TEST_MAKEPROGRAM "" CACHE FILEPATH
121
+ SET (CMAKE_TEST_MAKEPROGRAM "" CACHE FILEPATH
122
122
"Generator used when running tests" )
123
123
IF (NOT CMAKE_TEST_GENERATOR)
124
124
SET (CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR} " )
125
125
SET (CMAKE_TEST_MAKEPROGRAM "${MAKEPROGRAM} " )
126
126
ELSE (NOT CMAKE_TEST_GENERATOR)
127
127
SET (CMAKE_TEST_DIFFERENT_GENERATOR TRUE )
128
128
ENDIF (NOT CMAKE_TEST_GENERATOR)
129
-
129
+
130
130
# Are we testing with the MSVC compiler?
131
131
SET (CMAKE_TEST_MSVC 0)
132
132
IF (MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
@@ -138,14 +138,14 @@ MACRO(CMAKE_SETUP_TESTING)
138
138
ENDIF ("${CMAKE_TEST_GENERATOR} " MATCHES "NMake" OR
139
139
"${CMAKE_TEST_GENERATOR} " MATCHES "Visual Studio" )
140
140
ENDIF (MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
141
-
141
+
142
142
SET (CMAKE_TEST_SYSTEM_LIBRARIES 0)
143
143
FOREACH (util CURL EXPAT XMLRPC ZLIB)
144
144
IF (CMAKE_USE_SYSTEM_${util} )
145
145
SET (CMAKE_TEST_SYSTEM_LIBRARIES 1)
146
146
ENDIF (CMAKE_USE_SYSTEM_${util} )
147
147
ENDFOREACH (util)
148
-
148
+
149
149
# This variable is set by cmake, however to
150
150
# test cmake we want to make sure that
151
151
# the ctest from this cmake is used for testing
@@ -169,7 +169,7 @@ MACRO(CMAKE_SETUP_TESTING)
169
169
CONFIGURE_FILE (${CMake_SOURCE_DIR} /CTestCustom.ctest.in
170
170
${CMake_BINARY_DIR} /CTestCustom.ctest @ONLY)
171
171
IF (BUILD_TESTING AND DART_ROOT)
172
- CONFIGURE_FILE (${CMake_SOURCE_DIR} /CMakeLogo.gif
172
+ CONFIGURE_FILE (${CMake_SOURCE_DIR} /CMakeLogo.gif
173
173
${CMake_BINARY_DIR} /Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY )
174
174
ENDIF (BUILD_TESTING AND DART_ROOT)
175
175
MARK_AS_ADVANCED (DART_ROOT)
@@ -253,18 +253,18 @@ MACRO (CMAKE_BUILD_UTILITIES)
253
253
${CMake_BINARY_DIR} /Utilities
254
254
${CMake_SOURCE_DIR} /Utilities
255
255
)
256
-
256
+
257
257
# check for the use of system libraries versus builtin ones
258
258
# (a macro defined in this file)
259
259
CMAKE_HANDLE_SYSTEM_LIBRARIES()
260
-
260
+
261
261
#---------------------------------------------------------------------
262
262
# Build zlib library for Curl, CMake, and CTest.
263
263
SET (CMAKE_ZLIB_HEADER "cm_zlib.h" )
264
264
IF (CMAKE_USE_SYSTEM_ZLIB)
265
265
FIND_PACKAGE (ZLIB)
266
266
IF (NOT ZLIB_FOUND)
267
- MESSAGE (FATAL_ERROR
267
+ MESSAGE (FATAL_ERROR
268
268
"CMAKE_USE_SYSTEM_ZLIB is ON but a zlib is not found!" )
269
269
ENDIF (NOT ZLIB_FOUND)
270
270
SET (CMAKE_ZLIB_INCLUDES ${ZLIB_INCLUDE_DIR} )
@@ -275,13 +275,13 @@ MACRO (CMAKE_BUILD_UTILITIES)
275
275
ADD_SUBDIRECTORY (Utilities/cmzlib)
276
276
CMAKE_SET_TARGET_FOLDER(cmzlib "Utilities/3rdParty" )
277
277
ENDIF (CMAKE_USE_SYSTEM_ZLIB)
278
-
278
+
279
279
#---------------------------------------------------------------------
280
280
# Build Curl library for CTest.
281
281
IF (CMAKE_USE_SYSTEM_CURL)
282
282
FIND_PACKAGE (CURL)
283
283
IF (NOT CURL_FOUND)
284
- MESSAGE (FATAL_ERROR
284
+ MESSAGE (FATAL_ERROR
285
285
"CMAKE_USE_SYSTEM_CURL is ON but a curl is not found!" )
286
286
ENDIF (NOT CURL_FOUND)
287
287
SET (CMAKE_CURL_INCLUDES ${CURL_INCLUDE_DIRS} )
@@ -306,15 +306,15 @@ MACRO (CMAKE_BUILD_UTILITIES)
306
306
307
307
#---------------------------------------------------------------------
308
308
# Build Compress library for CTest.
309
- SET (CMAKE_COMPRESS_INCLUDES
309
+ SET (CMAKE_COMPRESS_INCLUDES
310
310
"${CMAKE_CURRENT_BINARY_DIR} /Utilities/cmcompress" )
311
311
SET (CMAKE_COMPRESS_LIBRARIES "cmcompress" )
312
312
ADD_SUBDIRECTORY (Utilities/cmcompress)
313
313
CMAKE_SET_TARGET_FOLDER(cmcompress "Utilities/3rdParty" )
314
314
IF (CMAKE_USE_SYSTEM_BZIP2)
315
315
FIND_PACKAGE (BZip2)
316
316
ELSE ()
317
- SET (BZIP2_INCLUDE_DIR
317
+ SET (BZIP2_INCLUDE_DIR
318
318
"${CMAKE_CURRENT_SOURCE_DIR} /Utilities/cmbzip2" )
319
319
SET (BZIP2_LIBRARIES cmbzip2)
320
320
ADD_SUBDIRECTORY (Utilities/cmbzip2)
@@ -364,7 +364,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
364
364
ADD_SUBDIRECTORY (Utilities/cmexpat)
365
365
CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty" )
366
366
ENDIF (CMAKE_USE_SYSTEM_EXPAT)
367
-
367
+
368
368
#---------------------------------------------------------------------
369
369
# Build XMLRPC library for CMake and CTest.
370
370
IF (CTEST_USE_XMLRPC)
@@ -376,7 +376,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
376
376
SET (CMAKE_XMLRPC_INCLUDES ${XMLRPC_INCLUDE_DIRS} )
377
377
SET (CMAKE_XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES} )
378
378
ENDIF (CTEST_USE_XMLRPC)
379
-
379
+
380
380
#---------------------------------------------------------------------
381
381
# Use curses?
382
382
IF (UNIX )
@@ -454,7 +454,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES
454
454
# where to write the resulting executables and libraries
455
455
SET (BUILD_SHARED_LIBS OFF )
456
456
SET (EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir." )
457
- SET (LIBRARY_OUTPUT_PATH "" CACHE INTERNAL
457
+ SET (LIBRARY_OUTPUT_PATH "" CACHE INTERNAL
458
458
"Where to put the libraries for CMake" )
459
459
460
460
# The CMake executables usually do not need any rpath to run in the build or
@@ -511,12 +511,12 @@ IF("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x")
511
511
SET (CMAKE_TESTS_CDASH_SERVER "http://www.cdash.org/CDash" )
512
512
ENDIF ("x${CMAKE_TESTS_CDASH_SERVER} " STREQUAL "x" )
513
513
514
- # build the utilities (a macro defined in this file)
514
+ # build the utilities (a macro defined in this file)
515
515
CMAKE_BUILD_UTILITIES()
516
516
517
517
# On NetBSD ncurses is required, since curses doesn't have the wsyncup()
518
518
# function. ncurses is installed via pkgsrc, so the library is in /usr/pkg/lib,
519
- # which isn't in the default linker search path. So without RPATH ccmake
519
+ # which isn't in the default linker search path. So without RPATH ccmake
520
520
# doesn't run and the build doesn't succeed since ccmake is executed for
521
521
# generating the documentation.
522
522
IF (BUILD_CursesDialog)
@@ -539,10 +539,10 @@ IF(BUILD_QtDialog)
539
539
IF (NOT "${ENDCH} " STREQUAL "/" )
540
540
SET (CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX} /" )
541
541
ENDIF (NOT "${ENDCH} " STREQUAL "/" )
542
- SET (CMAKE_INSTALL_PREFIX
542
+ SET (CMAKE_INSTALL_PREFIX
543
543
"${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME} .app/Contents" )
544
544
ENDIF (APPLE )
545
-
545
+
546
546
SET (QT_NEED_RPATH FALSE )
547
547
IF (NOT "${QT_LIBRARY_DIR} " STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR} " STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR} " STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR} " STREQUAL "/usr/lib64" )
548
548
SET (QT_NEED_RPATH TRUE )
@@ -551,7 +551,7 @@ ENDIF(BUILD_QtDialog)
551
551
552
552
553
553
# The same might be true on other systems for other libraries.
554
- # Then only enable RPATH if we have are building at least with cmake 2.4,
554
+ # Then only enable RPATH if we have are building at least with cmake 2.4,
555
555
# since this one has much better RPATH features than cmake 2.2.
556
556
# The executables are then built with the RPATH for the libraries outside
557
557
# the build tree, which is both the build and the install RPATH.
@@ -583,7 +583,7 @@ CONFIGURE_FILE(
583
583
"${CMAKE_CURRENT_BINARY_DIR} /DartLocal.conf"
584
584
COPYONLY )
585
585
586
- OPTION (CMAKE_STRICT
586
+ OPTION (CMAKE_STRICT
587
587
"Perform strict testing to record property and variable access. Can be used to report any undefined properties or variables" OFF )
588
588
MARK_AS_ADVANCED (CMAKE_STRICT)
589
589
@@ -600,7 +600,7 @@ CMAKE_SET_TARGET_FOLDER(cmw9xcom "Utilities/Win9xCompat")
600
600
CMAKE_SET_TARGET_FOLDER(documentation "Documentation" )
601
601
602
602
# add a test
603
- ADD_TEST (SystemInformationNew "${CMAKE_CMAKE_COMMAND} "
603
+ ADD_TEST (SystemInformationNew "${CMAKE_CMAKE_COMMAND} "
604
604
--system -information -G "${CMAKE_TEST_GENERATOR} " )
605
605
606
606
# Install license file as it requires.
0 commit comments