Skip to content

Commit

Permalink
CMake: remove CUSTOM_(LINK|INCLUDE)_DIR
Browse files Browse the repository at this point in the history
When some header or library is not found introduce a proper find_* call for it
and use the results. Especially injecting additional link directories would just
confuse the automatic library ordering done by CMake and is basically never the
right solution for any link problem.
  • Loading branch information
DerDakon authored and Rolf Eike Beer committed Oct 20, 2017
1 parent 0d7be02 commit 28f0978
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions CMakeLists.txt
Expand Up @@ -99,8 +99,6 @@ set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS})
set(GENERATED_SRC "${CMAKE_BINARY_DIR}/generated_src" CACHE INTERNAL "Stores generated files")
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set(CUSTOM_INCLUDE_DIR "" CACHE FILEPATH "Extra include path")
set(CUSTOM_LINK_DIR "" CACHE FILEPATH "Extra library path")

# place binaries for all build types in the same directory, so we know where to find it
# when running tests or generating docs
Expand All @@ -123,14 +121,6 @@ else ()
endif()
set(LANG_CODES ${lcodes} CACHE STRING "List of language codes for which translations should be compiled in")

if (CUSTOM_INCLUDE_DIR)
include_directories(${CUSTOM_INCLUDE_DIR})
endif()

if (CUSTOM_LINK_DIR)
link_directories(${CUSTOM_LINK_DIR})
endif()

if (win_static)
set(CompilerFlags
CMAKE_CXX_FLAGS
Expand Down

0 comments on commit 28f0978

Please sign in to comment.