Skip to content

Commit 28f0978

Browse files
DerDakonRolf Eike Beer
authored andcommitted
CMake: remove CUSTOM_(LINK|INCLUDE)_DIR
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.
1 parent 0d7be02 commit 28f0978

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS})
9999
set(GENERATED_SRC "${CMAKE_BINARY_DIR}/generated_src" CACHE INTERNAL "Stores generated files")
100100
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
101101
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
102-
set(CUSTOM_INCLUDE_DIR "" CACHE FILEPATH "Extra include path")
103-
set(CUSTOM_LINK_DIR "" CACHE FILEPATH "Extra library path")
104102

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

126-
if (CUSTOM_INCLUDE_DIR)
127-
include_directories(${CUSTOM_INCLUDE_DIR})
128-
endif()
129-
130-
if (CUSTOM_LINK_DIR)
131-
link_directories(${CUSTOM_LINK_DIR})
132-
endif()
133-
134124
if (win_static)
135125
set(CompilerFlags
136126
CMAKE_CXX_FLAGS

0 commit comments

Comments
 (0)