Skip to content
Snippets Groups Projects
Commit f9e429b6 authored by Martin Beseda's avatar Martin Beseda
Browse files

[FIX] Fixed structure of folders built

parent 61098f3a
No related branches found
No related tags found
No related merge requests found
......@@ -58,6 +58,7 @@ endif()
#--------------------------------#
set(CMAKE_CXX_STANDARD 17)
# Debug memory errors
#add_compile_options(-fsanitize=address)
#add_link_options(-fsanitize=address -static-libasan)
......@@ -94,9 +95,6 @@ endif()
set(ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
set(SRC_DIR ${ROOT_DIR}/src)
set(PROJECT_BINARY_DIR ${ROOT_DIR}/build)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
#----------------------------------------#
# Set prefixes and suffixes of libraries #
......
......@@ -148,10 +148,10 @@ if ("${BUILD_LIB}" STREQUAL "yes")
endif ()
if ("${BUILD_TESTS}" STREQUAL "yes")
add_subdirectory(tests tests)
add_subdirectory(tests)
endif ()
if ("${BUILD_EXAMPLES}" STREQUAL "yes")
add_subdirectory(examples examples)
add_subdirectory(examples)
endif ()
......@@ -55,7 +55,6 @@ set_target_properties(
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib/"
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin/examples"
)
#in case the modular make does not compile library itself
......
......@@ -80,6 +80,5 @@ set_target_properties(
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/unit-tests"
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment