CMake fixes

CMakeLists.txt

@@ -18,9 +18,9 @@ endif()
 
 include(cmake_scripts/external-projects.cmake)
 
-if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-    message(STATUS "Using conan configuration: ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
-    include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+if (EXISTS ${PROJECT_BINARY_DIR}/conanbuildinfo.cmake)
+    message(STATUS "Using conan configuration: ${PROJECT_BINARY_DIR}/conanbuildinfo.cmake")
+    include(${PROJECT_BINARY_DIR}/conanbuildinfo.cmake)
     conan_basic_setup()
 endif()
 
@@ -81,7 +81,7 @@ macro(SET_CPP_STANDARD target)
 endmacro(SET_CPP_STANDARD)
 
 # We create a configuration file so that other code that include our header files gets the correct configuration.
-CONFIGURE_FILE(config.h.template ${CMAKE_BINARY_DIR}/generated-include/${PROJECT_NAME}/config.h)
+CONFIGURE_FILE(config.h.template ${PROJECT_BINARY_DIR}/generated-include/${PROJECT_NAME}/config.h)
 
 set(ACTUAL_SOURCES
     src/ChunkedReaderImpl.cpp
@@ -123,8 +123,8 @@ add_library(${PROJECT_NAME} ${SOURCES})
 set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_OUTPUT_NAME restc-cppD)
 target_include_directories(${PROJECT_NAME}
     PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
-        $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-include>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
     )
 
@@ -182,9 +182,6 @@ if (NOT EMBEDDED_RESTC_CPP)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
     endif()
 
-    set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib CACHE PATH "Destination location")
-    link_directories(${LIBRARY_OUTPUT_PATH})
-
     include(cmake_scripts/doxygen.cmake)
 
     target_include_directories(${PROJECT_NAME}
@@ -197,7 +194,7 @@ if (NOT EMBEDDED_RESTC_CPP)
 endif()
 
 include(cmake_scripts/install.cmake)
-install(DIRECTORY ${CMAKE_BINARY_DIR}/generated-include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(DIRECTORY ${PROJECT_BINARY_DIR}/generated-include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 if (RESTC_CPP_WITH_UNIT_TESTS OR RESTC_CPP_WITH_FUNCTIONALT_TESTS)
     enable_testing()

cmake_scripts/external-projects.cmake

@@ -4,7 +4,7 @@
 # add_dependencies(TARGET externalProjectName)
 # target_link_libraries(TARGET PRIVATE ExternalLibraryName)
 
-set(EXTERNAL_PROJECTS_PREFIX ${CMAKE_BINARY_DIR}/external-projects)
+set(EXTERNAL_PROJECTS_PREFIX ${PROJECT_BINARY_DIR}/external-projects)
 set(EXTERNAL_PROJECTS_INSTALL_PREFIX ${EXTERNAL_PROJECTS_PREFIX}/installed)
 
 include(ExternalProject)

cmake_scripts/install.cmake

@@ -13,30 +13,30 @@ generate_export_header(${PROJECT_NAME}
     EXPORT_MACRO_NAME EXPORT
     NO_EXPORT_MACRO_NAME NO_EXPORT
     PREFIX_NAME RESTC_CPP_
-    EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/include-exports/${PROJECT_NAME}/export.h)
+    EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include-exports/${PROJECT_NAME}/export.h)
 target_include_directories(${PROJECT_NAME}
-    PUBLIC $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include-exports> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include-exports> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
-install(DIRECTORY ${CMAKE_BINARY_DIR}/include-exports/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(DIRECTORY ${PROJECT_BINARY_DIR}/include-exports/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 include(CMakePackageConfigHelpers)
 set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${PROJECT_VERSION})
 set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${PROJECT_VERSION_MAJOR})
 set_property(TARGET ${PROJECT_NAME} PROPERTY INTERFACE_${PROJECT_NAME}_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
 set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPATIBLE_INTERFACE_STRING ${PROJECT_VERSION_MAJOR})
 write_basic_package_version_file(
-    "${CMAKE_BINARY_DIR}/CMakePackage/${PROJECT_NAME}ConfigVersion.cmake"
+    "${PROJECT_BINARY_DIR}/CMakePackage/${PROJECT_NAME}ConfigVersion.cmake"
     VERSION ${PROJECT_VERSION}
     COMPATIBILITY SameMajorVersion
 )
 export(EXPORT ${PROJECT_NAME}Targets
-    FILE "${CMAKE_BINARY_DIR}/CMakePackage/${PROJECT_NAME}.cmake"
+    FILE "${PROJECT_BINARY_DIR}/CMakePackage/${PROJECT_NAME}.cmake"
 )
 SET(CONFIG_SOURCE_DIR ${CMAKE_SOURCE_DIR})
-SET(CONFIG_DIR ${CMAKE_BINARY_DIR})
+SET(CONFIG_DIR ${PROJECT_BINARY_DIR})
 SET(${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_SOURCE_DIR}/include")
-configure_package_config_file(${CMAKE_SOURCE_DIR}/cmake_scripts/${PROJECT_NAME}Config.cmake.in
-    "${CMAKE_BINARY_DIR}/CMakePackage/${PROJECT_NAME}Config.cmake"
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake_scripts/${PROJECT_NAME}Config.cmake.in
+    "${PROJECT_BINARY_DIR}/CMakePackage/${PROJECT_NAME}Config.cmake"
     INSTALL_DESTINATION lib/cmake/${PROJECT_NAME}
     PATH_VARS ${PROJECT_NAME}_INCLUDE_DIR)
 install(EXPORT ${PROJECT_NAME}Targets
@@ -45,8 +45,8 @@ install(EXPORT ${PROJECT_NAME}Targets
 )
 install(
     FILES
-        "${CMAKE_BINARY_DIR}/CMakePackage/${PROJECT_NAME}Config.cmake"
-        "${CMAKE_BINARY_DIR}/CMakePackage/${PROJECT_NAME}ConfigVersion.cmake"
+        "${PROJECT_BINARY_DIR}/CMakePackage/${PROJECT_NAME}Config.cmake"
+        "${PROJECT_BINARY_DIR}/CMakePackage/${PROJECT_NAME}ConfigVersion.cmake"
     DESTINATION lib/cmake/${PROJECT_NAME}
     COMPONENT Devel
 )