ENH: Add test for REMOVE_DEFINITION

This commit is contained in:
Andy Cedilnik 2004-04-15 13:59:29 -04:00
parent 504d0bc3b3
commit 23a154941b
12 changed files with 63 additions and 33 deletions

View File

@ -31,6 +31,7 @@ ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
ADD_DEFINITIONS(-DCMAKE_IS_FUN) ADD_DEFINITIONS(-DCMAKE_IS_FUN)
ADD_DEFINITIONS(-DCMAKE_IS_REALLY_FUN)
SET(TEST_SEP "a b c") SET(TEST_SEP "a b c")
SEPARATE_ARGUMENTS(TEST_SEP) SEPARATE_ARGUMENTS(TEST_SEP)
@ -147,20 +148,20 @@ FIND_LIBRARY(FIND_DUMMY_LIB
# Test SET_SOURCE_FILES_PROPERTIES # Test SET_SOURCE_FILES_PROPERTIES
# #
SET_SOURCE_FILES_PROPERTIES(nonexisting_file2 SET_SOURCE_FILES_PROPERTIES(nonexisting_file2
GENERATED GENERATED
ABSTRACT ABSTRACT
WRAP_EXCLUDE WRAP_EXCLUDE
COMPILE_FLAGS "-foo -bar") COMPILE_FLAGS "-foo -bar")
GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file2 ABSTRACT) GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file2 ABSTRACT)
GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file2 WRAP_EXCLUDE) GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file2 WRAP_EXCLUDE)
GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file2 COMPILE_FLAGS) GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file2 COMPILE_FLAGS)
SET_SOURCE_FILES_PROPERTIES(nonexisting_file3 PROPERTIES SET_SOURCE_FILES_PROPERTIES(nonexisting_file3 PROPERTIES
GENERATED 1 GENERATED 1
ABSTRACT 1 ABSTRACT 1
WRAP_EXCLUDE 1 WRAP_EXCLUDE 1
COMPILE_FLAGS "-foo -bar") COMPILE_FLAGS "-foo -bar")
GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file3 ABSTRACT) GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file3 ABSTRACT)
GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file3 WRAP_EXCLUDE) GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file3 WRAP_EXCLUDE)
GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file3 COMPILE_FLAGS) GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file3 COMPILE_FLAGS)
@ -181,8 +182,8 @@ IF (WIN32)
COPYONLY IMMEDIATE) COPYONLY IMMEDIATE)
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E write_regv \"${hkey}\" \"${dir}\"") EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E write_regv \"${hkey}\" \"${dir}\"")
FIND_PATH(REGISTRY_TEST_PATH FIND_PATH(REGISTRY_TEST_PATH
${file} ${file}
"[${hkey}]" DOC "Registry_Test_Path") "[${hkey}]" DOC "Registry_Test_Path")
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E delete_regv \"${hkey}\"") EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E delete_regv \"${hkey}\"")
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E remove \"${dir}/${file}\"") EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E remove \"${dir}/${file}\"")
ENDIF (NOT UNIX) ENDIF (NOT UNIX)
@ -238,7 +239,7 @@ IF("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$")
ENDIF("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$") ENDIF("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$")
IF(NOT STRING_REGEX_PASSED) IF(NOT STRING_REGEX_PASSED)
MESSAGE(SEND_ERROR MESSAGE(SEND_ERROR
"STRING(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")") "STRING(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")")
ENDIF(NOT STRING_REGEX_PASSED) ENDIF(NOT STRING_REGEX_PASSED)
# #

View File

@ -15,6 +15,9 @@ extern "C" {
int cm_passed = 0; int cm_passed = 0;
int cm_failed = 0; int cm_failed = 0;
#ifndef CMAKE_IS_REALLY_FUN
This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work
#endif
// Here is a stupid function that tries to use std::string methods // Here is a stupid function that tries to use std::string methods
// so that the dec cxx compiler will instantiate the stuff that // so that the dec cxx compiler will instantiate the stuff that
// we are using from the CMakeLib library.... // we are using from the CMakeLib library....

View File

@ -1,3 +1,5 @@
REMOVE_DEFINITIONS(-DCMAKE_IS_REALLY_FUN)
# #
# Small utility used to create file # Small utility used to create file
# UTILITY_SOURCE is used for coverage and for getting the exact name # UTILITY_SOURCE is used for coverage and for getting the exact name

View File

@ -1,5 +1,9 @@
#include <string.h> #include <string.h>
#ifdef CMAKE_IS_REALLY_FUN
This is a problem. Looks like REMOVE_DEFINITION does not work
#endif
int file2() int file2()
{ {
return 1; return 1;

View File

@ -31,6 +31,7 @@ ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
ADD_DEFINITIONS(-DCMAKE_IS_FUN) ADD_DEFINITIONS(-DCMAKE_IS_FUN)
ADD_DEFINITIONS(-DCMAKE_IS_REALLY_FUN)
SET(TEST_SEP "a b c") SET(TEST_SEP "a b c")
SEPARATE_ARGUMENTS(TEST_SEP) SEPARATE_ARGUMENTS(TEST_SEP)
@ -147,20 +148,20 @@ FIND_LIBRARY(FIND_DUMMY_LIB
# Test SET_SOURCE_FILES_PROPERTIES # Test SET_SOURCE_FILES_PROPERTIES
# #
SET_SOURCE_FILES_PROPERTIES(nonexisting_file2 SET_SOURCE_FILES_PROPERTIES(nonexisting_file2
GENERATED GENERATED
ABSTRACT ABSTRACT
WRAP_EXCLUDE WRAP_EXCLUDE
COMPILE_FLAGS "-foo -bar") COMPILE_FLAGS "-foo -bar")
GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file2 ABSTRACT) GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file2 ABSTRACT)
GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file2 WRAP_EXCLUDE) GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file2 WRAP_EXCLUDE)
GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file2 COMPILE_FLAGS) GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file2 COMPILE_FLAGS)
SET_SOURCE_FILES_PROPERTIES(nonexisting_file3 PROPERTIES SET_SOURCE_FILES_PROPERTIES(nonexisting_file3 PROPERTIES
GENERATED 1 GENERATED 1
ABSTRACT 1 ABSTRACT 1
WRAP_EXCLUDE 1 WRAP_EXCLUDE 1
COMPILE_FLAGS "-foo -bar") COMPILE_FLAGS "-foo -bar")
GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file3 ABSTRACT) GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file3 ABSTRACT)
GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file3 WRAP_EXCLUDE) GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file3 WRAP_EXCLUDE)
GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file3 COMPILE_FLAGS) GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file3 COMPILE_FLAGS)
@ -181,8 +182,8 @@ IF (WIN32)
COPYONLY IMMEDIATE) COPYONLY IMMEDIATE)
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E write_regv \"${hkey}\" \"${dir}\"") EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E write_regv \"${hkey}\" \"${dir}\"")
FIND_PATH(REGISTRY_TEST_PATH FIND_PATH(REGISTRY_TEST_PATH
${file} ${file}
"[${hkey}]" DOC "Registry_Test_Path") "[${hkey}]" DOC "Registry_Test_Path")
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E delete_regv \"${hkey}\"") EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E delete_regv \"${hkey}\"")
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E remove \"${dir}/${file}\"") EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E remove \"${dir}/${file}\"")
ENDIF (NOT UNIX) ENDIF (NOT UNIX)
@ -238,7 +239,7 @@ IF("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$")
ENDIF("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$") ENDIF("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$")
IF(NOT STRING_REGEX_PASSED) IF(NOT STRING_REGEX_PASSED)
MESSAGE(SEND_ERROR MESSAGE(SEND_ERROR
"STRING(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")") "STRING(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")")
ENDIF(NOT STRING_REGEX_PASSED) ENDIF(NOT STRING_REGEX_PASSED)
# #

View File

@ -15,6 +15,9 @@ extern "C" {
int cm_passed = 0; int cm_passed = 0;
int cm_failed = 0; int cm_failed = 0;
#ifndef CMAKE_IS_REALLY_FUN
This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work
#endif
// Here is a stupid function that tries to use std::string methods // Here is a stupid function that tries to use std::string methods
// so that the dec cxx compiler will instantiate the stuff that // so that the dec cxx compiler will instantiate the stuff that
// we are using from the CMakeLib library.... // we are using from the CMakeLib library....

View File

@ -1,3 +1,5 @@
REMOVE_DEFINITIONS(-DCMAKE_IS_REALLY_FUN)
# #
# Small utility used to create file # Small utility used to create file
# UTILITY_SOURCE is used for coverage and for getting the exact name # UTILITY_SOURCE is used for coverage and for getting the exact name

View File

@ -1,5 +1,9 @@
#include <string.h> #include <string.h>
#ifdef CMAKE_IS_REALLY_FUN
This is a problem. Looks like REMOVE_DEFINITION does not work
#endif
int file2() int file2()
{ {
return 1; return 1;

View File

@ -31,6 +31,7 @@ ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
ADD_DEFINITIONS(-DCMAKE_IS_FUN) ADD_DEFINITIONS(-DCMAKE_IS_FUN)
ADD_DEFINITIONS(-DCMAKE_IS_REALLY_FUN)
SET(TEST_SEP "a b c") SET(TEST_SEP "a b c")
SEPARATE_ARGUMENTS(TEST_SEP) SEPARATE_ARGUMENTS(TEST_SEP)
@ -147,20 +148,20 @@ FIND_LIBRARY(FIND_DUMMY_LIB
# Test SET_SOURCE_FILES_PROPERTIES # Test SET_SOURCE_FILES_PROPERTIES
# #
SET_SOURCE_FILES_PROPERTIES(nonexisting_file2 SET_SOURCE_FILES_PROPERTIES(nonexisting_file2
GENERATED GENERATED
ABSTRACT ABSTRACT
WRAP_EXCLUDE WRAP_EXCLUDE
COMPILE_FLAGS "-foo -bar") COMPILE_FLAGS "-foo -bar")
GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file2 ABSTRACT) GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file2 ABSTRACT)
GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file2 WRAP_EXCLUDE) GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file2 WRAP_EXCLUDE)
GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file2 COMPILE_FLAGS) GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file2 COMPILE_FLAGS)
SET_SOURCE_FILES_PROPERTIES(nonexisting_file3 PROPERTIES SET_SOURCE_FILES_PROPERTIES(nonexisting_file3 PROPERTIES
GENERATED 1 GENERATED 1
ABSTRACT 1 ABSTRACT 1
WRAP_EXCLUDE 1 WRAP_EXCLUDE 1
COMPILE_FLAGS "-foo -bar") COMPILE_FLAGS "-foo -bar")
GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file3 ABSTRACT) GET_SOURCE_FILE_PROPERTY(FILE_HAS_ABSTRACT nonexisting_file3 ABSTRACT)
GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file3 WRAP_EXCLUDE) GET_SOURCE_FILE_PROPERTY(FILE_HAS_WRAP_EXCLUDE nonexisting_file3 WRAP_EXCLUDE)
GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file3 COMPILE_FLAGS) GET_SOURCE_FILE_PROPERTY(FILE_COMPILE_FLAGS nonexisting_file3 COMPILE_FLAGS)
@ -181,8 +182,8 @@ IF (WIN32)
COPYONLY IMMEDIATE) COPYONLY IMMEDIATE)
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E write_regv \"${hkey}\" \"${dir}\"") EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E write_regv \"${hkey}\" \"${dir}\"")
FIND_PATH(REGISTRY_TEST_PATH FIND_PATH(REGISTRY_TEST_PATH
${file} ${file}
"[${hkey}]" DOC "Registry_Test_Path") "[${hkey}]" DOC "Registry_Test_Path")
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E delete_regv \"${hkey}\"") EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E delete_regv \"${hkey}\"")
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E remove \"${dir}/${file}\"") EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E remove \"${dir}/${file}\"")
ENDIF (NOT UNIX) ENDIF (NOT UNIX)
@ -238,7 +239,7 @@ IF("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$")
ENDIF("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$") ENDIF("x${RESULT}" MATCHES "^xa\\[b\\]c\\[d\\]e$")
IF(NOT STRING_REGEX_PASSED) IF(NOT STRING_REGEX_PASSED)
MESSAGE(SEND_ERROR MESSAGE(SEND_ERROR
"STRING(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")") "STRING(REGEX REPLACE ... ) test failed (\"${RESULT}\" v. \"a[b]c[d]e\")")
ENDIF(NOT STRING_REGEX_PASSED) ENDIF(NOT STRING_REGEX_PASSED)
# #

View File

@ -15,6 +15,9 @@ extern "C" {
int cm_passed = 0; int cm_passed = 0;
int cm_failed = 0; int cm_failed = 0;
#ifndef CMAKE_IS_REALLY_FUN
This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work
#endif
// Here is a stupid function that tries to use std::string methods // Here is a stupid function that tries to use std::string methods
// so that the dec cxx compiler will instantiate the stuff that // so that the dec cxx compiler will instantiate the stuff that
// we are using from the CMakeLib library.... // we are using from the CMakeLib library....

View File

@ -1,3 +1,5 @@
REMOVE_DEFINITIONS(-DCMAKE_IS_REALLY_FUN)
# #
# Small utility used to create file # Small utility used to create file
# UTILITY_SOURCE is used for coverage and for getting the exact name # UTILITY_SOURCE is used for coverage and for getting the exact name

View File

@ -1,5 +1,9 @@
#include <string.h> #include <string.h>
#ifdef CMAKE_IS_REALLY_FUN
This is a problem. Looks like REMOVE_DEFINITION does not work
#endif
int file2() int file2()
{ {
return 1; return 1;