Commit 02a768d7 authored by ext-rogers_c's avatar ext-rogers_c
Browse files

Add pthread library to cmake and remove Makefile committed in error

parent e54aba51
......@@ -1137,7 +1137,6 @@ src/opal.cpp -text
src/opal.h -text
src/unit_tests/CMakeLists.txt -text
src/unit_tests/Main.cpp -text
src/unit_tests/Makefile -text
src/unit_tests/classic_src/AbsBeamline/OffsetTest.cpp -text
src/unit_tests/classic_src/AbsBeamline/SBend3DTest.cpp -text
src/unit_tests/classic_src/AbsBeamline/SBend3D_map.field -text
......
......@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.6)
set (GTEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gtest/include PARENT_SCOPE)
set (GTEST_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gtest/lib PARENT_SCOPE)
set (GTEST_LINK_TARGETS -lgtest -lgtest_main PARENT_SCOPE)
set (GTEST_LINK_TARGETS -lgtest -lgtest_main -lpthread PARENT_SCOPE)
set (TEST_EXE opal_unit_tests PARENT_SCOPE)
set(SRC_DIRS classic_src opal_src)
......
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 2.8
# Default target executed when no arguments are given to make.
default_target: all
.PHONY : default_target
#=============================================================================
# Special targets provided by cmake.
# Disable implicit rules so canonical targets will work.
.SUFFIXES:
# Remove some rules from gmake that .SUFFIXES does not remove.
SUFFIXES =
.SUFFIXES: .hpux_make_needs_suffix_list
# Suppress display of executed commands.
$(VERBOSE).SILENT:
# A target that is always out of date.
cmake_force:
.PHONY : cmake_force
#=============================================================================
# Set environment variables for the build.
# The shell in which to execute make rules.
SHELL = /bin/sh
# The CMake executable.
CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /home/cr67/OPAL/source/opal_dev/src/trunk
# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /home/cr67/OPAL/source/opal_dev/src/trunk
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
/usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
edit_cache/fast: edit_cache
.PHONY : edit_cache/fast
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
install/local/fast: install/local
.PHONY : install/local/fast
# Special rule for the target list_install_components
list_install_components:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
.PHONY : list_install_components
# Special rule for the target list_install_components
list_install_components/fast: list_install_components
.PHONY : list_install_components/fast
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
rebuild_cache/fast: rebuild_cache
.PHONY : rebuild_cache/fast
# The main all target
all: cmake_check_build_system
cd /home/cr67/OPAL/source/opal_dev/src/trunk && $(CMAKE_COMMAND) -E cmake_progress_start /home/cr67/OPAL/source/opal_dev/src/trunk/CMakeFiles /home/cr67/OPAL/source/opal_dev/src/trunk/src/unit_tests/CMakeFiles/progress.marks
cd /home/cr67/OPAL/source/opal_dev/src/trunk && $(MAKE) -f CMakeFiles/Makefile2 src/unit_tests/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/cr67/OPAL/source/opal_dev/src/trunk/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
cd /home/cr67/OPAL/source/opal_dev/src/trunk && $(MAKE) -f CMakeFiles/Makefile2 src/unit_tests/clean
.PHONY : clean
# The main clean target
clean/fast: clean
.PHONY : clean/fast
# Prepare targets for installation.
preinstall: all
cd /home/cr67/OPAL/source/opal_dev/src/trunk && $(MAKE) -f CMakeFiles/Makefile2 src/unit_tests/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
cd /home/cr67/OPAL/source/opal_dev/src/trunk && $(MAKE) -f CMakeFiles/Makefile2 src/unit_tests/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
cd /home/cr67/OPAL/source/opal_dev/src/trunk && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Help Target
help:
@echo "The following are some of the valid targets for this Makefile:"
@echo "... all (the default if no target is provided)"
@echo "... clean"
@echo "... depend"
@echo "... edit_cache"
@echo "... install"
@echo "... install/local"
@echo "... list_install_components"
@echo "... rebuild_cache"
.PHONY : help
#=============================================================================
# Special targets to cleanup operation of make.
# Special rule to run CMake to check the build system integrity.
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
cd /home/cr67/OPAL/source/opal_dev/src/trunk && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment