From 9b9dd3a465e8b75b27e0dd128bc57ebd4ad7046d Mon Sep 17 00:00:00 2001 From: Simon Rohou Date: Sat, 19 Oct 2024 14:32:29 +0200 Subject: [PATCH] [cmake] using PROJECT_NAME instead of 'codac' (codac4matlab) --- src/CMakeLists.txt | 2 +- src/core/CMakeLists.txt | 6 +++--- src/graphics/CMakeLists.txt | 6 +++--- src/sympy/CMakeLists.txt | 4 ++-- src/unsupported/CMakeLists.txt | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d496638c2..f146faa78 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -115,7 +115,7 @@ # Generating file for #include # ==================================== - set(CODAC_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}) + set(CODAC_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac) file(WRITE ${CODAC_MAIN_HEADER} "/* This file is generated by CMake */\n\n") file(APPEND ${CODAC_MAIN_HEADER} "#pragma once\n\n") foreach(header_path ${CODAC_MAIN_SUBHEADERS}) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 216cd50af..131410ed6 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -162,7 +162,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/separators ${CMAKE_CURRENT_SOURCE_DIR}/tools ) - target_link_libraries(${PROJECT_NAME}-core PUBLIC codac-graphics Ibex::ibex Eigen3::Eigen) + target_link_libraries(${PROJECT_NAME}-core PUBLIC ${PROJECT_NAME}-graphics Ibex::ibex Eigen3::Eigen) ################################################################################ @@ -188,8 +188,8 @@ # Generating the file codac-core.h - set(CODAC_CORE_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-core.h) - set(CODAC_MAIN_SUBHEADERS ${CODAC_MAIN_SUBHEADERS} "${PROJECT_NAME}-core.h" PARENT_SCOPE) + set(CODAC_CORE_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac-core.h) + set(CODAC_MAIN_SUBHEADERS ${CODAC_MAIN_SUBHEADERS} "codac-core.h" PARENT_SCOPE) file(WRITE ${CODAC_CORE_MAIN_HEADER} "/* This file is generated by CMake */\n\n") file(APPEND ${CODAC_CORE_MAIN_HEADER} "#pragma once\n\n") foreach(header_path ${CODAC_CORE_HDR}) diff --git a/src/graphics/CMakeLists.txt b/src/graphics/CMakeLists.txt index 65cfb8f61..7b38751b6 100644 --- a/src/graphics/CMakeLists.txt +++ b/src/graphics/CMakeLists.txt @@ -43,7 +43,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/paver ${CMAKE_CURRENT_SOURCE_DIR}/styles ) - target_link_libraries(${PROJECT_NAME}-graphics PUBLIC codac-core Ibex::ibex Eigen3::Eigen) + target_link_libraries(${PROJECT_NAME}-graphics PUBLIC ${PROJECT_NAME}-core Ibex::ibex Eigen3::Eigen) ################################################################################ @@ -69,8 +69,8 @@ # Generating the file codac-graphics.h - set(CODAC_GRAPHICS_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-graphics.h) - set(CODAC_MAIN_SUBHEADERS ${CODAC_MAIN_SUBHEADERS} "${PROJECT_NAME}-graphics.h" PARENT_SCOPE) + set(CODAC_GRAPHICS_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac-graphics.h) + set(CODAC_MAIN_SUBHEADERS ${CODAC_MAIN_SUBHEADERS} "codac-graphics.h" PARENT_SCOPE) file(WRITE ${CODAC_GRAPHICS_MAIN_HEADER} "/* This file is generated by CMake */\n\n") file(APPEND ${CODAC_GRAPHICS_MAIN_HEADER} "#pragma once\n\n") foreach(header_path ${CODAC_GRAPHICS_HDR}) diff --git a/src/sympy/CMakeLists.txt b/src/sympy/CMakeLists.txt index 0c07e33c4..0c1bfaf2c 100644 --- a/src/sympy/CMakeLists.txt +++ b/src/sympy/CMakeLists.txt @@ -58,8 +58,8 @@ # Generating the file codac-sympy.h - set(CODAC_SYMPY_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-sympy.h) - set(CODAC_MAIN_SUBHEADERS ${CODAC_MAIN_SUBHEADERS} "${PROJECT_NAME}-sympy.h" PARENT_SCOPE) + set(CODAC_SYMPY_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac-sympy.h) + set(CODAC_MAIN_SUBHEADERS ${CODAC_MAIN_SUBHEADERS} "codac-sympy.h" PARENT_SCOPE) file(WRITE ${CODAC_SYMPY_MAIN_HEADER} "/* This file is generated by CMake */\n\n") file(APPEND ${CODAC_SYMPY_MAIN_HEADER} "#pragma once\n\n") foreach(header_path ${CODAC_SYMPY_HDR}) diff --git a/src/unsupported/CMakeLists.txt b/src/unsupported/CMakeLists.txt index 88998efba..efe341957 100644 --- a/src/unsupported/CMakeLists.txt +++ b/src/unsupported/CMakeLists.txt @@ -25,7 +25,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/paver ${CMAKE_CURRENT_SOURCE_DIR}/styles ) - target_link_libraries(${PROJECT_NAME}-unsupported PUBLIC codac-core Ibex::ibex Eigen3::Eigen) + target_link_libraries(${PROJECT_NAME}-unsupported PUBLIC ${PROJECT_NAME}-core Ibex::ibex Eigen3::Eigen) ################################################################################ @@ -51,8 +51,8 @@ # Generating the file codac-unsupported.h - set(CODAC_UNSUPPORTED_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-unsupported.h) - set(CODAC_MAIN_SUBHEADERS ${CODAC_MAIN_SUBHEADERS} "${PROJECT_NAME}-unsupported.h" PARENT_SCOPE) + set(CODAC_UNSUPPORTED_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac-unsupported.h) + set(CODAC_MAIN_SUBHEADERS ${CODAC_MAIN_SUBHEADERS} "codac-unsupported.h" PARENT_SCOPE) file(WRITE ${CODAC_UNSUPPORTED_MAIN_HEADER} "/* This file is generated by CMake */\n\n") file(APPEND ${CODAC_UNSUPPORTED_MAIN_HEADER} "#pragma once\n\n") foreach(header_path ${CODAC_UNSUPPORTED_HDR})