From 18a87550a78b41ed7787dc0d20df51ceabd00a5a Mon Sep 17 00:00:00 2001 From: Pcornat Date: Wed, 7 Jan 2026 21:47:28 +0100 Subject: [PATCH] Revert "Test to put it as imported target" This reverts commit 5a5d362888bc5d9daa616ffb267398df93e8eb0a. --- CMakeLists.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ddd30b..2385174 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,18 +54,21 @@ elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") set(LINKER_OPTIMIZED_OPTIONS ${LINKER_OPTIMIZED_OPTIONS} -fdevirtualize-at-ltrans) endif () -add_library(${PROJECT_NAME} OBJECT IMPORTED +add_library(${PROJECT_NAME} OBJECT src/window.cpp src/context_window.cpp src/opengl_context.cpp include/opengl_context.hpp ) -target_precompile_headers(${PROJECT_NAME} INTERFACE include/window.hpp include/basic_data.hpp include/context_window.hpp) -target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include) -target_compile_definitions(${PROJECT_NAME} INTERFACE GLFW_INCLUDE_NONE $<$,$>:_GLIBCXX_DEBUG>) -target_compile_options(${PROJECT_NAME} INTERFACE ${COMPILE_FLAGS} $<$:${COMPILE_OPTIMIZED_FLAGS}>) -target_link_options(${PROJECT_NAME} INTERFACE ${LINKER_OPTIONS} $<$:${LINKER_OPTIMIZED_OPTIONS}>) -target_link_libraries(${PROJECT_NAME} INTERFACE $<$:PkgConfig::Jemalloc> OpenGL::GL GLEW::GLEW glfw) +target_precompile_headers(${PROJECT_NAME} PUBLIC include/window.hpp include/basic_data.hpp include/context_window.hpp) +target_include_directories(${PROJECT_NAME} + PUBLIC $ + INTERFACE $ +) +target_compile_definitions(${PROJECT_NAME} PUBLIC GLFW_INCLUDE_NONE PRIVATE $<$,$>:_GLIBCXX_DEBUG>) +target_compile_options(${PROJECT_NAME} PUBLIC ${COMPILE_FLAGS} $<$:${COMPILE_OPTIMIZED_FLAGS}>) +target_link_options(${PROJECT_NAME} PUBLIC ${LINKER_OPTIONS} $<$:${LINKER_OPTIMIZED_OPTIONS}>) +target_link_libraries(${PROJECT_NAME} PUBLIC $<$:PkgConfig::Jemalloc> OpenGL::GL GLEW::GLEW glfw) set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 23 CXX_EXTENSIONS OFF UNITY_BUILD ON) if (IS_IPO_SUPPORTED) @@ -74,7 +77,7 @@ else () message(WARNING "IPO is not supported: ${IPO_OUTPUT_VERBOSE}") endif () -#[[install(TARGETS ${PROJECT_NAME} +install(TARGETS ${PROJECT_NAME} EXPORT windowGlfwGlLibTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -105,4 +108,4 @@ install(FILES install(FILES "${CMAKE_CURRENT_BINARY_DIR}/windowGlfwGlLibTargetsConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/windowGlfwGlLibTargets -)]] +)