fixed executable building

Author: filipdutescu

CMakeLists.txt

@@ -16,7 +16,7 @@ project(
 
 include(cmake/StandardSettings.cmake)
 include(cmake/Utils.cmake)
-message("\nStarted CMake for ${PROJECT_NAME} v${PROJECT_VERSION}...\n")
+message(STATUS "Started CMake for ${PROJECT_NAME} v${PROJECT_VERSION}...\n")
 
 #
 # Setup alternative names
@@ -53,7 +53,8 @@ include(cmake/Vcpkg.cmake)
 include(cmake/SourcesAndHeaders.cmake)
 
 if(${PROJECT_NAME}_BUILD_EXECUTABLE)
-  add_executable(${PROJECT_NAME} ${sources})
+  add_executable(${PROJECT_NAME} ${exe_sources})
+  add_library(${PROJECT_NAME}_LIB ${headers} ${sources})
 elseif(${PROJECT_NAME}_BUILD_HEADERS_ONLY)
   add_library(${PROJECT_NAME} INTERFACE)
 else()
@@ -64,9 +65,15 @@ else()
   )
 endif()
 
-verbose_message("Found the following header files:\n${headers}\n")
-verbose_message("Found the following source files:\n${sources}\n")
-message("Added all header and implementation files.\n")
+verbose_message("Found the following header files:")
+verbose_message(${headers})
+verbose_message("Found the following source files:")
+if(${PROJECT_NAME}_BUILD_EXECUTABLE)
+	verbose_message(${exe_sources})
+else()
+	verbose_message(${sources})
+endif()
+message(STATUS "Added all header and implementation files.\n")
 
 #
 # Set the project standard and warnings
@@ -109,9 +116,19 @@ else()
     PRIVATE
       ${CMAKE_CURRENT_SOURCE_DIR}/src
   )
+	if(${PROJECT_NAME}_BUILD_EXECUTABLE)
+		target_include_directories(
+			${PROJECT_NAME}_LIB
+			PUBLIC 
+				$<INSTALL_INTERFACE:include>    
+				$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+			PRIVATE
+				${CMAKE_CURRENT_SOURCE_DIR}/src
+		)
+	endif()
 endif()
 
-message("Finished setting up include directories.")
+message(STATUS "Finished setting up include directories.")
 
 #
 # Model project dependencies 
@@ -254,17 +271,17 @@ if(${PROJECT_NAME}_GENERATE_EXPORT_HEADER)
       include
   )
 
-  message("Generated the export header `${PROJECT_NAME_LOWERCASE}_export.h` and installed it.")
+message(STATUS "Generated the export header `${PROJECT_NAME_LOWERCASE}_export.h` and installed it.")
 endif()
 
-message("Finished building requirements for installing the package.\n")
+message(STATUS "Finished building requirements for installing the package.\n")
 
 #
 # Unit testing setup
 #
 
 if(${PROJECT_NAME}_ENABLE_UNIT_TESTING)
   enable_testing()
-  message("Build unit tests for the project. Tests should always be found in the test folder\n")
+	message(STATUS "Build unit tests for the project. Tests should always be found in the test folder\n")
   add_subdirectory(test)
 endif()

cmake/SourcesAndHeaders.cmake

@@ -2,6 +2,11 @@ set(sources
     src/tmp.cpp
 )
 
+set(exe_sources
+		src/main.cpp
+		${sources}
+)
+
 set(headers
     include/project/tmp.hpp
 )

cmake/Utils.cmake

@@ -4,7 +4,7 @@
 
 function(verbose_message content)
     if(${PROJECT_NAME}_VERBOSE_OUTPUT)
-        message(${MESSAGE_TYPE} ${content})
+        message(VERBOSE ${content})
     endif()
 endfunction()
 
@@ -20,6 +20,6 @@ function(add_clang_format_target)
     add_custom_target(clang-format
         COMMAND ${${PROJECT_NAME}_CLANG_FORMAT_BINARY}
         -i ${CMAKE_CURRENT_LIST_DIR}/${sources} ${CMAKE_CURRENT_LIST_DIR}/${headers})
-    message("Format the project using the `clang-format` target (i.e: cmake --build build --target clang-format).\n")
+		message(STATUS "Format the project using the `clang-format` target (i.e: cmake --build build --target clang-format).\n")
     endif()
 endfunction()

src/main.cpp

@@ -0,0 +1,10 @@
+#include <iostream>
+
+#include <project/tmp.hpp>
+
+int main()
+{
+	std::cout << "Hello World!\n";
+
+	return 0;
+}

test/CMakeLists.txt

@@ -41,6 +41,12 @@ endif()
 #
 # Currently supported: GoogleTest (and GoogleMock), Catch2.
 
+if(${CMAKE_PROJECT_NAME}_BUILD_EXECUTABLE)
+	set(${CMAKE_PROJECT_NAME}_TEST_LIB ${CMAKE_PROJECT_NAME}_LIB)
+else()
+	set(${CMAKE_PROJECT_NAME}_TEST_LIB ${CMAKE_PROJECT_NAME})
+endif()
+
 if(${CMAKE_PROJECT_NAME}_USE_GTEST)
   find_package(GTest REQUIRED)
 
@@ -54,15 +60,15 @@ if(${CMAKE_PROJECT_NAME}_USE_GTEST)
       GTest::GTest
       GTest::Main
       ${GOOGLE_MOCK_LIBRARIES}
-      ${CMAKE_PROJECT_NAME}
+      ${${CMAKE_PROJECT_NAME}_TEST_LIB}
   )
 elseif(${CMAKE_PROJECT_NAME}_USE_CATCH2)
   find_package(Catch2 REQUIRED)
   target_link_libraries(
     ${PROJECT_NAME} 
     PUBLIC
       Catch2::Catch2
-      ${CMAKE_PROJECT_NAME}
+      ${${CMAKE_PROJECT_NAME}_TEST_LIB}
   )
 else()
   message(FATAL_ERROR "Unknown testing library. Please setup your desired unit testing library by using `target_link_libraries`.")