diff options
Diffstat (limited to 'Tests/SameName')
| -rw-r--r-- | Tests/SameName/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/SameName/Exe1/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | Tests/SameName/Lib1/CMakeLists.txt | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Tests/SameName/CMakeLists.txt b/Tests/SameName/CMakeLists.txt index a4b993c..d78879d 100644 --- a/Tests/SameName/CMakeLists.txt +++ b/Tests/SameName/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required (VERSION 2.6) -PROJECT(SameName C) +project(SameName C) -ADD_SUBDIRECTORY(Lib1) +add_subdirectory(Lib1) -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/Lib1) -ADD_SUBDIRECTORY(Exe1) +include_directories(${PROJECT_SOURCE_DIR}/Lib1) +add_subdirectory(Exe1) diff --git a/Tests/SameName/Exe1/CMakeLists.txt b/Tests/SameName/Exe1/CMakeLists.txt index 3917a2f..b9182f2 100644 --- a/Tests/SameName/Exe1/CMakeLists.txt +++ b/Tests/SameName/Exe1/CMakeLists.txt @@ -1,11 +1,11 @@ # a target with the same name as a target in a different dir -ADD_EXECUTABLE(mytest_exe conly.c) -SET_TARGET_PROPERTIES(mytest_exe PROPERTIES OUTPUT_NAME mytest) -TARGET_LINK_LIBRARIES(mytest_exe mytest) +add_executable(mytest_exe conly.c) +set_target_properties(mytest_exe PROPERTIES OUTPUT_NAME mytest) +target_link_libraries(mytest_exe mytest) # and two targets in the same dir with the same name -ADD_LIBRARY(mytest2 ../Lib1/libc1.c) +add_library(mytest2 ../Lib1/libc1.c) -ADD_EXECUTABLE(mytest2_exe conly.c) -SET_TARGET_PROPERTIES(mytest2_exe PROPERTIES OUTPUT_NAME mytest2) -TARGET_LINK_LIBRARIES(mytest2_exe mytest2) +add_executable(mytest2_exe conly.c) +set_target_properties(mytest2_exe PROPERTIES OUTPUT_NAME mytest2) +target_link_libraries(mytest2_exe mytest2) diff --git a/Tests/SameName/Lib1/CMakeLists.txt b/Tests/SameName/Lib1/CMakeLists.txt index 67e7f68..40fa154 100644 --- a/Tests/SameName/Lib1/CMakeLists.txt +++ b/Tests/SameName/Lib1/CMakeLists.txt @@ -1 +1 @@ -ADD_LIBRARY(mytest libc1.c) +add_library(mytest libc1.c) |