Ignore:
Timestamp:
Dec 22, 2016, 2:35:46 PM (2 years ago)
Author:
nmedfort
Message:

Modified memory alignment mechanism for GetPropertyValueGrepString? + misc. changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/CMakeLists.txt

    r5232 r5234  
    99
    1010option(ENABLE_MULTIPLEXING "Compiling the Multiplexing Module")
    11 option(ENABLE_PREGENERATED_UCD_FUNCTIONS "Enable compiling the pregenerated UCD functions")
    1211option(PRINT_TIMING_INFORMATION "Write compilation and execution timing information to standard error stream")
    1312
     
    4342set(Boost_USE_STATIC_LIBS ON)
    4443set(Boost_USE_MULTITHREADED OFF)
    45 set(Boost_USE_STATIC_RUNTIME ON)
     44set(Boost_USE_STATIC_RUNTIME OFF)
    4645find_package(Boost 1.46 REQUIRED COMPONENTS system filesystem iostreams)
    4746
     
    7877target_link_libraries (RegExpCompiler RegExpADT)
    7978
    80 set(PRECOMPILED_FILES "")
    81 
    82 IF(NOT ENABLE_PREGENERATED_UCD_FUNCTIONS)
    83 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_PREGENERATED_UCD_FUNCTIONS")
    84 ELSE()
    85 MESSAGE("Enabling predefined UCD functions...")
    86 # add the executable
    87 add_executable(generate_predefined_ucd_functions generate_predefined_ucd_functions.cpp)
    88 llvm_map_components_to_libnames(REQ_LLVM_TARGETS ${LLVM_TARGETS_TO_BUILD})
    89 target_link_libraries (generate_predefined_ucd_functions RegExpADT UCDlib PabloADT CCADT ${REQ_LLVM_TARGETS})
    90 
    91 set(PRECOMPILED_PROPERTIES_OBJ ${PROJECT_BINARY_DIR}/precompiled_properties.o)
    92 set(PRECOMPILED_FILES ${PRECOMPILED_PROPERTIES_OBJ} ${PROJECT_SOURCE_DIR}/UCD/precompiled_properties.cpp)
    93 
    94 if(ENABLE_MULTIPLEXING)
    95 set(MULTIPLEXING_FLAG -multiplexing -reassoc -multiplexing-dist=${PROJECT_BINARY_DIR}/ucd-multiplexing.csv) # -multiplexing-dist=${PROJECT_BINARY_DIR}/ucd-multiplexing.csv #-ldc=ldc.csv
    96 endif()
    97 
    98 add_custom_command(OUTPUT ${PRECOMPILED_FILES}
    99   COMMAND generate_predefined_ucd_functions
    100   ARGS -o ${PRECOMPILED_PROPERTIES_OBJ} -dir ${PROJECT_SOURCE_DIR}/UCD/ ${MULTIPLEXING_FLAG} -DefaultIfHierarchy
    101   DEPENDS generate_predefined_ucd_functions
    102   COMMENT "Building predefined UCD functions..."
    103   VERBATIM)
    104 
    105 add_custom_target(run_generate_predefined_ucd_functions DEPENDS ${PRECOMPILED_FILES})
    106 
    107 add_dependencies(RegExpCompiler run_generate_predefined_ucd_functions)
    108 ENDIF()
    109 
    110 add_executable(icgrep icgrep.cpp toolchain.cpp grep_engine.cpp kernels/pipeline.cpp kernels/scanmatchgen.cpp kernels/cc_kernel.cpp ${PRECOMPILED_FILES})
     79add_executable(icgrep icgrep.cpp toolchain.cpp grep_engine.cpp kernels/pipeline.cpp kernels/scanmatchgen.cpp kernels/cc_kernel.cpp)
    11180add_executable(u8u16 u8u16.cpp toolchain.cpp kernels/p2s_kernel.cpp kernels/pipeline.cpp kernels/deletion.cpp kernels/stdout_kernel.cpp)
    11281add_executable(base64 base64.cpp kernels/radix64.cpp toolchain.cpp kernels/p2s_kernel.cpp kernels/pipeline.cpp kernels/deletion.cpp kernels/stdout_kernel.cpp)
     
    11483add_executable(editd editd/editd.cpp editd/pattern_compiler.cpp toolchain.cpp kernels/pipeline.cpp editd/editdscan_kernel.cpp editd/editd_gpu_kernel.cpp editd/editd_cpu_kernel.cpp)
    11584add_executable(array-test array-test.cpp toolchain.cpp kernels/pipeline.cpp)
    116 
    117 IF(ENABLE_PREGENERATED_UCD_FUNCTIONS)
    118 add_dependencies(icgrep run_generate_predefined_ucd_functions)
    119 ENDIF()
    12085
    12186IF (PRINT_TIMING_INFORMATION)
Note: See TracChangeset for help on using the changeset viewer.