[CMake][cleanup] use INTERFACE (#3517)

* [cleanup][CMake] Use INTERFACE for libcodelite * [cleanup][CMake] Use INTERFACE for plugin
eranif · Nov 3, 2024 · cce3ea4 · cce3ea4
1 parent 4506e46
commit cce3ea4
Show file tree

Hide file tree

Showing 53 changed files with 43 additions and 505 deletions.
diff --git a/AutoSave/CMakeLists.txt b/AutoSave/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 file(GLOB SRCS "*.cpp")
 
 # Define the output

diff --git a/CMakePlugin/CMakeLists.txt b/CMakePlugin/CMakeLists.txt
@@ -15,21 +15,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories(
-    "${CL_SRC_ROOT}/Plugin"
-    "${CL_SRC_ROOT}/sdk/wxsqlite3/include"
-    "${CL_SRC_ROOT}/CodeLite"
-    "${CL_SRC_ROOT}/CodeLite/ssh"
-    "${CL_SRC_ROOT}/LiteEditor"
-    "${CL_SRC_ROOT}/PCH"
-    "${CL_SRC_ROOT}/Interfaces")
-
-# Define some macros about DLL
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-add_definitions(-DWXUSINGDLL_SDK)
-
 # Only with precompiled headers
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")

diff --git a/CallGraph/CMakeLists.txt b/CallGraph/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/ChatAI/CMakeLists.txt b/ChatAI/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/CodeFormatter/CMakeLists.txt b/CodeFormatter/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/CodeLite/CMakeLists.txt b/CodeLite/CMakeLists.txt
@@ -23,65 +23,39 @@ FLEX_TARGET(XmlFlex "${CMAKE_SOURCE_DIR}/CodeLite/XML/XMLLexer.l" "${CMAKE_CURRE
 
 set(FlexSrcs "${FLEX_CxxFlex_OUTPUTS}" "${FLEX_IncludeFinderFlex_OUTPUTS}" "${FLEX_PhpFlex_OUTPUTS}" "${FLEX_XmlFlex_OUTPUTS}")
 
+file(GLOB_RECURSE SRCS "*.cpp" "*.h" "*.hpp")
+
+add_library(libcodelite SHARED ${SRCS} ${FlexSrcs})
+
 # Include paths
-include_directories(
+target_include_directories(libcodelite
+    PUBLIC
     "${CL_SRC_ROOT}/sdk/wxsqlite3/include"
-    "${CL_SRC_ROOT}/submodules/websocketpp"
-    "${CL_SRC_ROOT}/submodules/asio/asio/include"
     "${CL_SRC_ROOT}/CodeLite"
     "${CL_SRC_ROOT}/CodeLite/ssh"
     "${CL_SRC_ROOT}/PCH"
-    "${CL_SRC_ROOT}/Interfaces"
-    "${CL_SRC_ROOT}/CodeLite/ssh")
-
-set(ADDITIONAL_LIBRARIES "")
-
-if(UNIX)
-    if(IS_FREEBSD)
-        set(ADDITIONAL_LIBRARIES "-lkvm -lutil")
-    elseif(IS_NETBSD)
-        set(ADDTIONAL_LIBRARIES "-lutil")
-    elseif(UNIX AND NOT APPLE)
-        set(ADDITIONAL_LIBRARIES "-ldl -lutil")
-    endif()
-else(UNIX)
-    set(ADDITIONAL_LIBRARIES "-lws2_32")
-endif(UNIX)
-
+    PRIVATE
+    "${CL_SRC_ROOT}/submodules/asio/asio/include"
+    "${CL_SRC_ROOT}/submodules/websocketpp"
+)
 # Macros
 if(WIN32)
-    add_definitions(-DWXMAKINGDLL_CL)
-endif(WIN32)
+    target_compile_definitions(libcodelite PRIVATE WXMAKINGDLL_CL INTERFACE WXUSINGDLL_CL)
+    target_compile_definitions(libcodelite PUBLIC WXUSINGDLL_WXSQLITE3)
+endif()
 
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)
 endif()
 
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-
 # Add RPATH
 if(NOT MINGW AND WXC_APP)
     string(REPLACE "codelite" "wxcrafter" WXC_LIBS_DIR ${PLUGINS_DIR})
     set(LINKER_OPTIONS -Wl,-rpath,"${WXC_LIBS_DIR}")
     message("-- libcodelite.so is using RPATH set to ${WXC_LIBS_DIR}")
 endif()
 
-file(
-    GLOB
-    SRCS
-    "*.cpp"
-    "AsyncProcess/*.cpp"
-    "Console/*.cpp"
-    "Cxx/*.cpp"
-    "LSP/*.cpp"
-    "PHP/*.cpp"
-    "Platform/*.cpp"
-    "SocketAPI/*.cpp"
-    "XML/*.cpp"
-    "database/*.cpp"
-    "ssh/*.cpp")
-
 # Define GTK libraries
 if(GTK2_FOUND)
     set(GTK_LIBS "${GTK2_LIBRARIES}")
@@ -91,8 +65,18 @@ else()
     set(GTK_LIBS "")
 endif()
 
-# Define the output
-add_library(libcodelite SHARED ${SRCS} ${FlexSrcs})
+set(ADDITIONAL_LIBRARIES "")
+if(UNIX)
+    if(IS_FREEBSD)
+        set(ADDITIONAL_LIBRARIES "-lkvm -lutil")
+    elseif(IS_NETBSD)
+        set(ADDTIONAL_LIBRARIES "-lutil")
+    elseif(UNIX AND NOT APPLE)
+        set(ADDITIONAL_LIBRARIES "-ldl -lutil")
+    endif()
+else(UNIX)
+    set(ADDITIONAL_LIBRARIES "-lws2_32")
+endif(UNIX)
 
 if(UNIX OR APPLE)
     set_target_properties(libcodelite PROPERTIES POSITION_INDEPENDENT_CODE ON)

diff --git a/CodeLiteDiff/CMakeLists.txt b/CodeLiteDiff/CMakeLists.txt
@@ -11,21 +11,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories(
-    "${CL_SRC_ROOT}/Plugin"
-    "${CL_SRC_ROOT}/sdk/wxsqlite3/include"
-    "${CL_SRC_ROOT}/CodeLite"
-    "${CL_SRC_ROOT}/CodeLite/ssh"
-    "${CL_SRC_ROOT}/LiteEditor"
-    "${CL_SRC_ROOT}/PCH"
-    "${CL_SRC_ROOT}/Interfaces")
-
-# Define some macros about DLL
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-add_definitions(-DWXUSINGDLL_SDK)
-
 # Only with precompiled headers
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")

diff --git a/ContinuousBuild/CMakeLists.txt b/ContinuousBuild/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/Copyright/CMakeLists.txt b/Copyright/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/CxxParserTests/CMakeLists.txt b/CxxParserTests/CMakeLists.txt
@@ -5,14 +5,6 @@ project(CxxLocalVariables)
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/DatabaseExplorer/CMakeLists.txt b/DatabaseExplorer/CMakeLists.txt
@@ -59,17 +59,8 @@ endif()
 
 # Include paths
 include_directories(
-    "${CL_SRC_ROOT}/Plugin"
-    "${CL_SRC_ROOT}/sdk/wxsqlite3/include"
-    "${CL_SRC_ROOT}/CodeLite"
-    "${CL_SRC_ROOT}/CodeLite/ssh"
-    "${CL_SRC_ROOT}/PCH"
-    "${CL_SRC_ROOT}/Interfaces"
     "${CL_SRC_ROOT}/sdk/databaselayer/include")
 
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
 add_definitions(-DDBL_USE_SQLITE)
 
 file(GLOB SRCS "*.cpp")

diff --git a/DebugAdapterClient/CMakeLists.txt b/DebugAdapterClient/CMakeLists.txt
@@ -8,21 +8,6 @@ add_subdirectory("${CL_SRC_ROOT}/submodules/wxdap/dap" ${CMAKE_LIBRARY_OUTPUT_DI
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories(
-    "${CL_SRC_ROOT}/Plugin"
-    "${CL_SRC_ROOT}/sdk/wxsqlite3/include"
-    "${CL_SRC_ROOT}/CodeLite"
-    "${CL_SRC_ROOT}/CodeLite/ssh"
-    "${CL_SRC_ROOT}/PCH"
-    "${CL_SRC_ROOT}/Interfaces"
-    "${CL_SRC_ROOT}/submodules/wxdap")
-# Definitions
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-add_definitions(-DWXUSINGDLL_DAP)
-
 # By default, use the sources under the current folder
 file(GLOB PLUGIN_SRCS "*.cpp")
 
@@ -39,6 +24,7 @@ target_link_libraries(
     libcodelite
     plugin
     dapcxx)
+target_include_directories(${PLUGIN_NAME} PRIVATE "${CL_SRC_ROOT}/submodules/wxdap")
 # Installation destination
 cl_install_plugin(${PLUGIN_NAME})
 codelite_install_library_target(dapcxx)
diff --git a/Debugger/CMakeLists.txt b/Debugger/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/Docker/CMakeLists.txt b/Docker/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/EOSWiki/CMakeLists.txt b/EOSWiki/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/EditorConfigPlugin/CMakeLists.txt b/EditorConfigPlugin/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/ExternalTools/CMakeLists.txt b/ExternalTools/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)

diff --git a/Gizmos/CMakeLists.txt b/Gizmos/CMakeLists.txt
@@ -9,14 +9,6 @@ project(${PLUGIN_NAME})
 # wxWidgets include (this will do all the magic to configure everything)
 include("${wxWidgets_USE_FILE}")
 
-# Include paths
-include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite"
-                    "${CL_SRC_ROOT}/CodeLite/ssh" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-add_definitions(-DWXUSINGDLL_WXSQLITE3)
-add_definitions(-DWXUSINGDLL_CL)
-add_definitions(-DWXUSINGDLL_SDK)
-
 if(USE_PCH AND NOT MINGW)
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)