Many improvment in build system

CMakeLists.txt

@@ -15,8 +15,8 @@ if(NOT PKG_CONFIG_FOUND)
 else(NOT PKG_CONFIG_FOUND)
     pkg_search_module(LIBCONFIGPP libconfig++)
     if(NOT LIBCONFIGPP_FOUND)
-        set(LIBCONFIG_CXXFLAGS "" CACHE STRING "libconfig++ compiler flags")
-        set(LIBCONFIG_LDFLAGS "" CACHE STRING "libconfig++ linker flags")
+        set(LIBCONFIG_CXXFLAGS  "" CACHE STRING "libconfig++ compiler flags")
+        set(LIBCONFIG_LDFLAGS   "" CACHE STRING "libconfig++ linker flags")
     else(NOT LIBCONFIGPP_FOUND)
         set(LIBCONFIG_CXXFLAGS ${LIBCONFIGPP_CFLAGS} CACHE STRING "libconfig++ compiler flags")
         set(LIBCONFIG_LDFLAGS ${LIBCONFIGPP_LDFLAGS} CACHE STRING "libconfig++ linker flags")
@@ -31,6 +31,7 @@ set(LLVM_INSTDIR ${LLVM_DIR} CACHE PATH "LLVM installation directory" FORCE)
 if(NOT LLVM_INSTDIR)
 	message(FATAL_ERROR "llvm not found")
 endif(NOT LLVM_INSTDIR)
