Skip to content

Commit

Permalink
Merge pull request #1 from danimtb/feature/update_sources
Browse files Browse the repository at this point in the history
Update sources with release/debug output
  • Loading branch information
danimtb committed Mar 19, 2020
2 parents 19380c3 + a217331 commit 7160a88
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -9,7 +9,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/bin)
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})

ADD_LIBRARY(hello hello.cpp)
ADD_EXECUTABLE(greet main.cpp)
TARGET_LINK_LIBRARIES(greet hello)
8 changes: 6 additions & 2 deletions hello.cpp
Expand Up @@ -4,5 +4,9 @@


void hello() {
std::cout << "Hello World!" << std::endl;
}
#ifdef NDEBUG
std::cout << "Hello World Release!" <<std::endl;
#else
std::cout << "Hello World Debug!" <<std::endl;
#endif
}
3 changes: 2 additions & 1 deletion readme.md
@@ -1,6 +1,7 @@
# C++ Hello World

This is a "Hello World" library (``hello``) and application (``greet``) used for demo purposes on examples about Conan C/C++ Package Manager.
This is a "Hello World" library (``hello``) and application (``greet``)
used for demo purposes on examples about Conan C/C++ Package Manager.

## License

Expand Down

0 comments on commit 7160a88

Please sign in to comment.