diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-14 19:07:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-14 19:07:23 (GMT) |
| commit | 4c06e233071bac7821e27fece0c4d597c12798eb (patch) | |
| tree | 81e2bdc3c3be5c51b1a0969bd2b46f641ac0d941 /Tests | |
| parent | 6580f5de996e99e090ccf9fefa5a2c5d14694478 (diff) | |
| parent | eccc7d5d267d7dc4eab027fab54ef4e7a63c8d4f (diff) | |
| download | CMake-4c06e233071bac7821e27fece0c4d597c12798eb.zip CMake-4c06e233071bac7821e27fece0c4d597c12798eb.tar.gz CMake-4c06e233071bac7821e27fece0c4d597c12798eb.tar.bz2 | |
Merge topic 'resolve/fix_target_name_with_dot_vs10/allow_upper_case_cpp_and_others'
eccc7d5 Merge branch 'allow_upper_case_cpp_and_others' into resolve/fix_target_name_with_dot_vs10/allow_upper_case_cpp_and_others
ed37fc3 VS2010: Set IntDir for utility and global targets.
e79e412 VS2010: Honor PROJECT_LABEL target property (#10611)
530ade6 Fix targets with . in the name for VS 10 IDE.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CxxOnly/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/FunctionTest/CMakeLists.txt | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt index d621499..5d27890 100644 --- a/Tests/CxxOnly/CMakeLists.txt +++ b/Tests/CxxOnly/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix") if(WIN32) set(EXTRA_SRCS test.CPP) endif() -add_library(testcxx1 STATIC libcxx1.cxx ${EXTRA_SRCS}) +add_library(testcxx1.my STATIC libcxx1.cxx ${EXTRA_SRCS}) add_library(testcxx2 SHARED libcxx2.cxx) add_executable (CxxOnly cxxonly.cxx) -target_link_libraries(CxxOnly testcxx1 testcxx2) +target_link_libraries(CxxOnly testcxx1.my testcxx2) diff --git a/Tests/FunctionTest/CMakeLists.txt b/Tests/FunctionTest/CMakeLists.txt index ef55173..5d4f42d 100644 --- a/Tests/FunctionTest/CMakeLists.txt +++ b/Tests/FunctionTest/CMakeLists.txt @@ -166,3 +166,11 @@ ELSE(DEFINED SUBDIR_DEFINED) ENDIF(DEFINED SUBDIR_DEFINED) ADD_EXECUTABLE(FunctionTest functionTest.c) + +# Use the PROJECT_LABEL property: in IDEs, the project label should appear +# in the UI rather than the target name. If this were a good test of the +# property rather than just a smoke test, it would verify that the label +# actually appears in the UI of the IDE... Or at least that the text appears +# somewhere in the generated project files. +SET_PROPERTY(TARGET miniFunctionTest + PROPERTY PROJECT_LABEL "Test de Fonctionnement") |