Stop generating ompd.h, only build libompd if active in cmake

Author: jprotze

libompd/CMakeLists.txt

@@ -1,3 +1,3 @@
-
-
-add_subdirectory(src)
+if(LIBOMP_OMPD_SUPPORT)
+  add_subdirectory(src)
+endif()

libompd/src/CMakeLists.txt

@@ -2,36 +2,16 @@ project (libompd)
 
 add_library (ompd SHARED TargetValue.cpp omp-debug.cpp)
 
-add_dependencies(ompd ompd-header)
-
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 include_directories (
-        ${CMAKE_CURRENT_BINARY_DIR}/include
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include)
-
-ADD_CUSTOM_TARGET (
-  ompd-header ALL
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include/ompd.h ${CMAKE_CURRENT_BINARY_DIR}/include/ompd_typedefs.h
-)
-
-add_custom_command ( 
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/ompd.h ${CMAKE_CURRENT_BINARY_DIR}/include/ompd_typedefs.h
-        COMMAND ${BASH} 
-        ARGS    ${CMAKE_CURRENT_SOURCE_DIR}/split_def_typedef.sh 
-                ${CMAKE_CURRENT_SOURCE_DIR}/ompd-template.h
-                ${CMAKE_CURRENT_BINARY_DIR}/include/ompd_typedefs.h
-                ${CMAKE_CURRENT_BINARY_DIR}/include/ompd.h
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ompd-template.h
-)
-
 INSTALL( TARGETS ompd
         LIBRARY DESTINATION lib 
         ARCHIVE DESTINATION lib/static 
         RUNTIME DESTINATION bin )
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/ompd.h DESTINATION include)
+INSTALL(FILES ompd.h DESTINATION include)
 

libompd/src/omp-debug.h

@@ -33,7 +33,6 @@ extern "C" {
 #define STR(x) STR_HELPER(x)
 
 #include "ompd.h"
-#include "ompd_typedefs.h"
 
 /******************************************************************************
  * General helper functions