Commit ff306934 by Maarten L. Hekkelman

Merge branch 'trunk' of github.com:PDB-REDO/dssp into trunk

parents ed7b9c8f 60b76a50
......@@ -117,7 +117,7 @@ add_executable(mkdssp
${PROJECT_SOURCE_DIR}/src/mkdssp.cpp
$<TARGET_OBJECTS:dssp_library>)
target_include_directories(mkdssp PRIVATE ${CMAKE_BINARY_DIR})
target_include_directories(mkdssp PRIVATE ${PROJECT_BINARY_DIR})
target_link_libraries(mkdssp PRIVATE dssp_library cifpp::cifpp date::date libconfig::libconfig gxrio::gxrio)
if(USE_RSRC)
......
......@@ -42,14 +42,14 @@ function(write_version_header)
set(BUILD_VERSION_STRING "no git info available")
endif()
include_directories(${CMAKE_BINARY_DIR} PRIVATE)
include_directories(${PROJECT_BINARY_DIR} PRIVATE)
string(TIMESTAMP BUILD_DATE_TIME "%Y-%m-%dT%H:%M:%SZ" UTC)
if(ARGC GREATER 0)
set(VAR_PREFIX "${ARGV0}")
endif()
file(WRITE "${CMAKE_BINARY_DIR}/revision.hpp.in" [[// Generated revision file
file(WRITE "${PROJECT_BINARY_DIR}/revision.hpp.in" [[// Generated revision file
#pragma once
......@@ -72,6 +72,6 @@ inline void write_version_string(std::ostream &os, bool verbose)
}
}
]])
configure_file("${CMAKE_BINARY_DIR}/revision.hpp.in" "${CMAKE_BINARY_DIR}/revision.hpp" @ONLY)
configure_file("${PROJECT_BINARY_DIR}/revision.hpp.in" "${PROJECT_BINARY_DIR}/revision.hpp" @ONLY)
endfunction()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment