From d2d88ba7c531867a83deb22b50bd010f10afb5c1 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Mon, 21 Sep 2020 09:04:40 +0300 Subject: [PATCH] Add 'psemek-' prefix to all psemek targets --- libs/CMakeLists.txt | 14 ++++++++------ libs/app/CMakeLists.txt | 6 +++--- libs/cg/CMakeLists.txt | 8 ++++---- libs/geom/CMakeLists.txt | 10 +++++----- libs/gfx/CMakeLists.txt | 8 ++++---- libs/log/CMakeLists.txt | 6 +++--- libs/pcg/CMakeLists.txt | 6 +++--- libs/util/CMakeLists.txt | 6 +++--- 8 files changed, 33 insertions(+), 31 deletions(-) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 3963cba9..833dac91 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -1,11 +1,13 @@ -file(GLOB PSEMEK_LIBRARIES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*") -list(REMOVE_ITEM PSEMEK_LIBRARIES "CMakeLists.txt") +file(GLOB PSEMEK_LIB_DIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*") +list(REMOVE_ITEM PSEMEK_LIB_DIRS "CMakeLists.txt") +set(PSEMEK_LIBRARIES) -foreach(lib ${PSEMEK_LIBRARIES}) +foreach(lib ${PSEMEK_LIB_DIRS}) add_subdirectory(${lib}) - target_compile_definitions(${lib} PUBLIC ${PSEMEK_DEFINITIONS}) - target_compile_options(${lib} PUBLIC ${PSEMEK_CXX_FLAGS}) - set_target_properties(${lib} PROPERTIES EXCLUDE_FROM_ALL TRUE) + target_compile_definitions(psemek-${lib} PUBLIC ${PSEMEK_DEFINITIONS}) + target_compile_options(psemek-${lib} PUBLIC ${PSEMEK_CXX_FLAGS}) + set_target_properties(psemek-${lib} PROPERTIES EXCLUDE_FROM_ALL TRUE) + list(APPEND PSEMEK_LIBRARIES psemek-${lib}) endforeach() set(PSEMEK_LIBRARIES ${PSEMEK_LIBRARIES} PARENT_SCOPE) diff --git a/libs/app/CMakeLists.txt b/libs/app/CMakeLists.txt index f76ebe55..b13b1149 100644 --- a/libs/app/CMakeLists.txt +++ b/libs/app/CMakeLists.txt @@ -3,6 +3,6 @@ find_package(SDL2 REQUIRED) file(GLOB_RECURSE PSEMEK_APP_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.hpp") file(GLOB_RECURSE PSEMEK_APP_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp") -add_library(app ${PSEMEK_APP_HEADERS} ${PSEMEK_APP_SOURCES}) -target_include_directories(app PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${SDL2_INCLUDE_DIRS}") -target_link_libraries(app PUBLIC log util gfx ${SDL2_LIBRARIES}) +add_library(psemek-app ${PSEMEK_APP_HEADERS} ${PSEMEK_APP_SOURCES}) +target_include_directories(psemek-app PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(psemek-app PUBLIC psemek-log psemek-util psemek-gfx psemek-sdl2) diff --git a/libs/cg/CMakeLists.txt b/libs/cg/CMakeLists.txt index 6596be48..56ab6740 100644 --- a/libs/cg/CMakeLists.txt +++ b/libs/cg/CMakeLists.txt @@ -1,6 +1,6 @@ file(GLOB_RECURSE PSEMEK_CG_HEADERS "include/*.hpp") -add_library(cg ${PSEMEK_CG_HEADERS}) -target_include_directories(cg PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(cg PUBLIC geom util) -set_target_properties(cg PROPERTIES LINKER_LANGUAGE CXX) +add_library(psemek-cg ${PSEMEK_CG_HEADERS}) +target_include_directories(psemek-cg PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(psemek-cg PUBLIC psemek-geom psemek-util) +set_target_properties(psemek-cg PROPERTIES LINKER_LANGUAGE CXX) diff --git a/libs/geom/CMakeLists.txt b/libs/geom/CMakeLists.txt index 814df922..eb1c67b7 100644 --- a/libs/geom/CMakeLists.txt +++ b/libs/geom/CMakeLists.txt @@ -8,10 +8,10 @@ endif() file(GLOB_RECURSE PSEMEK_GEOM_HEADERS "include/*.hpp") file(GLOB_RECURSE PSEMEK_GEOM_SOURCES "source/*.cpp") -add_library(geom ${PSEMEK_GEOM_HEADERS} ${PSEMEK_GEOM_SOURCES}) -target_include_directories(geom PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(geom PUBLIC util) +add_library(psemek-geom ${PSEMEK_GEOM_HEADERS} ${PSEMEK_GEOM_SOURCES}) +target_include_directories(psemek-geom PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(psemek-geom PUBLIC psemek-util) if(PSEMEK_GEOM_ROBUST_PREDICATES) - target_link_libraries(geom PUBLIC Boost::boost GMP) - target_compile_definitions(geom PUBLIC -DPSEMEK_GEOM_ROBUST_PREDICATES=1) + target_link_libraries(psemek-geom PUBLIC Boost::boost GMP) + target_compile_definitions(psemek-geom PUBLIC -DPSEMEK_GEOM_ROBUST_PREDICATES=1) endif() diff --git a/libs/gfx/CMakeLists.txt b/libs/gfx/CMakeLists.txt index 82950d9e..144240f7 100644 --- a/libs/gfx/CMakeLists.txt +++ b/libs/gfx/CMakeLists.txt @@ -4,10 +4,10 @@ find_package(OpenGL REQUIRED) file(GLOB_RECURSE PSEMEK_GFX_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.hpp") file(GLOB_RECURSE PSEMEK_GFX_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp") -add_library(gfx ${PSEMEK_GFX_HEADERS} ${PSEMEK_GFX_SOURCES}) -target_include_directories(gfx PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(gfx PUBLIC util geom OpenGL::GL) +add_library(psemek-gfx ${PSEMEK_GFX_HEADERS} ${PSEMEK_GFX_SOURCES}) +target_include_directories(psemek-gfx PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(psemek-gfx PUBLIC psemek-util psemek-geom OpenGL::GL) -psemek_add_resources(gfx +psemek_add_resources(psemek-gfx resources/font_9x12.pbm psemek/gfx/resource/font_9x12 ) diff --git a/libs/log/CMakeLists.txt b/libs/log/CMakeLists.txt index ec0f9dac..049f16f1 100644 --- a/libs/log/CMakeLists.txt +++ b/libs/log/CMakeLists.txt @@ -3,6 +3,6 @@ find_package(Threads REQUIRED) file(GLOB_RECURSE PSEMEK_LOG_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.hpp") file(GLOB_RECURSE PSEMEK_LOG_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp") -add_library(log ${PSEMEK_LOG_HEADERS} ${PSEMEK_LOG_SOURCES}) -target_include_directories(log PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(log PUBLIC ${CMAKE_THREAD_LIBS_INIT}) +add_library(psemek-log ${PSEMEK_LOG_HEADERS} ${PSEMEK_LOG_SOURCES}) +target_include_directories(psemek-log PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(psemek-log PUBLIC ${CMAKE_THREAD_LIBS_INIT}) diff --git a/libs/pcg/CMakeLists.txt b/libs/pcg/CMakeLists.txt index c8408247..b7f9d64e 100644 --- a/libs/pcg/CMakeLists.txt +++ b/libs/pcg/CMakeLists.txt @@ -1,6 +1,6 @@ file(GLOB_RECURSE PSEMEK_PCG_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.hpp") file(GLOB_RECURSE PSEMEK_PCG_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp") -add_library(pcg ${PSEMEK_PCG_HEADERS} ${PSEMEK_PCG_SOURCES}) -target_include_directories(pcg PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(pcg PUBLIC util geom gfx) +add_library(psemek-pcg ${PSEMEK_PCG_HEADERS} ${PSEMEK_PCG_SOURCES}) +target_include_directories(psemek-pcg PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(psemek-pcg PUBLIC psemek-util psemek-geom psemek-gfx) diff --git a/libs/util/CMakeLists.txt b/libs/util/CMakeLists.txt index bb359c13..11b79d25 100644 --- a/libs/util/CMakeLists.txt +++ b/libs/util/CMakeLists.txt @@ -3,6 +3,6 @@ find_package(Threads REQUIRED) file(GLOB_RECURSE PSEMEK_UTIL_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.hpp") file(GLOB_RECURSE PSEMEK_UTIL_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp") -add_library(util ${PSEMEK_UTIL_HEADERS} ${PSEMEK_UTIL_SOURCES}) -target_include_directories(util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(util PUBLIC ${CMAKE_THREAD_LIBS_INIT}) +add_library(psemek-util ${PSEMEK_UTIL_HEADERS} ${PSEMEK_UTIL_SOURCES}) +target_include_directories(psemek-util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(psemek-util PUBLIC ${CMAKE_THREAD_LIBS_INIT})