Browse Source

CMake: Use PROJECT_BINARY_DIR instead of CMAKE_BINARY_DIR

pull/1/merge
Daniel Scharrer 9 years ago
parent
commit
b6921fd277
  1. 4
      CMakeLists.txt
  2. 4
      cmake/CompileCheck.cmake
  3. 2
      cmake/Doxygen.cmake

4
CMakeLists.txt

@ -405,7 +405,7 @@ include_directories(src ${CMAKE_CURRENT_BINARY_DIR})
configure_file("src/configure.hpp.in" "configure.hpp")
set(VERSION_FILE "${CMAKE_BINARY_DIR}/release.cpp")
set(VERSION_FILE "${PROJECT_BINARY_DIR}/release.cpp")
set(VERSION_SOURCES VERSION "VERSION" LICENSE "LICENSE")
version_file("src/release.cpp.in" "${VERSION_FILE}" "${VERSION_SOURCES}" ".git")
list(APPEND INNOEXTRACT_SOURCES ${VERSION_FILE})
@ -425,7 +425,7 @@ install(FILES doc/innoextract.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 OPTIONA
add_style_check_target(style "${ALL_INNOEXTRACT_SOURCES}" innoextract)
add_doxygen_target(doc "doc/Doxyfile.in" "VERSION" ".git" "${CMAKE_BINARY_DIR}/doc")
add_doxygen_target(doc "doc/Doxyfile.in" "VERSION" ".git" "${PROJECT_BINARY_DIR}/doc")
# Print a configuration summary

4
cmake/CompileCheck.cmake

@ -74,7 +74,7 @@ function(check_compile RESULT FILE FLAG TYPE)
# Check if we can compile and link a simple file with the new flags
try_compile(
check_compiler_flag ${CMAKE_BINARY_DIR} ${FILE}
check_compiler_flag ${PROJECT_BINARY_DIR} ${FILE}
CMAKE_FLAGS "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
"-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}"
"-DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}"
@ -178,7 +178,7 @@ function(try_link_library LIBRARY_NAME LIBRARY_FILE ERROR_VAR)
list(APPEND LIBRARY_FILE "${CMAKE_THREAD_LIBS_INIT}")
endif()
try_compile(
CHECK_${LIBRARY_NAME}_LINK "${CMAKE_BINARY_DIR}" "${link_test_file}"
CHECK_${LIBRARY_NAME}_LINK "${PROJECT_BINARY_DIR}" "${link_test_file}"
CMAKE_FLAGS "-DLINK_LIBRARIES=${LIBRARY_FILE}"
"-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
"-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}"

2
cmake/Doxygen.cmake

@ -42,7 +42,7 @@ function(add_doxygen_target TARGET_NAME DOXYFILE_IN VERSION_FILE GIT_DIR OUT_DIR
return()
endif()
set(doxyfile "${CMAKE_BINARY_DIR}/Doxyfile.${TARGET_NAME}")
set(doxyfile "${PROJECT_BINARY_DIR}/Doxyfile.${TARGET_NAME}")
set(defines "-DDOXYGEN_OUTPUT_DIR=${OUT_DIR}")
version_file("${DOXYFILE_IN}" "${doxyfile}" "${VERSION_FILE}" "${GIT_DIR}" "${defines}")

Loading…
Cancel
Save