Commit 326e54c9 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Fix some CMake formatting

parent f035764a

cmake/AllpixMacros.cmake

+2 −4
Original line number Diff line number Diff line
@@ -233,8 +233,7 @@ FUNCTION(add_allpix_test) 
        NAME "${TEST_NAME}"

        WORKING_DIRECTORY ${TEST_WORKING_DIRECTORY}

        COMMAND ${PROJECT_SOURCE_DIR}/etc/unittests/run_directory.sh "${TEST_NAME}"

                "${CMAKE_INSTALL_PREFIX}/bin/${TEST_EXECUTABLE} -c ${TEST_FILE} ${clioptions}"

                ${before_script})

                "${CMAKE_INSTALL_PREFIX}/bin/${TEST_EXECUTABLE} -c ${TEST_FILE} ${clioptions}" ${before_script})



    # Parse configuration file for pass/fail conditions:

    FILE(STRINGS ${TEST_FILE} PASS_LST_ REGEX "#PASS ")
@@ -329,8 +328,7 @@ MACRO(ALLPIX_MODULE_TESTS name directory) 
            SET(TEST_DIR "${TEST_BASE_DIR}/modules/${_allpix_module_dir}/${title}")



            CONFIGURE_FILE(${test} "${CMAKE_CURRENT_BINARY_DIR}/${test}" @ONLY)

            ADD_ALLPIX_TEST(NAME "modules/${_allpix_module_dir}/${title}"

                            FILE ${CMAKE_CURRENT_BINARY_DIR}/${test}

            ADD_ALLPIX_TEST(NAME "modules/${_allpix_module_dir}/${title}" FILE ${CMAKE_CURRENT_BINARY_DIR}/${test}

                            WORKING_DIRECTORY ${TEST_BASE_DIR})



            GET_PROPERTY(old_count GLOBAL PROPERTY COUNT_TESTS_MODULES)

src/modules/DepositionCosmics/CMakeLists.txt

+10 −7
Original line number Diff line number Diff line
@@ -47,12 +47,14 @@ ENDIF() 


# Install the files to the data directory

# NOTE: With default install path this does not change anything

INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data/ DESTINATION ${CRY_DATA_DIRECTORY}

        FILES_MATCHING PATTERN "*.data")

INSTALL(

    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data/

    DESTINATION ${CRY_DATA_DIRECTORY}

    FILES_MATCHING

    PATTERN "*.data")



ADD_DEFINITIONS(-DALLPIX_CRY_DATA_DIRECTORY="${CRY_DATA_DIRECTORY}")





# Required for CMake when Geant4 has HDF5 enabled

ENABLE_LANGUAGE(C)
@@ -76,7 +78,8 @@ ELSEIF(CMAKE_BUILD_TYPE MATCHES RELEASE) 
ENDIF()



# Add source files to library

ALLPIX_MODULE_SOURCES(${MODULE_NAME}

ALLPIX_MODULE_SOURCES(

    ${MODULE_NAME}

    DepositionCosmicsModule.cpp

    CosmicsGeneratorActionG4.cpp

    RNGWrapper.cpp

tools/mesh_converter/CMakeLists.txt

+1 −1

File changed.

Contains only whitespace changes.

CMakeLists.txt

+1 −1

File changed.

Contains only whitespace changes.