+set(LLVM_CONFIG_HEADER "config.h" CACHE STRING "llvm config header file name")
 
 execute_process(
 	COMMAND ${PERL_EXECUTABLE} ${LLVM_CONFIG} --host-target
@@ -53,32 +54,36 @@ execute_process(
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-set(D_VERSION 1 CACHE STRING "D language version")
-set(CONF_INST_DIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE STRING "set ldc.conf directory for installation")
-set(PROGRAM_PREFIX CACHE STRING "prepended to ldc binary name")
-set(PROGRAM_SUFFIX CACHE STRING "appended to ldc binary name")
-option(USE_BOEHM_GC "use the Boehm garbage collector internally")
-option(GENERATE_OFFTI "generate complete ClassInfo.offTi arrays")
-option(USE_METADATA "use metadata and related custom optimization passes")
+set(D_VERSION               1                                       CACHE STRING "D language version")
+set(CONF_INST_DIR           "${CMAKE_INSTALL_PREFIX}/etc"           CACHE STRING "set ldc.conf directory for installation")
+set(CMAKE_INSTALL_LIBDIR    "lib"                                   CACHE STRING "directory where lib will be installed")
+set(LIB_SUFFIX              ""                                      CACHE STRING "take empty string or 64. Directory where lib will be installed: lib or lib64")
+set(LIBRARY_OUTPUT_PATH     ${PROJECT_SOURCE_DIR}/lib${LIB_SUFFIX}  CACHE PATH "output dir for built libraries")
+set(INCLUDE_INSTALL_DIR     /usr/include/d                          CACHE PATH "Directory where will be put header files")
+set(PROGRAM_PREFIX                                                  CACHE STRING "prepended to ldc binary name")
+set(PROGRAM_SUFFIX                                                  CACHE STRING "appended to ldc binary name")
+option(USE_BOEHM_GC     "use the Boehm garbage collector internally")
+option(GENERATE_OFFTI   "generate complete ClassInfo.offTi arrays")
+option(USE_METADATA     "use metadata and related custom optimization passes")
 
 if(D_VERSION EQUAL 1)
-	set(DMDFE_PATH dmd)
-	set(LDC_EXE ldc)
-	set(LDMD_EXE ldmd)
+	set(DMDFE_PATH  dmd)
+	set(LDC_EXE     ldc)
+	set(LDMD_EXE    ldmd)
 	add_definitions(-DDMDV1)
 elseif(D_VERSION EQUAL 2)
-	set(DMDFE_PATH dmd2)
-	set(LDC_EXE ldc2)
-	set(LDMD_EXE ldmd2)
+	set(DMDFE_PATH  dmd2)
+	set(LDC_EXE     ldc2)
+	set(LDMD_EXE    ldmd2)
 	add_definitions(-DDMDV2)
 else(D_VERSION EQUAL 1)
 	message(FATAL_ERROR "unsupported D version")
 endif(D_VERSION EQUAL 1)
 
 file(MAKE_DIRECTORY
-	${PROJECT_BINARY_DIR}/bin
-	${PROJECT_BINARY_DIR}/${DMDFE_PATH}
-	${PROJECT_BINARY_DIR}/gen
+	${PROJECT_SOURCE_DIR}
+	${PROJECT_SOURCE_DIR}/${DMDFE_PATH}
+	${PROJECT_SOURCE_DIR}/gen
 )
 
 # idgen and impcnvgen
@@ -93,38 +98,38 @@ add_executable(impcnvgen ${DMDFE_PATH}/impcnvgen.c)
 set_target_properties(
 	idgen impcnvgen PROPERTIES
 	LINKER_LANGUAGE CXX
-	RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${DMDFE_PATH}
+	RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/${DMDFE_PATH}
 	COMPILE_FLAGS ${LLVM_CXXFLAGS}
 )
 get_target_property(IDGEN_LOC idgen LOCATION)
 get_target_property(IMPCNVGEN_LOC impcnvgen LOCATION)
 #
 add_custom_command(
 	OUTPUT
-		${PROJECT_BINARY_DIR}/${DMDFE_PATH}/id.c
-		${PROJECT_BINARY_DIR}/${DMDFE_PATH}/id.h
+		${PROJECT_SOURCE_DIR}/${DMDFE_PATH}/id.c
+		${PROJECT_SOURCE_DIR}/${DMDFE_PATH}/id.h
 	# 2.4
 	COMMAND ${IDGEN_LOC}
 	#COMMAND idgen
-	WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${DMDFE_PATH}
+	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/${DMDFE_PATH}
 	DEPENDS idgen
 )
 add_custom_command(
-	OUTPUT ${PROJECT_BINARY_DIR}/${DMDFE_PATH}/impcnvtab.c
+	OUTPUT ${PROJECT_SOURCE_DIR}/${DMDFE_PATH}/impcnvtab.c
 	# 2.4
 	COMMAND ${IMPCNVGEN_LOC}
 	#COMMAND impcnvgen
-	WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${DMDFE_PATH}
+	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/${DMDFE_PATH}
 	DEPENDS impcnvgen
 )
 set(LDC_GENERATED
-	${PROJECT_BINARY_DIR}/${DMDFE_PATH}/id.c
-	${PROJECT_BINARY_DIR}/${DMDFE_PATH}/id.h
-	${PROJECT_BINARY_DIR}/${DMDFE_PATH}/impcnvtab.c
+	${PROJECT_SOURCE_DIR}/${DMDFE_PATH}/id.c
+	${PROJECT_SOURCE_DIR}/${DMDFE_PATH}/id.h
+	${PROJECT_SOURCE_DIR}/${DMDFE_PATH}/impcnvtab.c
 )
 # idgen and impcnvgen done
 
-include_directories(. ${DMDFE_PATH} ${DMDFE_PATH}/root ${PROJECT_BINARY_DIR}/${DMDFE_PATH} ${PROJECT_BINARY_DIR} ${LLVM_INCLUDEDIR})
+include_directories(. ${DMDFE_PATH} ${DMDFE_PATH}/root ${PROJECT_SOURCE_DIR}/${DMDFE_PATH} ${PROJECT_SOURCE_DIR} ${LLVM_INCLUDEDIR})
 
 set(EXTRA_LLVM_MODULES "" CACHE STRING "extra llvm components to link in (see llvm-config --components)")
 separate_arguments(EXTRA_LLVM_MODULES)
@@ -136,24 +141,24 @@ execute_process(
 
 # build a define that contains all LLVM targets required and is usable for
 # preprocessor code generation. start with the native target.
-find_path(LLVM_CONFIG_FILE_PATH config.h PATHS ${LLVM_INCLUDEDIR}/llvm/Config ${LLVM_INCLUDEDIR}/Config NO_DEFAULT_PATH)
+find_path(LLVM_CONFIG_FILE_PATH ${LLVM_CONFIG_HEADER} PATHS ${LLVM_INCLUDEDIR}/llvm/Config ${LLVM_INCLUDEDIR}/Config NO_DEFAULT_PATH)
 if(LLVM_CONFIG_FILE_PATH STREQUAL "LLVM_CONFIG_FILE_PATH-NOTFOUND")
-        message("Couldn't find your llvm Config.h file in ${LLVM_INCLUDEDIR}, no native target will be initialized.")
+        message("Couldn't find your llvm ${LLVM_CONFIG_HEADER} file in ${LLVM_INCLUDEDIR}, no native target will be initialized.")
 else(LLVM_CONFIG_FILE_PATH STREQUAL "LLVM_CONFIG_FILE_PATH-NOTFOUND")
         if(NOT HOST_TARGET AND NOT DEFAULT_TARGET)
-            file(STRINGS ${LLVM_CONFIG_FILE_PATH}/config.h LLVM_HOSTTRIPLE REGEX "^#define LLVM_HOSTTRIPLE")
+            file(STRINGS ${LLVM_CONFIG_FILE_PATH}/${LLVM_CONFIG_HEADER} LLVM_HOSTTRIPLE REGEX "^#define LLVM_HOSTTRIPLE")
             if(LLVM_HOSTTRIPLE)
                 string(REGEX REPLACE "^#define LLVM_HOSTTRIPLE \"(.*)\"$" "\\1" HOST_TARGET ${LLVM_HOSTTRIPLE})
             endif(LLVM_HOSTTRIPLE)
         endif(NOT HOST_TARGET AND NOT DEFAULT_TARGET)
 
-        file(STRINGS ${LLVM_CONFIG_FILE_PATH}/config.h LLVM_NATIVE_ARCH REGEX "^#define LLVM_NATIVE_ARCH")
+        file(STRINGS ${LLVM_CONFIG_FILE_PATH}/${LLVM_CONFIG_HEADER} LLVM_NATIVE_ARCH REGEX "^#define LLVM_NATIVE_ARCH")
         if(LLVM_NATIVE_ARCH)
                 string(REGEX REPLACE "^#define LLVM_NATIVE_ARCH (.*)(Target|)$" "\\1" LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH})
                 message(STATUS "Found native target ${LLVM_NATIVE_ARCH}")
                 set(LLVM_MODULES_DEFINE "LLVM_TARGET(${LLVM_NATIVE_ARCH})")
         else(LLVM_NATIVE_ARCH)
-                message("Couldn't find the LLVM_NATIVE_ARCH define in ${LLVM_CONFIG_FILE_PATH}/config.h. Probably you have an older LLVM and can ignore this warning.")
+                message("Couldn't find the LLVM_NATIVE_ARCH define in ${LLVM_CONFIG_FILE_PATH}/${LLVM_CONFIG_HEADER}. Probably you have an older LLVM and can ignore this warning.")
         endif(LLVM_NATIVE_ARCH)
 endif(LLVM_CONFIG_FILE_PATH STREQUAL "LLVM_CONFIG_FILE_PATH-NOTFOUND")
 # chain the extra target list to the define
@@ -176,9 +181,9 @@ set(DEFAULT_ALT_TARGET ${HOST_ALT_TARGET} CACHE STRING "default alt target")
 
 # Also add the header files to the build so that they are available in IDE
 # project files generated via CMake.
-file(GLOB_RECURSE FE_SRC ${DMDFE_PATH}/*.c ${DMDFE_PATH}/*.h)
-file(GLOB_RECURSE GEN_SRC gen/*.cpp gen/*.h)
-file(GLOB IR_SRC ir/*.cpp ir/*.h)
+file(GLOB_RECURSE   FE_SRC  ${DMDFE_PATH}/*.c   ${DMDFE_PATH}/*.h)
+file(GLOB_RECURSE   GEN_SRC gen/*.cpp           gen/*.h)
+file(GLOB           IR_SRC  ir/*.cpp            ir/*.h)
 # exclude idgen and impcnvgen and generated sources, just in case
 list(REMOVE_ITEM FE_SRC
 	${PROJECT_SOURCE_DIR}/${DMDFE_PATH}/idgen.c
@@ -221,8 +226,7 @@ if(USE_METADATA)
 endif(USE_METADATA)
 
 if(CMAKE_MINOR_VERSION LESS 6)
-    set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "output dir for built executables")
-    set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib CACHE PATH "output dir for built libraries")
+    set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin CACHE PATH "output dir for built executables")
     add_definitions(-DDEFAULT_TARGET_TRIPLE=\\"${DEFAULT_TARGET}\\")
     add_definitions(-DDEFAULT_ALT_TARGET_TRIPLE=\\"${DEFAULT_ALT_TARGET}\\")
     add_definitions(-DLDC_INSTALL_PREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
@@ -237,10 +241,10 @@ add_executable(${LDC_EXE} ${LDC_SOURCE_FILES})
 set(LDC_EXE_NAME ${PROGRAM_PREFIX}${LDC_EXE}${PROGRAM_SUFFIX})
 
 set_target_properties(
-	${LDC_EXE} PROPERTIES
-	OUTPUT_NAME ${LDC_EXE_NAME}
-	RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin
-	COMPILE_FLAGS "${LLVM_CXXFLAGS} ${LIBCONFIG_CXXFLAGS} -Wno-deprecated -Wno-write-strings -fexceptions"
+	${LDC_EXE}                  PROPERTIES
+	OUTPUT_NAME                 ${LDC_EXE_NAME}
+	RUNTIME_OUTPUT_DIRECTORY    ${PROJECT_SOURCE_DIR}
+	COMPILE_FLAGS               "${LLVM_CXXFLAGS} ${LIBCONFIG_CXXFLAGS} -Wno-deprecated -Wno-write-strings -fexceptions"
 )
 
 # LDFLAGS should actually be in target property LINK_FLAGS, but this works, and gets around linking problems
@@ -257,10 +261,14 @@ get_target_property(LDC_LOC ${LDC_EXE} LOCATION)
 
 # TODO: testrun
 
-install(TARGETS ${LDC_EXE} DESTINATION bin)
-install(PROGRAMS ${PROJECT_SOURCE_DIR}/bin/${LDMD_EXE} DESTINATION bin)
-install(FILES ${PROJECT_BINARY_DIR}/bin/${LDC_EXE}.conf DESTINATION ${CONF_INST_DIR})
-install(FILES ${PROJECT_BINARY_DIR}/bin/${LDC_EXE}.rebuild.conf DESTINATION ${CONF_INST_DIR})
-install(DIRECTORY ${PROJECT_BINARY_DIR}/lib DESTINATION . USE_SOURCE_PERMISSIONS)
+install(TARGETS     ${LDC_EXE}                                          DESTINATION bin)
+install(PROGRAMS    ${PROJECT_SOURCE_DIR}/bin/${LDMD_EXE}               DESTINATION bin)
+install(FILES       ${PROJECT_SOURCE_DIR}/${LDC_EXE}_install.conf       DESTINATION ${CONF_INST_DIR} RENAME ${LDC_EXE}.conf)
+install(FILES       ${PROJECT_SOURCE_DIR}/bin/${LDC_EXE}.rebuild.conf   DESTINATION ${CONF_INST_DIR})
+install(DIRECTORY   ${LIBRARY_OUTPUT_PATH}                              DESTINATION .               USE_SOURCE_PERMISSIONS)
+install(DIRECTORY   ${PROJECT_SOURCE_DIR}/import/core                   DESTINATION ${INCLUDE_INSTALL_DIR}/)
+install(DIRECTORY   ${PROJECT_SOURCE_DIR}/phobos                        DESTINATION ${INCLUDE_INSTALL_DIR}/ PATTERN ".git" EXCLUDE )
+install(DIRECTORY   ${PROJECT_SOURCE_DIR}/druntime/import/ldc           DESTINATION ${INCLUDE_INSTALL_DIR}/)
+install(FILES       ${PROJECT_SOURCE_DIR}/druntime/import/object.di     DESTINATION ${INCLUDE_INSTALL_DIR}/ldc)
 
 add_subdirectory(runtime EXCLUDE_FROM_ALL)

ldc2.rebuild.conf.in

@@ -1,2 +1,2 @@
 [Environment]
-DFLAGS=-I@RUNTIME_DIR@/import -L-L%@P%/../lib -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@
+DFLAGS=-I@INCLUDE_INSTALL_DIR@  -L-L@CMAKE_INSTALL_LIBDIR@ -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@

ldc2_install.conf.in

@@ -0,0 +1,17 @@
+// This configuration file uses libconfig.
+// See http://www.hyperrealm.com/libconfig/ for syntax details.
+
+// The default group is required
+default:
+{
+    // 'switches' holds array of string that are appends to the command line
+    // arguments before they are parsed.
+    switches = [
+        "-I@INCLUDE_INSTALL_DIR@",
+        "-I@INCLUDE_INSTALL_DIR@/phobos",
+        "-I@INCLUDE_INSTALL_DIR@/ldc",
+        "-L-L@CMAKE_INSTALL_LIBDIR@",
+        "-defaultlib=@RUNTIME_AIO@",
+        "-debuglib=@RUNTIME_AIO@"
+    ];
+};