Dedup addprefix & delete unused defines from cmake

eng/native/functions.cmake

@@ -75,6 +75,15 @@ function(get_include_directories_asm IncludeDirectories)
     set(${IncludeDirectories} ${INC_DIRECTORIES} PARENT_SCOPE)
 endfunction(get_include_directories_asm)
 
+# Adds prefix to paths list
+function(addprefix var prefix list)
+  set(f)
+  foreach(i ${list})
+    set(f ${f} ${prefix}/${i})
+  endforeach()
+  set(${var} ${f} PARENT_SCOPE)
+endfunction()
+
 # Finds and returns unwind libs
 function(find_unwind_libs UnwindLibs)
     if(CLR_CMAKE_HOST_ARCH_ARM)

src/coreclr/vm/eventing/eventpipe/CMakeLists.txt

@@ -1,13 +1,5 @@
 include(FindPythonInterp)
 
-function(addprefix var prefix list)
-  set(f)
-  foreach(i ${list})
-    set(f ${f} ${prefix}/${i})
-  endforeach()
-  set(${var} ${f} PARENT_SCOPE)
-endfunction()
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(GENERATE_SCRIPT ${CLR_DIR}/scripts/genEventPipe.py)

src/mono/CMakeLists.txt

@@ -7,6 +7,7 @@ endif()
 project(mono)
 
 include(../../eng/native/configurepaths.cmake)
+include(${CLR_ENG_NATIVE_DIR}/functions.cmake)
 
 set(CMAKE_C_FLAGS_CHECKED "")
 set(CMAKE_CXX_FLAGS_CHECKED "")

src/mono/cmake/config.h.in

@@ -53,24 +53,6 @@
 #endif
 #endif
 
-/* Define to the full name of this package. */
-#cmakedefine PACKAGE_NAME 1
-
-/* Define to the one symbol short name of this package. */
-#cmakedefine PACKAGE_TARNAME 1
-
-/* Define to the version of this package. */
-#cmakedefine PACKAGE_VERSION 1
-
-/* Define to the full name and version of this package. */
-#cmakedefine PACKAGE_STRING 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#cmakedefine PACKAGE_BUGREPORT 1
-
-/* Define to the home page for this package. */
-#cmakedefine PACKAGE_URL 1
-
 /* This platform does not support symlinks */
 #cmakedefine HOST_NO_SYMLINKS 1
 
@@ -116,9 +98,6 @@
 /* Don't use UWP Windows API support */
 #cmakedefine HAVE_UWP_WINAPI_SUPPORT 1
 
-/* Define to 1 if you have the ANSI C header files. */
-#cmakedefine STDC_HEADERS 1
-
 /* Define to 1 if you have the <sys/types.h> header file. */
 #cmakedefine HAVE_SYS_TYPES_H 1
 

src/mono/cmake/defines-todo.cmake

@@ -14,12 +14,6 @@
 #option (HAVE_EPOLL "epoll_create1")
 #option (USE_KQUEUE_FOR_THREADPOOL "Use kqueue for the threadpool")
 #option (HAVE_SIOCGIFCONF "Can get interface list")
-#option (PACKAGE_NAME "Define to the full name of this package.")
-#option (PACKAGE_TARNAME "Define to the one symbol short name of this package.")
-#option (PACKAGE_VERSION "Define to the version of this package.")
-#option (PACKAGE_STRING "Define to the full name and version of this package.")
-#option (PACKAGE_BUGREPORT "Define to the address where bug reports for this package should be sent.")
-#option (PACKAGE_URL "Define to the home page for this package.")
 #option (HOST_NO_SYMLINKS "This platform does not support symlinks")
 #option (NEED_LINK_UNLINK "Define if Unix sockets cannot be created in an anonymous namespace")
 #option (HAVE_CLASSIC_WINAPI_SUPPORT "Use classic Windows API support")

src/mono/dlls/dbgshim/CMakeLists.txt

@@ -7,8 +7,7 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CLR_CMAKE_RUNTIME_MONO 1)
-set(CLR_DIR ${PROJECT_SOURCE_DIR}/../../../coreclr)
-set(VM_DIR ${PROJECT_SOURCE_DIR}/../../../coreclr/vm)
+set(CLR_DIR ${CLR_REPO_ROOT_DIR}/src/coreclr)
 set(CMAKE_OSX_ARCHITECTURES ${CMAKE_SYSTEM_PROCESSOR})
 set(CMAKE_EXE_LINKER_FLAGS_CHECKED "")
 set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "")

src/mono/dlls/mscordbi/CMakeLists.txt

@@ -7,8 +7,7 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CLR_CMAKE_RUNTIME_MONO 1)
-set(CLR_DIR ${PROJECT_SOURCE_DIR}/../../../coreclr)
-set(VM_DIR ${PROJECT_SOURCE_DIR}/../../../coreclr/vm)
+set(CLR_DIR ${CLR_REPO_ROOT_DIR}/src/coreclr)
 set(CMAKE_OSX_ARCHITECTURES ${CMAKE_SYSTEM_PROCESSOR})
 set(CMAKE_EXE_LINKER_FLAGS_CHECKED "")
 set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "")

src/mono/mono/eventpipe/gen-eventing.cmake

@@ -1,6 +1,6 @@
 if(ENABLE_PERFTRACING)
 
-    set(CORECLR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../coreclr)
+    set(CORECLR_DIR ${CLR_REPO_ROOT_DIR}/src/coreclr)
     set(CORECLR_VM_DIR ${CORECLR_DIR}/vm)
 
     set(EVENT_MANIFEST ${CORECLR_VM_DIR}/ClrEtwAll.man)
@@ -92,7 +92,7 @@ if(ENABLE_PERFTRACING)
 
     set_source_files_properties(${MONO_EVENTPIPE_GEN_SOURCES} PROPERTIES GENERATED TRUE)
 
-    add_custom_target(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-gen-sources 
+    add_custom_target(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-gen-sources
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-gen-sources.timestamp ${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-gen-headers)
 else(ENABLE_PERFTRACING)
     add_custom_target(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-gen-headers)